commit e49cc3d6595b4ee3bafdc032f59937b2cad75ec2
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 17 19:44:16 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 17 19:44:16 2018 +0000
tree 0e23eabe6f67f38834754a07026726750720027c
parent ea5243e28da98b3059348b6b4be760d1901bf6f5
parent 81469702f32be538b5efedbf65f6688785708153

Merge "Fix NPE crash in AppInfoBase"

src/com/android/settings/applications/AppInfoBase.java

diff --git a/src/com/android/settings/applications/AppInfoBase.java b/src/com/android/settings/applications/AppInfoBase.java
index e422076..2aa3b0b 100644
--- a/src/com/android/settings/applications/AppInfoBase.java
+++ b/src/com/android/settings/applications/AppInfoBase.java
@@ -138,7 +138,7 @@
         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();
             }
         }