Merge "Fix NPE crash in AppInfoBase" am: e49cc3d659 am: abcb069d95

am: b5697b2d45 Change-Id: I5e40dde6e0f98a8ba046df78f9b9e3ddcc3f2ce9
2018-01-18 02:34:11 +00:00
parent 18d249074d b5697b2d45
commit 8e3e611755
1 changed files with 1 additions and 1 deletions
--- a/src/com/android/settings/applications/AppInfoBase.java
+++ b/src/com/android/settings/applications/AppInfoBase.java
@@ -131,7 +131,7 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment
        if (mPackageName == null) {
            Intent intent = (args == null) ?
                    getActivity().getIntent() : (Intent) args.getParcelable("intent");
-            if (intent != null) {
+            if (intent != null && intent.getData() != null) {
                mPackageName = intent.getData().getSchemeSpecificPart();
            }
        }