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

Merge "Fix NPE crash in UsageAccessDetails" am: cd959f28a0 am: 296c46404c am: c13415391b

Browse Source 
am: 913d1667ce

Change-Id: Ib859bec6cd9ca1422856d091fc7a0b9894397b04
This commit is contained in:
Doris Ling
2017-09-21 19:31:54 +00:00
committed by android-build-merger
parent 5733267b15 913d1667ce
commit 744ff5c607
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/applications/AppInfoBase.java
View File

@@ -217,7 +217,9 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment
@Override @Override
public void onPackageListChanged() { public void onPackageListChanged() {
refreshUi(); if (!refreshUi()) {
setIntentAndFinish(true, true);
}
} }
public static void startAppInfoFragment(Class<?> fragment, int titleRes, public static void startAppInfoFragment(Class<?> fragment, int titleRes,

3
src/com/android/settings/applications/UsageAccessDetails.java
View File

@@ -137,6 +137,9 @@ public class UsageAccessDetails extends AppInfoWithHeader implements OnPreferenc
@Override @Override
protected boolean refreshUi() { protected boolean refreshUi() {
if (mPackageInfo == null) {
return false;
}
mUsageState = mUsageBridge.getUsageInfo(mPackageName, mUsageState = mUsageBridge.getUsageInfo(mPackageName,
mPackageInfo.applicationInfo.uid); mPackageInfo.applicationInfo.uid);

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

@@ -21,6 +21,7 @@ import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import android.content.Context; import android.content.Context;
import android.os.RemoteException;
import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -65,4 +66,11 @@ public class UsageAccessDetailsTest {
verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class), verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_USAGE_VIEW_DENY), eq("app")); eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_USAGE_VIEW_DENY), eq("app"));
} }
@Test
public void refreshUi_nullPackageInfo_shouldNotCrash() throws RemoteException {
mFragment.mPackageInfo = null;
mFragment.refreshUi();
// should not crash
}
} }