PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update the way OMS records details about overlays"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-12-11 21:51:35 +00:00
committed by Android (Google) Code Review
parent ae1011ee5d d79cc0de92
commit 854e3e8266
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/display/ThemePreferenceController.java
View File

@@ -125,7 +125,7 @@ public class ThemePreferenceController extends AbstractPreferenceController impl
private boolean isChangeableOverlay(String packageName) { private boolean isChangeableOverlay(String packageName) {
try { try {
PackageInfo pi = mPackageManager.getPackageInfo(packageName, 0); PackageInfo pi = mPackageManager.getPackageInfo(packageName, 0);
return pi != null && !pi.isStaticOverlay; return pi != null && !pi.isStaticOverlayPackage();
} catch (PackageManager.NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
return false; return false;
} }

4
tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java
View File

@@ -118,8 +118,8 @@ public class ThemePreferenceControllerTest {
} }
return info; return info;
}); });
PackageInfo pi = new PackageInfo(); PackageInfo pi = mock(PackageInfo.class);
pi.isStaticOverlay = true; when(pi.isStaticOverlayPackage()).thenReturn(true);
when(mMockPackageManager.getPackageInfo(eq("com.android.Theme1"), anyInt())).thenReturn(pi); when(mMockPackageManager.getPackageInfo(eq("com.android.Theme1"), anyInt())).thenReturn(pi);
when(mMockPackageManager.getPackageInfo(eq("com.android.Theme2"), anyInt())).thenReturn( when(mMockPackageManager.getPackageInfo(eq("com.android.Theme2"), anyInt())).thenReturn(
new PackageInfo()); new PackageInfo());