Merge "Fix crash in ExternalSourceDetailPreferenceController." into pi-dev (5ddff937) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceController.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -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 −0

Original line number	Diff line number	Diff line
		@@ -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
		}
		}