Merge "Fix NPE crash in AppInfoBase"

am: e49cc3d659 Change-Id: I719b50356e890e57a8d6574aae23a2d5d0fd989b
2018-01-18 02:15:29 +00:00
parent b4ed2b2005 e49cc3d659
commit abcb069d95
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
@@ -138,7 +138,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();
            }
        }