commit 9205749cfe9c36fb740bb067805351fb8abf9c8f
author Svetoslav Ganov <svetoslavganov@google.com> Mon May 16 12:36:43 2016 -0700
committer Svetoslav Ganov <svetoslavganov@google.com> Mon May 16 12:36:48 2016 -0700
tree 37bbfa1cdf78d53ea085ed9c153192bc2a97df03
parent 252a6b125bdaced7d928167e0fbc4dd2ba95e8a1

Use the correct handler when persisting the settings state.

bug:28784358

Change-Id: Iba9d569bae67c7ba0c3ab0a486ae14efa84a7acf

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 f49594c..774be60 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -203,9 +203,6 @@
     @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;
 
@@ -254,7 +251,6 @@
             mHandlerThread = new HandlerThread(LOG_TAG,
                     Process.THREAD_PRIORITY_BACKGROUND);
             mHandlerThread.start();
-            mBackgroundHandler = new Handler(mHandlerThread.getLooper());
             mSettingsRegistry = new SettingsRegistry();
         }
         registerBroadcastReceivers();
@@ -1680,7 +1676,7 @@
             if (mSettingsStates.get(key) == null) {
                 final int maxBytesPerPackage = getMaxBytesPerPackageForType(getTypeFromKey(key));
                 SettingsState settingsState = new SettingsState(mLock, getSettingsFile(key), key,
-                        maxBytesPerPackage, mBackgroundHandler);
+                        maxBytesPerPackage, mHandlerThread.getLooper());
                 mSettingsStates.put(key, settingsState);
             }
         }