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

Use enforceCallingOrSelfPermission for ContextHub APIs

Browse Source 
Previously, checkCallingPermission was used which fails when an IPC
isn't used (e.g. something in the system server calls our APIs).
Additionally, enforceCallingOrSelfPermission helps throw an exception
with better logging than the check and throw does today.

Fixes: 220167285
Test: Call from system server code
Change-Id: I152ff750fa1505628bfe7f9cd78f21a222eefa87
This commit is contained in:
Anthony Stange
2022-02-17 19:49:48 +00:00
parent 4d897c6ad0
commit ce8499e167
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,8 +16,6 @@
package com.android.server.location.contexthub;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import android.Manifest;
import android.content.Context;
import android.hardware.contexthub.V1_0.AsyncEventType;
@@ -297,19 +295,14 @@ import java.util.List;
}
/**
* Checks for location hardware permissions.
* Checks for ACCESS_CONTEXT_HUB permissions.
*
* @param context the context of the service
*/
/* package */
static void checkPermissions(Context context) {
boolean hasAccessContextHubPermission = (context.checkCallingPermission(
CONTEXT_HUB_PERMISSION) == PERMISSION_GRANTED);
if (!hasAccessContextHubPermission) {
throw new SecurityException(
"ACCESS_CONTEXT_HUB permission required to use Context Hub");
}
context.enforceCallingOrSelfPermission(CONTEXT_HUB_PERMISSION,
"ACCESS_CONTEXT_HUB permission required to use Context Hub");
}
/**