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

Merge "Revert "Revert "[SettingsProvider] skip caching in system server""" into udc-dev am: 23cdcba71c

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22999028

Change-Id: Ibcaee0bcc2231d50e922cb77044eb4a4e732eba5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Song Chun Fan
2023-05-08 20:34:07 +00:00
committed by Automerger Merge Worker
parent ad0d693cf6 23cdcba71c
commit e9d9b92141
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3036,9 +3036,7 @@ public final class Settings {
public void destroy() { public void destroy() {
try { try {
// If this process is the system server process, mArray is the same object as if (!mArray.isClosed()) {
// the memory int array kept inside SettingsProvider, so skipping the close()
if (!Settings.isInSystemServer() && !mArray.isClosed()) {
mArray.close(); mArray.close();
} }
} catch (IOException e) { } catch (IOException e) {
@@ -3218,8 +3216,9 @@ public final class Settings {
@UnsupportedAppUsage @UnsupportedAppUsage
public String getStringForUser(ContentResolver cr, String name, final int userHandle) { public String getStringForUser(ContentResolver cr, String name, final int userHandle) {
final boolean isSelf = (userHandle == UserHandle.myUserId()); final boolean isSelf = (userHandle == UserHandle.myUserId());
final boolean useCache = isSelf && !isInSystemServer();
boolean needsGenerationTracker = false; boolean needsGenerationTracker = false;
if (isSelf) { if (useCache) {
synchronized (NameValueCache.this) { synchronized (NameValueCache.this) {
final GenerationTracker generationTracker = mGenerationTrackers.get(name); final GenerationTracker generationTracker = mGenerationTrackers.get(name);
if (generationTracker != null) { if (generationTracker != null) {
@@ -3365,9 +3364,12 @@ public final class Settings {
} }
} }
} else { } else {
if (LOCAL_LOGV) Log.i(TAG, "call-query of user " + userHandle if (DEBUG || LOCAL_LOGV) {
+ " by " + UserHandle.myUserId() Log.i(TAG, "call-query of user " + userHandle
+ " so not updating cache"); + " by " + UserHandle.myUserId()
+ (isInSystemServer() ? " in system_server" : "")
+ " so not updating cache");
}
} }
return value; return value;
} }