commit 5537ce1f94ef1851d316ecf029e13ef7833f6c3a
author Guang Zhu <guangzhu@google.com> Tue May 10 07:02:42 2016 +0000
committer Guang Zhu <guangzhu@google.com> Tue May 10 07:02:42 2016 +0000
tree 9f406cacdacb9d3231d41c15f73403a9a2c60c7f
parent 82b8c92b97d3c7006d7a9f67a9cdb83263d6bf2c

Revert "Persist settings on a dedicated background thread"

Bug: 25472484

This reverts commit 82b8c92b97d3c7006d7a9f67a9cdb83263d6bf2c.

Change-Id: I1a8c2e186ad74d78f1c82fe508c6f71c438177dc

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index 2095a47..5ff9c0c 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -46,7 +46,6 @@
 import android.os.DropBoxManager;
 import android.os.Environment;
 import android.os.Handler;
-import android.os.HandlerThread;
 import android.os.Looper;
 import android.os.Message;
 import android.os.ParcelFileDescriptor;
@@ -200,12 +199,6 @@
     @GuardedBy("mLock")
     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,
     private volatile UserManager mUserManager;
 
@@ -252,10 +245,6 @@
             mUserManager = UserManager.get(getContext());
             mPackageManager = AppGlobals.getPackageManager();
             mSettingsRegistry = new SettingsRegistry();
-            mHandlerThread = new HandlerThread(LOG_TAG,
-                    Process.THREAD_PRIORITY_BACKGROUND);
-            mHandlerThread.start();
-            mBackgroundHandler = new Handler(mHandlerThread.getLooper());
         }
         registerBroadcastReceivers();
         startWatchingUserRestrictionChanges();
@@ -1680,7 +1669,7 @@
             if (mSettingsStates.get(key) == null) {
                 final int maxBytesPerPackage = getMaxBytesPerPackageForType(getTypeFromKey(key));
                 SettingsState settingsState = new SettingsState(mLock, getSettingsFile(key), key,
-                        maxBytesPerPackage, mBackgroundHandler);
+                        maxBytesPerPackage);
                 mSettingsStates.put(key, settingsState);
             }
         }