diff options
| author | Amith Yamasani <yamasani@google.com> | 2013-05-09 22:17:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-09 22:17:51 +0000 |
| commit | 153919ed2f128fb5d1b55782ea89fadcc20fc841 (patch) | |
| tree | 7b82d744b92cb7779f254ceee69faeb335f1862d /packages/SystemUI | |
| parent | fb32c82412111983236f44cbc8fd90f113d7ea34 (diff) | |
| parent | 6fc1d4e8e6549b0d58ea23b4dd3f26329ec19f38 (diff) | |
| download | frameworks_base-153919ed2f128fb5d1b55782ea89fadcc20fc841.zip frameworks_base-153919ed2f128fb5d1b55782ea89fadcc20fc841.tar.gz frameworks_base-153919ed2f128fb5d1b55782ea89fadcc20fc841.tar.bz2 | |
Merge "Cache the scaled avatar drawables in the keyguard user switcher" into jb-mr2-dev
Diffstat (limited to 'packages/SystemUI')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java index d826282..df1eb67 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java @@ -819,8 +819,10 @@ class QuickSettings { if (ContactsContract.Intents.ACTION_PROFILE_CHANGED.equals(action) || Intent.ACTION_USER_INFO_CHANGED.equals(action)) { try { - final int userId = ActivityManagerNative.getDefault().getCurrentUser().id; - if (getSendingUserId() == userId) { + final int currentUser = ActivityManagerNative.getDefault().getCurrentUser().id; + final int changedUser = + intent.getIntExtra(Intent.EXTRA_USER_HANDLE, getSendingUserId()); + if (changedUser == currentUser) { reloadUserInfo(); } } catch (RemoteException e) { |