commit 2c3fbda0549962102903e9a91330c1bde55d6f92
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Sep 27 10:13:07 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 27 10:13:07 2024 +0000
tree f7452ca84fa250fe04d50d77454731db2ac0b4e4
parent 5c3c9cbdeb985058e51b460368150b37497ed329
parent 9a0ba22e79fb4a304bcce2b4df7351e432a424fd

Merge "Add a check to ensure that intent data is available before proceeding." into main am: 9a0ba22e79

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

Change-Id: I9964a5759041f686bfe905e10e013ff663c666b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java

diff --git a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
index 90d733e..1712e85 100644
--- a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
+++ b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
@@ -715,7 +715,7 @@
         if (mPackageName == null) {
             final Intent intent = args == null ?
                     getActivity().getIntent() : (Intent) args.getParcelable("intent");
-            if (intent != null) {
+            if (intent != null && intent.getData() != null) {
                 mPackageName = intent.getData().getSchemeSpecificPart();
             }
         }