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

Commit e0d80b74 authored by Guojing Yuan's avatar Guojing Yuan Committed by Android Build Coastguard Worker
Browse files

[CDM][CMD] Check permissions for CDM shell commands 

Override handleShellCommand instead of onShellCommand because
Binder.onShellCommand checks the necessary permissions of the caller.

Bug: 313428840

Test: manually tested CDM shell commands
(cherry picked from commit 1761a0fe)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1ae3b43c248cdf5ee63311f06acd0ee19d93f0cd)
Merged-In: I5539b3594feb5544c458c0fd1061b51a0a808900
Change-Id: I5539b3594feb5544c458c0fd1061b51a0a808900
parent 68595395

services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

+8 −12
Original line number Diff line number Diff line
@@ -72,12 +72,11 @@ import android.os.Environment; 
import android.os.Handler;

import android.os.Message;

import android.os.Parcel;

import android.os.ParcelFileDescriptor;

import android.os.PowerWhitelistManager;

import android.os.RemoteCallbackList;

import android.os.RemoteException;

import android.os.ResultReceiver;

import android.os.ServiceManager;

import android.os.ShellCallback;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.UserManager;
@@ -747,16 +746,13 @@ public class CompanionDeviceManagerService extends SystemService { 
        }



        @Override

        public void onShellCommand(FileDescriptor in, FileDescriptor out, FileDescriptor err,

                String[] args, ShellCallback callback, ResultReceiver resultReceiver)

                throws RemoteException {

            enforceCallerCanManageCompanionDevice(getContext(), "onShellCommand");



            final CompanionDeviceShellCommand cmd = new CompanionDeviceShellCommand(

                    CompanionDeviceManagerService.this,

                    mAssociationStore,

                    mDevicePresenceMonitor);

            cmd.exec(this, in, out, err, args, callback, resultReceiver);

        public int handleShellCommand(@NonNull ParcelFileDescriptor in,

                @NonNull ParcelFileDescriptor out, @NonNull ParcelFileDescriptor err,

                @NonNull String[] args) {

            return new CompanionDeviceShellCommand(CompanionDeviceManagerService.this,

                    mAssociationStore, mDevicePresenceMonitor)

                    .exec(this, in.getFileDescriptor(), out.getFileDescriptor(),

                            err.getFileDescriptor(), args);

        }



        @Override