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

Merge "Return false if can't find package info"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-10-03 00:30:35 +00:00
committed by Android (Google) Code Review
parent 78922b8a75 883d8e7ed1
commit 13b500297d
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,9 +137,13 @@ public class UsageAccessDetails extends AppInfoWithHeader implements OnPreferenc
@Override @Override
protected boolean refreshUi() { protected boolean refreshUi() {
if (mPackageInfo == null) { retrieveAppEntry();
if (mAppEntry == null) {
return false; return false;
} }
if (mPackageInfo == null) {
return false; // onCreate must have failed, make sure to exit
}
mUsageState = mUsageBridge.getUsageInfo(mPackageName, mUsageState = mUsageBridge.getUsageInfo(mPackageName,
mPackageInfo.applicationInfo.uid); mPackageInfo.applicationInfo.uid);

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

@@ -16,17 +16,20 @@
package com.android.settings.applications; package com.android.settings.applications;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.eq; import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
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 android.os.Bundle;
import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig; import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.ApplicationsState;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@@ -68,9 +71,12 @@ public class UsageAccessDetailsTest {
} }
@Test @Test
public void refreshUi_nullPackageInfo_shouldNotCrash() throws RemoteException { public void refreshUi_hasNoAppEntry_shouldReturnFalse() {
mFragment.mPackageInfo = null; mFragment.mState = mock(ApplicationsState.class);
mFragment.refreshUi(); mFragment.setArguments(new Bundle());
// should not crash
assertThat(mFragment.refreshUi()).isFalse();
assertThat(mFragment.mAppEntry).isNull();
assertThat(mFragment.mPackageInfo).isNull();
} }
} }