Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 494ce15e authored by Anthony Stange's avatar Anthony Stange Committed by Automerger Merge Worker
Browse files

Merge "Fix potential null package name" into tm-qpr-dev am: 0e12415b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19714127



Change-Id: I9a6d7267e46adaa6f137aea5284a72b6c4b71f70
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d90a8f72 0e12415b

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

+11 −0
Original line number Diff line number Diff line
@@ -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;