Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clone autofill service settings on managed profile." into oc-dev

Browse Source 
am: fad9b07e31

Change-Id: I0c65659302047536a2b2b594cdb90e1aa05b4621
This commit is contained in:
Felipe Leme
2017-04-19 00:28:27 +00:00
committed by android-build-merger
parent a1600f6722 fad9b07e31
commit 0f3a9cf166
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/provider/Settings.java
View File

@@ -7077,6 +7077,7 @@ public final class Settings {
CLONE_TO_MANAGED_PROFILE.add(ACCESSIBILITY_ENABLED);
CLONE_TO_MANAGED_PROFILE.add(ALLOW_MOCK_LOCATION);
CLONE_TO_MANAGED_PROFILE.add(ALLOWED_GEOLOCATION_ORIGINS);
CLONE_TO_MANAGED_PROFILE.add(AUTOFILL_SERVICE);
CLONE_TO_MANAGED_PROFILE.add(DEFAULT_INPUT_METHOD);
CLONE_TO_MANAGED_PROFILE.add(ENABLED_ACCESSIBILITY_SERVICES);
CLONE_TO_MANAGED_PROFILE.add(ENABLED_INPUT_METHODS);

4
services/autofill/java/com/android/server/autofill/AutofillManagerService.java
View File

@@ -184,7 +184,7 @@ public final class AutofillManagerService extends SystemService {
}
@Override
public void onStopUser(int userId) {
public void onCleanupUser(int userId) {
synchronized (mLock) {
removeCachedServiceLocked(userId);
}
@@ -211,7 +211,7 @@ public final class AutofillManagerService extends SystemService {
/**
* Peeks the service instance for a user.
*
* @return service instance or null if not already present
* @return service instance or {@code null} if not already present
*/
@Nullable
AutofillManagerServiceImpl peekServiceForUserLocked(int userId) {