commit 3ceb288a211f724a4926ec30666926b6fa152bd9
author Agatha Man <agathaman@google.com> Fri Jul 31 10:05:12 2020 -0700
committer Igor Razumeiko <igorr@google.com> Fri Aug 07 16:04:53 2020 +0000
tree 4fb07228496f4e0872de645069b47993db0e6820
parent 58beabb31ea4200b4a37184c04ad13d8a8409917

Allow Recent Location Requests for any app

Any app that recently requested location will appear in the Recent
Location Requests screen. Before this fix, the click listener only
applies to apps that matches the MATCH_DEFAULT_ONLY filter. Therefore,
preventing apps without CATEGORY_DEFAULT in their manifest from launching
on click.

This change
- adds a null pointer check to ensure resolveInfo is not null from
packageManager.resolveActivity
- removes the PackageManager.MATCH_DEFAULT_ONLY filter when calling
packageManager.resolveActivity

Bug: 161729298
Bug: 160695921
Test: manual
Change-Id: Ib740cadae213ea6d4465f599505abc07d0184933

src/com/android/car/settings/location/RecentLocationRequestsPreferenceController.java

diff --git a/src/com/android/car/settings/location/RecentLocationRequestsPreferenceController.java b/src/com/android/car/settings/location/RecentLocationRequestsPreferenceController.java
index 6860e7b..3b54468 100644
--- a/src/com/android/car/settings/location/RecentLocationRequestsPreferenceController.java
+++ b/src/com/android/car/settings/location/RecentLocationRequestsPreferenceController.java
@@ -19,7 +19,6 @@
 import android.car.drivingstate.CarUxRestrictions;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 
 import androidx.annotation.VisibleForTesting;
@@ -98,13 +97,15 @@
         pref.setTitle(request.label);
         Intent intent = new Intent();
         intent.setPackage(request.packageName);
-        ResolveInfo resolveInfo = getContext().getPackageManager().resolveActivity(intent,
-                PackageManager.MATCH_DEFAULT_ONLY);
-        pref.setOnPreferenceClickListener(p -> {
-            getFragmentController().launchFragment(
-                    ApplicationDetailsFragment.getInstance(resolveInfo.activityInfo.packageName));
-            return true;
-        });
+        ResolveInfo resolveInfo = getContext().getPackageManager().resolveActivity(intent, 0);
+        if (resolveInfo != null) {
+            pref.setOnPreferenceClickListener(p -> {
+                getFragmentController().launchFragment(
+                        ApplicationDetailsFragment.getInstance(
+                                resolveInfo.activityInfo.packageName));
+                return true;
+            });
+        }
         return pref;
     }