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

Commit 2329ea36 authored by Thiébaud Weksteen's avatar Thiébaud Weksteen Committed by Android (Google) Code Review
Browse files

Merge "Migrate ConsumerIrService to @EnforcePermission"

parents 7f709b62 c412f9c1

core/java/android/hardware/IConsumerIrService.aidl

+5 −0
Original line number Diff line number Diff line
@@ -19,8 +19,13 @@ package android.hardware; 
/** {@hide} */

interface IConsumerIrService

{

    @RequiresNoPermission

    boolean hasIrEmitter();



    @EnforcePermission("TRANSMIT_IR")

    void transmit(String packageName, int carrierFrequency, in int[] pattern);



    @EnforcePermission("TRANSMIT_IR")

    int[] getCarrierFrequencies();

}

services/core/java/com/android/server/ConsumerIrService.java

+7 −10
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ 


package com.android.server;



import static android.Manifest.permission.TRANSMIT_IR;



import android.annotation.EnforcePermission;

import android.annotation.RequiresNoPermission;

import android.content.Context;

import android.content.pm.PackageManager;

import android.hardware.IConsumerIrService;
@@ -60,6 +64,7 @@ public class ConsumerIrService extends IConsumerIrService.Stub { 
    }



    @Override

    @RequiresNoPermission

    public boolean hasIrEmitter() {

        return mHasNativeHal;

    }
@@ -85,12 +90,8 @@ public class ConsumerIrService extends IConsumerIrService.Stub { 




    @Override

    @EnforcePermission(TRANSMIT_IR)

    public void transmit(String packageName, int carrierFrequency, int[] pattern) {

        if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.TRANSMIT_IR)

                != PackageManager.PERMISSION_GRANTED) {

            throw new SecurityException("Requires TRANSMIT_IR permission");

        }



        long totalXmitTime = 0;



        for (int slice : pattern) {
@@ -125,12 +126,8 @@ public class ConsumerIrService extends IConsumerIrService.Stub { 
    }



    @Override

    @EnforcePermission(TRANSMIT_IR)

    public int[] getCarrierFrequencies() {

        if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.TRANSMIT_IR)

                != PackageManager.PERMISSION_GRANTED) {

            throw new SecurityException("Requires TRANSMIT_IR permission");

        }



        throwIfNoIrEmitter();



        synchronized(mHalLock) {