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

Merge "Revert "Persist settings on a dedicated background thread"" into nyc-dev

Browse Source
This commit is contained in:
Guang Zhu
2016-05-10 07:03:06 +00:00
committed by Android (Google) Code Review
parent b31c073689 5537ce1f94
commit 875e99443f
3 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,7 +46,6 @@ import android.os.Debug;
import android.os.DropBoxManager; import android.os.DropBoxManager;
import android.os.Environment; import android.os.Environment;
import android.os.Handler; import android.os.Handler;
import android.os.HandlerThread;
import android.os.Looper; import android.os.Looper;
import android.os.Message; import android.os.Message;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
@@ -200,12 +199,6 @@ public class SettingsProvider extends ContentProvider {
@GuardedBy("mLock") @GuardedBy("mLock")
private SettingsRegistry mSettingsRegistry; private SettingsRegistry mSettingsRegistry;
@GuardedBy("mLock")
private HandlerThread mHandlerThread;
@GuardedBy("mLock")
private Handler mBackgroundHandler;
// We have to call in the user manager with no lock held, // We have to call in the user manager with no lock held,
private volatile UserManager mUserManager; private volatile UserManager mUserManager;
@@ -252,10 +245,6 @@ public class SettingsProvider extends ContentProvider {
mUserManager = UserManager.get(getContext()); mUserManager = UserManager.get(getContext());
mPackageManager = AppGlobals.getPackageManager(); mPackageManager = AppGlobals.getPackageManager();
mSettingsRegistry = new SettingsRegistry(); mSettingsRegistry = new SettingsRegistry();
mHandlerThread = new HandlerThread(LOG_TAG,
Process.THREAD_PRIORITY_BACKGROUND);
mHandlerThread.start();
mBackgroundHandler = new Handler(mHandlerThread.getLooper());
} }
registerBroadcastReceivers(); registerBroadcastReceivers();
startWatchingUserRestrictionChanges(); startWatchingUserRestrictionChanges();
@@ -1680,7 +1669,7 @@ public class SettingsProvider extends ContentProvider {
if (mSettingsStates.get(key) == null) { if (mSettingsStates.get(key) == null) {
final int maxBytesPerPackage = getMaxBytesPerPackageForType(getTypeFromKey(key)); final int maxBytesPerPackage = getMaxBytesPerPackageForType(getTypeFromKey(key));
SettingsState settingsState = new SettingsState(mLock, getSettingsFile(key), key, SettingsState settingsState = new SettingsState(mLock, getSettingsFile(key), key,
maxBytesPerPackage, mBackgroundHandler); maxBytesPerPackage);
mSettingsStates.put(key, settingsState); mSettingsStates.put(key, settingsState);
} }
} }

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

@@ -95,7 +95,7 @@ final class SettingsState {
private final Object mLock; private final Object mLock;
private final Handler mHandler; private final Handler mHandler = new MyHandler();
@GuardedBy("mLock") @GuardedBy("mLock")
private final ArrayMap<String, Setting> mSettings = new ArrayMap<>(); private final ArrayMap<String, Setting> mSettings = new ArrayMap<>();
@@ -134,15 +134,13 @@ final class SettingsState {
@GuardedBy("mLock") @GuardedBy("mLock")
private long mNextId; private long mNextId;
public SettingsState(Object lock, File file, int key, int maxBytesPerAppPackage, public SettingsState(Object lock, File file, int key, int maxBytesPerAppPackage) {
Handler handler) {
// It is important that we use the same lock as the settings provider // It is important that we use the same lock as the settings provider
// to ensure multiple mutations on this state are atomicaly persisted // to ensure multiple mutations on this state are atomicaly persisted
// as the async persistence should be blocked while we make changes. // as the async persistence should be blocked while we make changes.
mLock = lock; mLock = lock;
mStatePersistFile = file; mStatePersistFile = file;
mKey = key; mKey = key;
mHandler = handler;
if (maxBytesPerAppPackage == MAX_BYTES_PER_APP_PACKAGE_LIMITED) { if (maxBytesPerAppPackage == MAX_BYTES_PER_APP_PACKAGE_LIMITED) {
mMaxBytesPerAppPackage = maxBytesPerAppPackage; mMaxBytesPerAppPackage = maxBytesPerAppPackage;
mPackageToMemoryUsage = new ArrayMap<>(); mPackageToMemoryUsage = new ArrayMap<>();

7
packages/SettingsProvider/test/src/com/android/providers/settings/SettingsStateTest.java
View File

@@ -15,7 +15,6 @@
*/ */
package com.android.providers.settings; package com.android.providers.settings;
import android.os.Handler;
import android.test.AndroidTestCase; import android.test.AndroidTestCase;
import android.util.Xml; import android.util.Xml;
@@ -127,7 +126,7 @@ public class SettingsStateTest extends AndroidTestCase {
final Object lock = new Object(); final Object lock = new Object();
final SettingsState ssWriter = new SettingsState(lock, file, 1, final SettingsState ssWriter = new SettingsState(lock, file, 1,
SettingsState.MAX_BYTES_PER_APP_PACKAGE_UNLIMITED, new Handler()); SettingsState.MAX_BYTES_PER_APP_PACKAGE_UNLIMITED);
ssWriter.setVersionLocked(SettingsState.SETTINGS_VERSOIN_NEW_ENCODING); ssWriter.setVersionLocked(SettingsState.SETTINGS_VERSOIN_NEW_ENCODING);
ssWriter.insertSettingLocked("k1", "\u0000", "package"); ssWriter.insertSettingLocked("k1", "\u0000", "package");
@@ -139,7 +138,7 @@ public class SettingsStateTest extends AndroidTestCase {
} }
final SettingsState ssReader = new SettingsState(lock, file, 1, final SettingsState ssReader = new SettingsState(lock, file, 1,
SettingsState.MAX_BYTES_PER_APP_PACKAGE_UNLIMITED, new Handler()); SettingsState.MAX_BYTES_PER_APP_PACKAGE_UNLIMITED);
synchronized (lock) { synchronized (lock) {
assertEquals("\u0000", ssReader.getSettingLocked("k1").getValue()); assertEquals("\u0000", ssReader.getSettingLocked("k1").getValue());
assertEquals("abc", ssReader.getSettingLocked("k2").getValue()); assertEquals("abc", ssReader.getSettingLocked("k2").getValue());
@@ -166,7 +165,7 @@ public class SettingsStateTest extends AndroidTestCase {
os.close(); os.close();
final SettingsState ss = new SettingsState(lock, file, 1, final SettingsState ss = new SettingsState(lock, file, 1,
SettingsState.MAX_BYTES_PER_APP_PACKAGE_UNLIMITED, new Handler()); SettingsState.MAX_BYTES_PER_APP_PACKAGE_UNLIMITED);
synchronized (lock) { synchronized (lock) {
SettingsState.Setting s; SettingsState.Setting s;
s = ss.getSettingLocked("k0"); s = ss.getSettingLocked("k0");