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

Update the way OMS records details about overlays

Browse Source 
Use newly added getter methods instead of relying on internal state.

Bug: 69383160
Test: builds and unit test passes
Change-Id: Ic09ae1086c7afa039b5df11e4c8c968125784586
This commit is contained in:
Adam Lesinski
2017-11-14 11:10:08 -08:00
parent 82789a1f39
commit d79cc0de92
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());