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

Commit 48d505f5 authored by Guojing Yuan's avatar Guojing Yuan Committed by Automerger Merge Worker
Browse files

Merge "[CDM][CMD] Check permissions for CDM shell commands" into tm-dev am: 52fdfaa4 

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



Change-Id: I799d4ed02fff73e4b1a0747521545be3b7616742
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2044b9af 52fdfaa4

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;
@@ -750,16 +749,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