Merge "Fix potential null package name" into tm-qpr-dev (0e12415b) · Commits · e / os / android_frameworks_base

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

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -322,6 +322,17 @@ public class ContextHubClientBroker extends IContextHubClient.Stub
	} else {		} else {
	mPendingIntentRequest = new PendingIntentRequest(pendingIntent, nanoAppId);		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;		mPackage = packageName;
	mAttributionTag = attributionTag;		mAttributionTag = attributionTag;
	mTransactionManager = transactionManager;		mTransactionManager = transactionManager;