commit b5697b2d45eb6397431e40f333b4a7b7f680e975
author tiansiming <tiansiming@xiaomi.com> Thu Jan 18 02:25:19 2018 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 18 02:25:19 2018 +0000
tree 044e9729a05770f3ac78a1e7d1c53dab712f70b5
parent 00322c0f83f3e6fd09a632f221239075d8cf1f13
parent abcb069d95a7a46e465ebf66433c209c75fb991b

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

Change-Id: Id60245ba109dc977ee1078e8d3f50288e5bdbcc7

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();
             }
         }