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

Merge "Do not retrive app detail if the fragment is exiting." into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-09 21:19:24 +00:00
committed by Android (Google) Code Review
parent 5840e1e1cd 276edc8d86
commit dda677cf77
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,7 +112,8 @@ public class AppInfoDashboardFragment extends DashboardFragment
private UserManager mUserManager; private UserManager mUserManager;
private PackageManager mPm; private PackageManager mPm;
private boolean mFinishing; @VisibleForTesting
boolean mFinishing;
private boolean mListeningToPackageRemove; private boolean mListeningToPackageRemove;
@@ -544,7 +545,7 @@ public class AppInfoDashboardFragment extends DashboardFragment
@VisibleForTesting @VisibleForTesting
void retrieveAppEntry() { void retrieveAppEntry() {
final Activity activity = getActivity(); final Activity activity = getActivity();
if (activity == null) { if (activity == null || mFinishing) {
return; return;
} }
if (mState == null) { if (mState == null) {
@@ -650,7 +651,7 @@ public class AppInfoDashboardFragment extends DashboardFragment
|| TextUtils.equals(mAppEntry.info.packageName, packageName)) { || TextUtils.equals(mAppEntry.info.packageName, packageName)) {
onPackageRemoved(); onPackageRemoved();
} else if (mAppEntry.info.isResourceOverlay() } else if (mAppEntry.info.isResourceOverlay()
&& TextUtils.equals(mPackageInfo.overlayTarget, packageName)) { && TextUtils.equals(mPackageInfo.overlayTarget, packageName)) {
refreshUi(); refreshUi();
} }
} }

7
tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java
View File

@@ -281,6 +281,13 @@ public final class AppInfoDashboardFragmentTest {
assertThat(mFragment.createPreferenceControllers(mShadowContext)).isNull(); assertThat(mFragment.createPreferenceControllers(mShadowContext)).isNull();
} }
@Test
public void getPreferenceControllers_exiting_shouldReturnNull() {
mFragment.mFinishing = true;
assertThat(mFragment.createPreferenceControllers(mShadowContext)).isNull();
}
@Test @Test
public void getNumberOfUserWithPackageInstalled_twoUsersInstalled_shouldReturnTwo() public void getNumberOfUserWithPackageInstalled_twoUsersInstalled_shouldReturnTwo()
throws PackageManager.NameNotFoundException { throws PackageManager.NameNotFoundException {