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

Merge "Fix crash in ExternalSourceDetailPreferenceController." into pi-dev

Browse Source 
am: 5ddff9371d

Change-Id: I26b3122b17b71e9729d198bcbaa8f1620c40e06e
This commit is contained in:
Doris Ling
2018-05-01 13:06:04 -07:00
committed by android-build-merger
parent 035e2006e8 5ddff9371d
commit 674fec7f3c
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceController.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.applications.appinfo;
import android.content.Context;
import android.content.pm.PackageInfo;
import android.os.UserManager;
import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.Preference;
@@ -57,9 +58,13 @@ public class ExternalSourceDetailPreferenceController extends AppInfoPreferenceC
@VisibleForTesting
boolean isPotentialAppSource() {
final PackageInfo packageInfo = mParent.getPackageInfo();
if (packageInfo == null) {
return false;
}
AppStateInstallAppsBridge.InstallAppsState appState =
new AppStateInstallAppsBridge(mContext, null, null).createInstallAppsStateFor(
mPackageName, mParent.getPackageInfo().applicationInfo.uid);
mPackageName, packageInfo.applicationInfo.uid);
return appState.isPotentialAppSource();
}

8
tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java
View File

@@ -101,4 +101,12 @@ public class ExternalSourceDetailPreferenceControllerTest {
verify(mPreference).setSummary(summary);
}
@Test
public void isPotentialAppSource_nullPackageInfo_shouldNotCrash() {
when(mUserManager.isManagedProfile()).thenReturn(false);
mController.isPotentialAppSource();
// no crash
}
}