Merge cherrypicks of [3478014, 3477856, 3478513, 3478514, 3477906, 3477682, 3477683, 3477758, 3477759, 3477760, 3478040, 3478041, 3478042, 3478438, 3478439, 3478440, 3478015, 3477684, 3477685, 3477686, 3477687, 3477688, 3477689, 3478550, 3478551, 3478552, 3478553, 3478554, 3478555] into oc-m3-release
Change-Id: I88da1588ed41e99051b1a0cbace4cb1e976d3db6
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());
