commit 9b87c6601fc8618bcd90af45409fbface2b2b836
author android-build-prod (mdb) <android-build-team-robot@google.com> Tue Mar 13 15:30:57 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 13 15:30:57 2018 +0000
tree 2c7b95ab32d6bbcb67f1ea7162b82f70ba2166af
parent ccfa9a8a277dc7f091396dc78c4ecf96accc896a
parent 842d1b822684ee59aba5d8e3f20e17696443ab17

Merge "Snap for 4649591 from 6021cde9513345ff2bc20b518a3d8aadc2e4d15b to oreo-mr1-cts-release" into oreo-mr1-cts-release

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