summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Eugene Susla <eugenesusla@google.com> 2017-06-15 21:44:37 +0000
committer android-build-merger <android-build-merger@google.com> 2017-06-15 21:44:37 +0000
commit812d6d9b809cb52edb1a20302ab4d3d2fe13d33c (patch)
tree92e038f2913d3d7db03e2dbcde4997784b12ef14
parent20e2394f754e9662ca7fe9ca6dd85d7c6c08103a (diff)
parent7a4cf16ce9f6055a26e56008c870a874253bd550 (diff)
Merge "Fix companion uses-permission enforcement" into oc-dev
am: 7a4cf16ce9 Change-Id: I09daacb8e9d0e4926f83707cce20a9a13e31e4e1
-rw-r--r--services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
index 73f1705e35df..4810f4fe8c82 100644
--- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
+++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
@@ -47,6 +47,7 @@ import android.os.IBinder;
import android.os.IDeviceIdleController;
import android.os.IInterface;
import android.os.Parcel;
+import android.os.Process;
import android.os.RemoteException;
import android.os.ResultReceiver;
import android.os.ServiceManager;
@@ -345,7 +346,7 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
}
private static boolean isCallerSystem() {
- return getCallingUserId() == UserHandle.USER_SYSTEM;
+ return Binder.getCallingUid() == Process.SYSTEM_UID;
}
private ServiceConnection createServiceConnection(