Skip to content

Commit b524f4b

Browse files
cwrenAndroid (Google) Code Review
authored andcommitted
Merge "add some defensive code to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev
2 parents 2d09880 + 91f080c commit b524f4b

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
@@ -1305,37 +1305,40 @@ private void enableUserSelectorIfNecessary() {
13051305
UserManager mUm = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
13061306
List<UserInfo> users = mUm.getUsers(true);
13071307

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

1319-
@Override
1320-
public void showSecurityView() {
1321-
mSecurityViewContainer.setAlpha(1.0f);
1322-
}
1321+
@Override
1322+
public void showSecurityView() {
1323+
mSecurityViewContainer.setAlpha(1.0f);
1324+
}
13231325

1324-
@Override
1325-
public void showUnlockHint() {
1326-
if (mKeyguardSelectorView != null) {
1327-
mKeyguardSelectorView.showUsabilityHint();
1326+
@Override
1327+
public void showUnlockHint() {
1328+
if (mKeyguardSelectorView != null) {
1329+
mKeyguardSelectorView.showUsabilityHint();
1330+
}
13281331
}
1329-
}
13301332

1331-
@Override
1332-
public void userActivity() {
1333-
if (mViewMediatorCallback != null) {
1334-
mViewMediatorCallback.userActivity();
1333+
@Override
1334+
public void userActivity() {
1335+
if (mViewMediatorCallback != null) {
1336+
mViewMediatorCallback.userActivity();
1337+
}
13351338
}
1336-
}
1337-
};
1338-
multiUser.setCallback(callback);
1339+
};
1340+
multiUser.setCallback(callback);
1341+
}
13391342
}
13401343
}
13411344

0 commit comments

Comments
 (0)