Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4986d044 authored by Anthony Stange's avatar Anthony Stange Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-b480a938e1a74bd1a08c92e592efe11e" 

* changes:
  [automerge] Use enforceCallingOrSelfPermission for ContextHub APIs 2p: ce8499e1
  Use enforceCallingOrSelfPermission for ContextHub APIs
parents ae2f71b3 d867902a

services/core/java/com/android/server/location/contexthub/ContextHubServiceUtil.java

+3 −10
Original line number Diff line number Diff line
@@ -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,20 +295,15 @@ 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(

        context.enforceCallingOrSelfPermission(CONTEXT_HUB_PERMISSION,

                "ACCESS_CONTEXT_HUB permission required to use Context Hub");

    }

    }



    /**

     * Helper function to convert from the HAL Result enum error code to the