commit 3cbd13fe04fd9dafebe05df479231ea7b34b9cb0
author Guojing Yuan <guojing@google.com> Tue Oct 22 17:06:48 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Nov 22 16:55:05 2024 +0000
tree 392f93e50089bd8b8c465c9cb856c3d57e43d4e3
parent c10f3e210fc2292a60faa00127328a15aa8984a2

[CDM] Check if it's system UID for hidden Perm Sync APIs

Bug: 371975420
Test: Manual test
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7e5e47611d6f3271df264bb8ca9545ca3ba80361)
Merged-In: I9771ce38728d40b026d94cb6785d55f144c66790
Change-Id: I9771ce38728d40b026d94cb6785d55f144c66790

services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
index 42f69e9..c73e457 100644
--- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
+++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
@@ -628,16 +628,25 @@
 
         @Override
         public void enablePermissionsSync(int associationId) {
+            if (getCallingUid() != SYSTEM_UID) {
+                throw new SecurityException("Caller must be system UID");
+            }
             mSystemDataTransferProcessor.enablePermissionsSync(associationId);
         }
 
         @Override
         public void disablePermissionsSync(int associationId) {
+            if (getCallingUid() != SYSTEM_UID) {
+                throw new SecurityException("Caller must be system UID");
+            }
             mSystemDataTransferProcessor.disablePermissionsSync(associationId);
         }
 
         @Override
         public PermissionSyncRequest getPermissionSyncRequest(int associationId) {
+            if (getCallingUid() != SYSTEM_UID) {
+                throw new SecurityException("Caller must be system UID");
+            }
             return mSystemDataTransferProcessor.getPermissionSyncRequest(associationId);
         }