Merge "ContextHubClientBroker: Add 0x prefix to hex nanoapp ID" into main (d176f52f) · Commits · e / os / android_frameworks_base

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -645,7 +645,7 @@ public class ContextHubClientBroker extends IContextHubClient.Stub
		// If in the grace period, the host may not receive any messages containing permissions
		// covered data.
		if (authState == AUTHORIZATION_DENIED_GRACE_PERIOD && !messagePermissions.isEmpty()) {
		Log.e(TAG, "Dropping message from " + Long.toHexString(nanoAppId) + ". " + mPackage
		Log.e(TAG, "Dropping message from 0x" + Long.toHexString(nanoAppId) + ". " + mPackage
		+ " in grace period and napp msg has permissions");
		return ErrorCode.PERMISSION_DENIED;
		}
		@@ -660,7 +660,7 @@ public class ContextHubClientBroker extends IContextHubClient.Stub
		mAttributionTag,
		messagePermissions,
		RECEIVE_MSG_NOTE + nanoAppId)) {
		Log.e(TAG, "Dropping message from " + Long.toHexString(nanoAppId) + ". " + mPackage
		Log.e(TAG, "Dropping message from 0x" + Long.toHexString(nanoAppId) + ". " + mPackage
		+ " doesn't have permission");
		return ErrorCode.PERMISSION_DENIED;
		}
		@@ -875,7 +875,7 @@ public class ContextHubClientBroker extends IContextHubClient.Stub
		if (curAuthState != newAuthState) {
		if (newAuthState == AUTHORIZATION_DENIED
		\|\| newAuthState == AUTHORIZATION_DENIED_GRACE_PERIOD) {
		Log.e(TAG, "updateNanoAppAuthState auth error: "
		Log.e(TAG, "updateNanoAppAuthState auth error: 0x"
		+ Long.toHexString(nanoAppId) + ", "
		+ nanoappPermissions + ", "
		+ gracePeriodExpired + ", "