| commit | e5412496d29464a505281ef89ffc37f4eacf88a6 | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Tue Nov 14 11:10:08 2017 -0800 |
| committer | Ryan Longair <rlongair@google.com> | Thu Jan 18 10:17:50 2018 -0800 |
| tree | c36722f06791ee36d04f284920abf45a0113d75f | |
| parent | 75f2cf9a09bf21a173db18c5cbe07b3ba44e7d36 [diff] |
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 (cherry picked from commit 9e19121a00b85d7618bf294f70afa0f205e3ac00)
diff --git a/src/com/android/settings/display/ThemePreferenceController.java b/src/com/android/settings/display/ThemePreferenceController.java index 3bb58b1..5eeb390 100644 --- a/src/com/android/settings/display/ThemePreferenceController.java +++ b/src/com/android/settings/display/ThemePreferenceController.java
@@ -125,7 +125,7 @@ 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 69c8c54..8c6e8da 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 @@ 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());