From 9e19121a00b85d7618bf294f70afa0f205e3ac00 Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Tue, 14 Nov 2017 11:10:08 -0800 Subject: [PATCH] Update the way OMS records details about overlays Use flags, since we keep introducing boolean traits which would be wasteful to encode as booleans. Bug: 69383160 Test: builds Change-Id: Ic09ae1086c7afa039b5df11e4c8c968125784586 Merged-In: Ic09ae1086c7afa039b5df11e4c8c968125784586 --- src/com/android/settings/display/ThemePreferenceController.java | 2 +- .../android/settings/display/ThemePreferenceControllerTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/display/ThemePreferenceController.java b/src/com/android/settings/display/ThemePreferenceController.java index 3bb58b15d0c..5eeb3906c07 100644 --- a/src/com/android/settings/display/ThemePreferenceController.java +++ b/src/com/android/settings/display/ThemePreferenceController.java @@ -125,7 +125,7 @@ public class ThemePreferenceController extends AbstractPreferenceController impl private boolean isChangeableOverlay(String packageName) { try { PackageInfo pi = mPackageManager.getPackageInfo(packageName, 0); - return pi != null && !pi.isStaticOverlay; + return pi != null && (pi.overlayFlags & PackageInfo.FLAG_OVERLAY_STATIC) == 0; } catch (PackageManager.NameNotFoundException e) { return false; } diff --git a/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java b/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java index 69c8c54c672..8c6e8da0db7 100644 --- a/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java @@ -119,7 +119,7 @@ public class ThemePreferenceControllerTest { return info; }); PackageInfo pi = new PackageInfo(); - pi.isStaticOverlay = true; + pi.overlayFlags |= PackageInfo.FLAG_OVERLAY_STATIC; when(mMockPackageManager.getPackageInfo(eq("com.android.Theme1"), anyInt())).thenReturn(pi); when(mMockPackageManager.getPackageInfo(eq("com.android.Theme2"), anyInt())).thenReturn( new PackageInfo());