commit 0e12415b568e0036617d43814fa9255d281711ca
author Anthony Stange <stange@google.com> Tue Aug 23 21:42:05 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 23 21:42:05 2022 +0000
tree 73db603cb1de7e771373f48621d5b622b1467778
parent b65f359eeb5393171fa63da4655edf7402336928
parent 9d77288dcd6bc4beb0718b852ab183e9e553e826

Merge "Fix potential null package name" into tm-qpr-dev

services/core/java/com/android/server/location/contexthub/ContextHubClientBroker.java

diff --git a/services/core/java/com/android/server/location/contexthub/ContextHubClientBroker.java b/services/core/java/com/android/server/location/contexthub/ContextHubClientBroker.java
index 625f193..8857892 100644
--- a/services/core/java/com/android/server/location/contexthub/ContextHubClientBroker.java
+++ b/services/core/java/com/android/server/location/contexthub/ContextHubClientBroker.java
@@ -322,6 +322,17 @@
         } else {
             mPendingIntentRequest = new PendingIntentRequest(pendingIntent, nanoAppId);
         }
+
+        if (packageName == null) {
+            String[] packages = mContext.getPackageManager().getPackagesForUid(
+                    Binder.getCallingUid());
+            if (packages != null && packages.length > 0) {
+                packageName = packages[0];
+            }
+            Log.e(TAG, "createClient: Provided package name null. Using first package name "
+                    + packageName);
+        }
+
         mPackage = packageName;
         mAttributionTag = attributionTag;
         mTransactionManager = transactionManager;