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

2022-08-23 21:42:05 +00:00
parent b65f359eeb 9d77288dcd
commit 0e12415b56
1 changed files with 11 additions and 0 deletions
--- 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 @@ public class ContextHubClientBroker extends IContextHubClient.Stub
        } 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;