commit 812d6d9b809cb52edb1a20302ab4d3d2fe13d33c
author Eugene Susla <eugenesusla@google.com> Thu Jun 15 21:44:37 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 15 21:44:37 2017 +0000
tree 92e038f2913d3d7db03e2dbcde4997784b12ef14
parent 20e2394f754e9662ca7fe9ca6dd85d7c6c08103a
parent 7a4cf16ce9f6055a26e56008c870a874253bd550

Merge "Fix companion uses-permission enforcement" into oc-dev
am: 7a4cf16ce9

Change-Id: I09daacb8e9d0e4926f83707cce20a9a13e31e4e1

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 73f1705..4810f4f 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.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 @@
     }
 
     private static boolean isCallerSystem() {
-        return getCallingUserId() == UserHandle.USER_SYSTEM;
+        return Binder.getCallingUid() == Process.SYSTEM_UID;
     }
 
     private ServiceConnection createServiceConnection(