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

Commit da599e4e authored by Adam Lesinski's avatar Adam Lesinski Committed by android-build-team Robot
Browse files

Update the way OMS records details about overlays 

Use flags, since we keep introducing boolean traits which would
be wasteful to encode as booleans.

Bug: 69383160
Test: builds
Change-Id: Ic09ae1086c7afa039b5df11e4c8c968125784586
Merged-In: Ic09ae1086c7afa039b5df11e4c8c968125784586
(cherry picked from commit 9e19121a)
parent a78d18a7

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