Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix companion uses-permission enforcement" into oc-dev

Browse Source 
am: 7a4cf16ce9

Change-Id: I09daacb8e9d0e4926f83707cce20a9a13e31e4e1
This commit is contained in:
Eugene Susla
2017-06-15 21:44:37 +00:00
committed by android-build-merger
parent 20e2394f75 7a4cf16ce9
commit 812d6d9b80
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
View File

@@ -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(