PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Cleanup SettingsChangeLogger onClose()" into udc-dev am: 87abc0644b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23159149

Change-Id: I8f2cc9be5a53dc0025e39e0b34eeac23b7e2b9e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-12 18:21:20 +00:00
committed by Automerger Merge Worker
parent 14035ceaff 87abc0644b
commit 6cfe9d1827
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java
+9 -1
View File
@@ -50,6 +50,7 @@ import com.android.launcher3.util.DisplayController;
import com.android.launcher3.util.DisplayController.Info;
import com.android.launcher3.util.MainThreadInitializedObject;
import com.android.launcher3.util.NavigationMode;
import com.android.launcher3.util.SafeCloseable;
import com.android.launcher3.util.SettingsCache;
import org.xmlpull.v1.XmlPullParser;
@@ -62,7 +63,8 @@ import java.util.Optional;
* Utility class to log launcher settings changes
*/
public class SettingsChangeLogger implements
DisplayController.DisplayInfoChangeListener, OnSharedPreferenceChangeListener {
DisplayController.DisplayInfoChangeListener, OnSharedPreferenceChangeListener,
SafeCloseable {
/**
* Singleton instance
@@ -188,6 +190,12 @@ public class SettingsChangeLogger implements
prefs.getBoolean(key, lp.defaultValue) ? lp.eventIdOn : lp.eventIdOff));
}
@Override
public void close() {
getPrefs(mContext).unregisterOnSharedPreferenceChangeListener(this);
getDevicePrefs(mContext).unregisterOnSharedPreferenceChangeListener(this);
}
private static class LoggablePref {
public boolean defaultValue;
public int eventIdOn;
tests/src/com/android/launcher3/util/LauncherModelHelper.java
+5 -5
View File
@@ -113,7 +113,7 @@ public class LauncherModelHelper {
private final HashMap<Class, HashMap<String, Field>> mFieldCache = new HashMap<>();
private final MockContentResolver mMockResolver = new MockContentResolver();
public final TestLauncherProvider provider;
public final SanboxModelContext sandboxContext;
public final SandboxModelContext sandboxContext;
public final long defaultProfileId;
@@ -128,7 +128,7 @@ public class LauncherModelHelper {
Settings.Global.getString(context.getContentResolver(), "test");
provider = new TestLauncherProvider();
sandboxContext = new SanboxModelContext();
sandboxContext = new SandboxModelContext();
defaultProfileId = UserCache.INSTANCE.get(sandboxContext)
.getSerialNumberForUser(Process.myUserHandle());
setupProvider(LauncherProvider.AUTHORITY, provider);
@@ -446,13 +446,13 @@ public class LauncherModelHelper {
return success;
}
public class SanboxModelContext extends SandboxContext {
public class SandboxModelContext extends SandboxContext {
private final ArrayMap<String, Object> mSpiedServices = new ArrayMap<>();
private final PackageManager mPm;
private final File mDbDir;
SanboxModelContext() {
SandboxModelContext() {
super(ApplicationProvider.getApplicationContext(),
UserCache.INSTANCE, InstallSessionHelper.INSTANCE, LauncherPrefs.INSTANCE,
LauncherAppState.INSTANCE, InvariantDeviceProfile.INSTANCE,
@@ -463,7 +463,7 @@ public class LauncherModelHelper {
mDbDir = new File(getCacheDir(), UUID.randomUUID().toString());
}
public SanboxModelContext allow(MainThreadInitializedObject object) {
public SandboxModelContext allow(MainThreadInitializedObject object) {
mAllowedObjects.add(object);
return this;
}