Merge "Store MEDIA_CONTENT_CONTROL permission access in RouterRecord" into main (2e1af07f) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java

+9 −3

Original line number	Diff line number	Diff line
		@@ -292,7 +292,7 @@ class MediaRouter2ServiceImpl {
		== PackageManager.PERMISSION_GRANTED;
		final boolean hasModifyAudioRoutingPermission =
		checkCallerHasModifyAudioRoutingPermission(pid, uid);

		boolean hasMediaContentControlPermission = checkMediaContentControlPermission(uid, pid);
		boolean hasMediaRoutingControlPermission =
		checkMediaRoutingControlPermission(uid, pid, packageName);

		@@ -307,6 +307,7 @@ class MediaRouter2ServiceImpl {
		userId,
		hasConfigureWifiDisplayPermission,
		hasModifyAudioRoutingPermission,
		hasMediaContentControlPermission,
		hasMediaRoutingControlPermission);
		}
		} finally {
		@@ -1133,6 +1134,7 @@ class MediaRouter2ServiceImpl {
		int userId,
		boolean hasConfigureWifiDisplayPermission,
		boolean hasModifyAudioRoutingPermission,
		boolean hasMediaContentControlPermission,
		boolean hasMediaRoutingControlPermission) {
		final IBinder binder = router.asBinder();
		if (mAllRouterRecords.get(binder) != null) {
		@@ -1151,6 +1153,7 @@ class MediaRouter2ServiceImpl {
		packageName,
		hasConfigureWifiDisplayPermission,
		hasModifyAudioRoutingPermission,
		hasMediaContentControlPermission,
		hasMediaRoutingControlPermission);
		try {
		binder.linkToDeath(routerRecord, 0);
		@@ -2067,9 +2070,10 @@ class MediaRouter2ServiceImpl {
		public final int mPid;
		public final boolean mHasConfigureWifiDisplayPermission;
		public final boolean mHasModifyAudioRoutingPermission;
		public final boolean mHasMediaContentControlPermission;
		public final boolean mHasMediaRoutingControl;
		public final AtomicBoolean mHasBluetoothRoutingPermission;
		public final int mRouterId;
		public final boolean mHasMediaRoutingControl;
		public @ScanningState int mScanningState = SCANNING_STATE_NOT_SCANNING;

		public RouteDiscoveryPreference mDiscoveryPreference;
		@@ -2083,6 +2087,7 @@ class MediaRouter2ServiceImpl {
		String packageName,
		boolean hasConfigureWifiDisplayPermission,
		boolean hasModifyAudioRoutingPermission,
		boolean hasMediaContentControlPermission,
		boolean hasMediaRoutingControl) {
		mUserRecord = userRecord;
		mPackageName = packageName;
		@@ -2093,9 +2098,10 @@ class MediaRouter2ServiceImpl {
		mPid = pid;
		mHasConfigureWifiDisplayPermission = hasConfigureWifiDisplayPermission;
		mHasModifyAudioRoutingPermission = hasModifyAudioRoutingPermission;
		mHasMediaContentControlPermission = hasMediaContentControlPermission;
		mHasMediaRoutingControl = hasMediaRoutingControl;
		mHasBluetoothRoutingPermission =
		new AtomicBoolean(checkCallerHasBluetoothPermissions(mPid, mUid));
		mHasMediaRoutingControl = hasMediaRoutingControl;
		mRouterId = mNextRouterOrManagerId.getAndIncrement();
		}