| commit | c0af382a25db6c178442944b188b0243f0f38b3f | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Jun 22 04:52:32 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jun 22 04:52:39 2017 +0000 |
| tree | e6da927c7072f2734eb172c83361be9d932fe302 | |
| parent | 6358cdcd28ab3b76d640541abc93b19a28114226 [diff] | |
| parent | db970be0fd9112199725f270613ecf808b886a29 [diff] |
Merge "Refactor TISM add/remove code" into oc-dev
diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerService.java b/services/autofill/java/com/android/server/autofill/AutofillManagerService.java index e85f96b..cb91f93 100644 --- a/services/autofill/java/com/android/server/autofill/AutofillManagerService.java +++ b/services/autofill/java/com/android/server/autofill/AutofillManagerService.java
@@ -270,6 +270,12 @@ } @Override + public void onSwitchUser(int userHandle) { + if (sDebug) Slog.d(TAG, "Hiding UI when user switched"); + mUi.hideAll(null); + } + + @Override public void onCleanupUser(int userId) { synchronized (mLock) { removeCachedServiceLocked(userId);
diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java index 1a02e8d..751c054 100644 --- a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java +++ b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java
@@ -360,8 +360,7 @@ } void disableOwnedAutofillServicesLocked(int uid) { - if (mInfo == null || mInfo.getServiceInfo().applicationInfo.uid - != UserHandle.getAppId(uid)) { + if (mInfo == null || mInfo.getServiceInfo().applicationInfo.uid != uid) { return; } final long identity = Binder.clearCallingIdentity();
diff --git a/services/autofill/java/com/android/server/autofill/ui/SaveUi.java b/services/autofill/java/com/android/server/autofill/ui/SaveUi.java index d1fbbf9..c9e2a92 100644 --- a/services/autofill/java/com/android/server/autofill/ui/SaveUi.java +++ b/services/autofill/java/com/android/server/autofill/ui/SaveUi.java
@@ -191,6 +191,7 @@ | WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL | WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH); + window.addPrivateFlags(WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS); window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN); window.setGravity(Gravity.BOTTOM | Gravity.CENTER); window.setCloseOnTouchOutside(true);