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

am 3de09018: Merge "SettingsProvider should use correct cache when redirecting to user 0." into lmp-dev

Browse Source 
* commit '3de09018a9611b1791cc29ed5200b7d9694189a9':
  SettingsProvider should use correct cache when redirecting to user 0.
This commit is contained in:
Kenny Guy
2014-10-02 16:55:35 +00:00
committed by Android Git Automerger
parent c68aad9fd0 3de09018a9
commit bdcfc01b3b
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
View File

@@ -694,12 +694,11 @@ public class SettingsProvider extends ContentProvider {
if (Settings.CALL_METHOD_GET_SYSTEM.equals(method)) { if (Settings.CALL_METHOD_GET_SYSTEM.equals(method)) {
if (LOCAL_LOGV) Slog.v(TAG, "call(system:" + request + ") for " + callingUser); if (LOCAL_LOGV) Slog.v(TAG, "call(system:" + request + ") for " + callingUser);
// Check if this request should be (re)directed to the primary user's db // Check if this request should be (re)directed to the primary user's db
if (callingUser == UserHandle.USER_OWNER if (callingUser != UserHandle.USER_OWNER
|| shouldShadowParentProfile(callingUser, sSystemCloneToManagedKeys, request)) { && shouldShadowParentProfile(callingUser, sSystemCloneToManagedKeys, request)) {
dbHelper = getOrEstablishDatabase(UserHandle.USER_OWNER); callingUser = UserHandle.USER_OWNER;
} else {
dbHelper = getOrEstablishDatabase(callingUser);
} }
dbHelper = getOrEstablishDatabase(callingUser);
cache = sSystemCaches.get(callingUser); cache = sSystemCaches.get(callingUser);
return lookupValue(dbHelper, TABLE_SYSTEM, cache, request); return lookupValue(dbHelper, TABLE_SYSTEM, cache, request);
} }
@@ -713,10 +712,9 @@ public class SettingsProvider extends ContentProvider {
UserManager.DISALLOW_SHARE_LOCATION, new UserHandle(callingUser))) { UserManager.DISALLOW_SHARE_LOCATION, new UserHandle(callingUser))) {
return sSecureCaches.get(callingUser).putIfAbsent(request, ""); return sSecureCaches.get(callingUser).putIfAbsent(request, "");
} }
dbHelper = getOrEstablishDatabase(UserHandle.USER_OWNER); callingUser = UserHandle.USER_OWNER;
} else {
dbHelper = getOrEstablishDatabase(callingUser);
} }
dbHelper = getOrEstablishDatabase(callingUser);
cache = sSecureCaches.get(callingUser); cache = sSecureCaches.get(callingUser);
return lookupValue(dbHelper, TABLE_SECURE, cache, request); return lookupValue(dbHelper, TABLE_SECURE, cache, request);
} }