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

Add warning log regarding ACCESS_CONTEXT_HUB permission

Browse Source 
Bug: 171921159
Test: Build and see warning logs
Change-Id: I911eab208bdfb3d86c279479cda1308c5f564c11
This commit is contained in:
Arthur Ishiguro
2020-10-29 15:04:33 -07:00
parent cdbd6378ed
commit f994c7edee
1 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
services/core/java/com/android/server/location/ContextHubServiceUtil.java
View File

@@ -30,12 +30,16 @@ import android.hardware.location.ContextHubTransaction;
import android.hardware.location.NanoAppBinary;
import android.hardware.location.NanoAppMessage;
import android.hardware.location.NanoAppState;
import android.os.Binder;
import android.os.Build;
import android.util.Log;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
/**
* A class encapsulating helper functions used by the ContextHubService class
@@ -45,6 +49,9 @@ import java.util.List;
private static final String HARDWARE_PERMISSION = Manifest.permission.LOCATION_HARDWARE;
private static final String CONTEXT_HUB_PERMISSION = Manifest.permission.ACCESS_CONTEXT_HUB;
// A set of packages that have already been warned regarding the ACCESS_CONTEXT_HUB permission.
private static final Set<String> PERMISSION_WARNED_PACKAGES = new HashSet<String>();
/**
* Creates a ConcurrentHashMap of the Context Hub ID to the ContextHubInfo object given an
* ArrayList of HIDL ContextHub objects.
@@ -95,6 +102,7 @@ import java.util.List;
/**
* Creates a primitive integer array given a Collection<Integer>.
*
* @param collection the collection to iterate
* @return the primitive integer array
*/
@@ -200,10 +208,25 @@ import java.util.List;
*/
/* package */
static void checkPermissions(Context context) {
if (context.checkCallingPermission(HARDWARE_PERMISSION) != PERMISSION_GRANTED
&& context.checkCallingPermission(CONTEXT_HUB_PERMISSION) != PERMISSION_GRANTED) {
boolean hasLocationHardwarePermission = (context.checkCallingPermission(HARDWARE_PERMISSION)
== PERMISSION_GRANTED);
boolean hasAccessContextHubPermission = (context.checkCallingPermission(
CONTEXT_HUB_PERMISSION) == PERMISSION_GRANTED);
if (!hasLocationHardwarePermission && !hasAccessContextHubPermission) {
throw new SecurityException(
"LOCATION_HARDWARE or ACCESS_CONTEXT_HUB permission required to use Context Hub");
"LOCATION_HARDWARE or ACCESS_CONTEXT_HUB permission required to use Context "
+ "Hub");
}
if (!hasAccessContextHubPermission && !Build.IS_USER) {
String pkgName = context.getPackageManager().getNameForUid(Binder.getCallingUid());
if (!PERMISSION_WARNED_PACKAGES.contains(pkgName)) {
Log.w(TAG, pkgName
+ ": please use the ACCESS_CONTEXT_HUB permission rather than "
+ "LOCATION_HARDWARE (will be removed for Context Hub APIs in T)");
PERMISSION_WARNED_PACKAGES.add(pkgName);
}
}
}