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

Merge "Update the way OMS records details about overlays" into oc-mr1-dev

Browse Source 
am: 15b42b89b8

Change-Id: I15809e100fc46691f0f60ed2729c18a07d904313
This commit is contained in:
Adam Lesinski
2017-12-12 23:16:37 +00:00
committed by android-build-merger
parent 9840c89235 15b42b89b8
commit 11ab7f7b82
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) {
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;
}

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

@@ -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());