Fix a crash when opening uninstalled app detail page
Change-Id: I417e7eb6f9c857ace4e8047b226abe03a7c8248d Fix: 36027848 Fix: 34392538 Test: make RunSettingsRoboTests
This commit is contained in:
@@ -16,8 +16,6 @@
|
||||
|
||||
package com.android.settings.applications;
|
||||
|
||||
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
|
||||
|
||||
import android.Manifest.permission;
|
||||
import android.app.Activity;
|
||||
import android.app.ActivityManager;
|
||||
@@ -68,7 +66,6 @@ import android.view.Menu;
|
||||
import android.view.MenuInflater;
|
||||
import android.view.MenuItem;
|
||||
import android.view.View;
|
||||
import android.view.View.OnClickListener;
|
||||
import android.view.ViewGroup;
|
||||
import android.webkit.IWebViewUpdateService;
|
||||
import android.widget.Button;
|
||||
@@ -115,6 +112,8 @@ import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
|
||||
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
|
||||
|
||||
/**
|
||||
* Activity to display application information from Settings. This activity presents
|
||||
* extended information associated with a package like code, data, total size, permissions
|
||||
@@ -325,6 +324,10 @@ public class InstalledAppDetails extends AppInfoBase
|
||||
super.onCreate(icicle);
|
||||
final Activity activity = getActivity();
|
||||
|
||||
if (!ensurePackageInfoAvailable(activity)) {
|
||||
return;
|
||||
}
|
||||
|
||||
setHasOptionsMenu(true);
|
||||
addPreferencesFromResource(R.xml.installed_app_details_ia);
|
||||
addDynamicPrefs();
|
||||
@@ -434,6 +437,23 @@ public class InstalledAppDetails extends AppInfoBase
|
||||
refreshUi();
|
||||
}
|
||||
|
||||
/**
|
||||
* Ensures the {@link PackageInfo} is available to proceed. If it's not available, the fragment
|
||||
* will finish.
|
||||
*
|
||||
* @return true if packageInfo is available.
|
||||
*/
|
||||
@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
|
||||
boolean ensurePackageInfoAvailable(Activity activity) {
|
||||
if (mPackageInfo == null) {
|
||||
mFinishing = true;
|
||||
Log.w(LOG_TAG, "Package info not available. Is this package already uninstalled?");
|
||||
activity.finishAndRemoveTask();
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
private void prepareUninstallAndStop() {
|
||||
mForceStopButton = (Button) mFooter.findViewById(R.id.right_button);
|
||||
mForceStopButton.setText(R.string.force_stop);
|
||||
|
Reference in New Issue
Block a user