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

Merge "Drop uses-feature requirement for system process" into oc-dev

Browse Source
This commit is contained in:
Svetoslav Ganov
2017-04-27 03:01:55 +00:00
committed by Android (Google) Code Review
parent f9e5395081 d74e65944d
commit 8ba6fdb3fa
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -244,7 +244,7 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
} }
private void checkCallerIsSystemOr(String pkg, int userId) throws RemoteException { private void checkCallerIsSystemOr(String pkg, int userId) throws RemoteException {
if (getCallingUserId() == UserHandle.USER_SYSTEM) { if (isCallerSystem()) {
return; return;
} }
@@ -294,6 +294,11 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
} }
private void checkUsesFeature(String pkg, int userId) { private void checkUsesFeature(String pkg, int userId) {
if (isCallerSystem()) {
// Drop the requirement for calls from system process
return;
}
FeatureInfo[] reqFeatures = getPackageInfo(pkg, userId).reqFeatures; FeatureInfo[] reqFeatures = getPackageInfo(pkg, userId).reqFeatures;
String requiredFeature = PackageManager.FEATURE_COMPANION_DEVICE_SETUP; String requiredFeature = PackageManager.FEATURE_COMPANION_DEVICE_SETUP;
int numFeatures = ArrayUtils.size(reqFeatures); int numFeatures = ArrayUtils.size(reqFeatures);
@@ -306,10 +311,14 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
} }
} }
private int getCallingUserId() { private static int getCallingUserId() {
return UserHandle.getUserId(Binder.getCallingUid()); return UserHandle.getUserId(Binder.getCallingUid());
} }
private static boolean isCallerSystem() {
return getCallingUserId() == UserHandle.USER_SYSTEM;
}
private ServiceConnection createServiceConnection( private ServiceConnection createServiceConnection(
final AssociationRequest request, final AssociationRequest request,
final IFindDeviceCallback findDeviceCallback, final IFindDeviceCallback findDeviceCallback,