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

Commit 854e3e82 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update the way OMS records details about overlays"

parents ae1011ee d79cc0de

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

        } catch (PackageManager.NameNotFoundException e) {

            return false;

        }

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

+2 −2
Original line number Diff line number Diff line
@@ -118,8 +118,8 @@ public class ThemePreferenceControllerTest { 
            }

            return info;

        });

        PackageInfo pi = new PackageInfo();

        pi.isStaticOverlay = true;

        PackageInfo pi = mock(PackageInfo.class);

        when(pi.isStaticOverlayPackage()).thenReturn(true);

        when(mMockPackageManager.getPackageInfo(eq("com.android.Theme1"), anyInt())).thenReturn(pi);

        when(mMockPackageManager.getPackageInfo(eq("com.android.Theme2"), anyInt())).thenReturn(

                new PackageInfo());