Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11ab7f7b authored by Adam Lesinski's avatar Adam Lesinski Committed by android-build-merger
Browse files

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

am: 15b42b89

Change-Id: I15809e100fc46691f0f60ed2729c18a07d904313
parents 9840c892 15b42b89

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -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());