diff options
author | John Spurlock <jspurlock@google.com> | 2014-02-19 16:17:31 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-19 16:17:31 +0000 |
commit | ed0cd0c38d234a61b7c20ef434ff0449edf98304 (patch) | |
tree | d3856b3bd7adfa70b91d4e2ba00d123e3d2f6a45 | |
parent | 7870211955631c8e1b3c1932c7c8a46b5c1c9fd5 (diff) | |
parent | 4355a533bc9349c84d9ec6d7d67c57b5ca060ecb (diff) | |
download | frameworks_base-ed0cd0c38d234a61b7c20ef434ff0449edf98304.zip frameworks_base-ed0cd0c38d234a61b7c20ef434ff0449edf98304.tar.gz frameworks_base-ed0cd0c38d234a61b7c20ef434ff0449edf98304.tar.bz2 |
Merge "Don't call back into AM to get current user."
-rw-r--r-- | policy/src/com/android/internal/policy/impl/ImmersiveModeConfirmation.java | 12 | ||||
-rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 2 |
2 files changed, 3 insertions, 11 deletions
diff --git a/policy/src/com/android/internal/policy/impl/ImmersiveModeConfirmation.java b/policy/src/com/android/internal/policy/impl/ImmersiveModeConfirmation.java index 3cc74fc..5602206 100644 --- a/policy/src/com/android/internal/policy/impl/ImmersiveModeConfirmation.java +++ b/policy/src/com/android/internal/policy/impl/ImmersiveModeConfirmation.java @@ -84,9 +84,9 @@ public class ImmersiveModeConfirmation { return exit != null ? exit.getDuration() : 0; } - public void loadSetting() { + public void loadSetting(int currentUserId) { mConfirmed = false; - mCurrentUserId = getCurrentUser(); + mCurrentUserId = currentUserId; if (DEBUG) Slog.d(TAG, String.format("loadSetting() mCurrentUserId=%d resetForPanic=%s", mCurrentUserId, mUserPanicResets.get(mCurrentUserId, false))); String value = null; @@ -159,14 +159,6 @@ public class ImmersiveModeConfirmation { saveSetting(); } - private int getCurrentUser() { - try { - return ActivityManagerNative.getDefault().getCurrentUser().id; - } catch (RemoteException e) { - throw new IllegalStateException(e); // local call - } - } - private void handleHide() { if (mClingWindow != null) { if (DEBUG) Slog.d(TAG, "Hiding immersive mode confirmation"); diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 96c395b..ada649d 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -1168,7 +1168,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { updateRotation = true; } if (mImmersiveModeConfirmation != null) { - mImmersiveModeConfirmation.loadSetting(); + mImmersiveModeConfirmation.loadSetting(mCurrentUserId); } PolicyControl.reloadFromSetting(mContext); } |