commit 0dee1961812ad5ac17e8fab3dc4e3e9844fb2ca6
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Oct 26 03:57:36 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Oct 26 03:57:36 2021 +0000
tree 246c776f5274bff8d15bc07a6014421d663d2075
parent 5b44127dc600e2435861fadc2bf4807085bdac32
parent 1568b185a5f382e35a7212ebe8a3543c4aab4d78

Merge "Fix the NPE when input a wrong package" into sc-v2-dev am: baa58563bf am: 1568b185a5

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16115939

Change-Id: Ifddb7c09a8f0d3f6868ac60c1a935b586e2a5baa

src/com/android/settings/applications/intentpicker/AppLaunchSettings.java

diff --git a/src/com/android/settings/applications/intentpicker/AppLaunchSettings.java b/src/com/android/settings/applications/intentpicker/AppLaunchSettings.java
index 43c377a..88ce786 100644
--- a/src/com/android/settings/applications/intentpicker/AppLaunchSettings.java
+++ b/src/com/android/settings/applications/intentpicker/AppLaunchSettings.java
@@ -105,6 +105,11 @@
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        if (mAppEntry == null) {
+            Log.w(TAG, "onCreate: mAppEntry is null, please check the reason!!!");
+            getActivity().finish();
+            return;
+        }
         addPreferencesFromResource(R.xml.installed_app_launch_settings);
         mDomainVerificationManager = mContext.getSystemService(DomainVerificationManager.class);
         initUIComponents();