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

Update the way OMS records details about overlays

Browse Source 
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
This commit is contained in:
Adam Lesinski
2017-11-14 11:10:08 -08:00
parent 6c12f06bf8
commit 9e19121a00
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/display/ThemePreferenceController.java
View File

@@ -125,7 +125,7 @@ public class ThemePreferenceController extends AbstractPreferenceController impl
private boolean isChangeableOverlay(String packageName) { private boolean isChangeableOverlay(String packageName) {
try { try {
PackageInfo pi = mPackageManager.getPackageInfo(packageName, 0); 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) { } catch (PackageManager.NameNotFoundException e) {
return false; return false;
} }

2
tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java
View File

@@ -119,7 +119,7 @@ public class ThemePreferenceControllerTest {
return info; return info;
}); });
PackageInfo pi = new PackageInfo(); 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.Theme1"), anyInt())).thenReturn(pi);
when(mMockPackageManager.getPackageInfo(eq("com.android.Theme2"), anyInt())).thenReturn( when(mMockPackageManager.getPackageInfo(eq("com.android.Theme2"), anyInt())).thenReturn(
new PackageInfo()); new PackageInfo());