Skip to content

Commit 91f080c

Browse files
committed
add some defensive code to enableUserSelectorIfNecessary.
Bug: 7437751 Change-Id: I3f8e317624f158fce0d58be69b733699a208d802
1 parent cabcc59 commit 91f080c

File tree

1 file changed

+29
-26
lines changed

1 file changed

+29
-26
lines changed

policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1300,37 +1300,40 @@ private void enableUserSelectorIfNecessary() {
13001300
UserManager mUm = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
13011301
List<UserInfo> users = mUm.getUsers(true);
13021302

1303-
if (users.size() > 1) {
1304-
KeyguardMultiUserSelectorView multiUser =
1305-
(KeyguardMultiUserSelectorView) findViewById(R.id.keyguard_user_selector);
1306-
multiUser.setVisibility(View.VISIBLE);
1307-
multiUser.addUsers(mUm.getUsers(true));
1308-
UserSwitcherCallback callback = new UserSwitcherCallback() {
1309-
@Override
1310-
public void hideSecurityView(int duration) {
1311-
mSecurityViewContainer.animate().alpha(0).setDuration(duration);
1312-
}
1303+
if (users != null && users.size() > 1) {
1304+
View multiUserView = findViewById(R.id.keyguard_user_selector);
1305+
if (multiUserView instanceof KeyguardMultiUserSelectorView) {
1306+
KeyguardMultiUserSelectorView multiUser =
1307+
(KeyguardMultiUserSelectorView) multiUserView;
1308+
multiUser.setVisibility(View.VISIBLE);
1309+
multiUser.addUsers(mUm.getUsers(true));
1310+
UserSwitcherCallback callback = new UserSwitcherCallback() {
1311+
@Override
1312+
public void hideSecurityView(int duration) {
1313+
mSecurityViewContainer.animate().alpha(0).setDuration(duration);
1314+
}
13131315

1314-
@Override
1315-
public void showSecurityView() {
1316-
mSecurityViewContainer.setAlpha(1.0f);
1317-
}
1316+
@Override
1317+
public void showSecurityView() {
1318+
mSecurityViewContainer.setAlpha(1.0f);
1319+
}
13181320

1319-
@Override
1320-
public void showUnlockHint() {
1321-
if (mKeyguardSelectorView != null) {
1322-
mKeyguardSelectorView.showUsabilityHint();
1321+
@Override
1322+
public void showUnlockHint() {
1323+
if (mKeyguardSelectorView != null) {
1324+
mKeyguardSelectorView.showUsabilityHint();
1325+
}
13231326
}
1324-
}
13251327

1326-
@Override
1327-
public void userActivity() {
1328-
if (mViewMediatorCallback != null) {
1329-
mViewMediatorCallback.userActivity();
1328+
@Override
1329+
public void userActivity() {
1330+
if (mViewMediatorCallback != null) {
1331+
mViewMediatorCallback.userActivity();
1332+
}
13301333
}
1331-
}
1332-
};
1333-
multiUser.setCallback(callback);
1334+
};
1335+
multiUser.setCallback(callback);
1336+
}
13341337
}
13351338
}
13361339

0 commit comments

Comments
 (0)