commit 11ab7f7b821a4334c8fcc12881d00ca4ca67e716
author Adam Lesinski <adamlesinski@google.com> Tue Dec 12 23:16:37 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Dec 12 23:16:37 2017 +0000
tree 82b96c7bc6e5a9b62ab01cfb821be40ea9bdd58a
parent 9840c8923515cc808857a81fc60277eafa76b09f
parent 15b42b89b899965a2d285d48ee94f99c377cc7e5

Merge "Update the way OMS records details about overlays" into oc-mr1-dev
am: 15b42b89b8

Change-Id: I15809e100fc46691f0f60ed2729c18a07d904313

src/com/android/settings/display/ThemePreferenceController.java

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;
         }

tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java

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