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

Commit ff9cc286 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add dump permission check in broadcastradio" into udc-dev am: 2ad51d11 am: 904dd005 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23336416



Change-Id: Idf28f08296f492669d85438adf47183706a7657f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 22eee905 904dd005

services/core/java/com/android/server/broadcastradio/IRadioServiceAidlImpl.java

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


package com.android.server.broadcastradio;



import android.Manifest;

import android.content.pm.PackageManager;

import android.hardware.broadcastradio.IBroadcastRadio;

import android.hardware.radio.IAnnouncementListener;

import android.hardware.radio.ICloseHandle;
@@ -23,6 +25,7 @@ import android.hardware.radio.IRadioService; 
import android.hardware.radio.ITuner;

import android.hardware.radio.ITunerCallback;

import android.hardware.radio.RadioManager;

import android.os.Binder;

import android.os.IBinder;

import android.os.RemoteException;

import android.os.ServiceManager;
@@ -112,6 +115,13 @@ final class IRadioServiceAidlImpl extends IRadioService.Stub { 


    @Override

    protected void dump(FileDescriptor fd, PrintWriter printWriter, String[] args) {

        if (mService.getContext().checkCallingOrSelfPermission(Manifest.permission.DUMP)

                != PackageManager.PERMISSION_GRANTED) {

            printWriter.println("Permission Denial: can't dump AIDL BroadcastRadioService from "

                    + "from pid=" + Binder.getCallingPid() + ", uid=" + Binder.getCallingUid()

                    + " without permission " + Manifest.permission.DUMP);

            return;

        }

        IndentingPrintWriter radioPrintWriter = new IndentingPrintWriter(printWriter);

        radioPrintWriter.printf("BroadcastRadioService\n");

services/core/java/com/android/server/broadcastradio/IRadioServiceHidlImpl.java

+10 −0
Original line number Diff line number Diff line
@@ -16,12 +16,15 @@ 


package com.android.server.broadcastradio;



import android.Manifest;

import android.content.pm.PackageManager;

import android.hardware.radio.IAnnouncementListener;

import android.hardware.radio.ICloseHandle;

import android.hardware.radio.IRadioService;

import android.hardware.radio.ITuner;

import android.hardware.radio.ITunerCallback;

import android.hardware.radio.RadioManager;

import android.os.Binder;

import android.os.RemoteException;

import android.util.IndentingPrintWriter;

import android.util.Log;
@@ -129,6 +132,13 @@ final class IRadioServiceHidlImpl extends IRadioService.Stub { 


    @Override

    protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        if (mService.getContext().checkCallingOrSelfPermission(Manifest.permission.DUMP)

                != PackageManager.PERMISSION_GRANTED) {

            pw.println("Permission Denial: can't dump HIDL BroadcastRadioService from "

                    + "from pid=" + Binder.getCallingPid() + ", uid=" + Binder.getCallingUid()

                    + " without permission " + Manifest.permission.DUMP);

            return;

        }

        IndentingPrintWriter radioPw = new IndentingPrintWriter(pw);

        radioPw.printf("BroadcastRadioService\n");