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

Commit ef762c81 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 udc-dev am: 3409c5db 

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



Change-Id: Icaad95a8f99e31ed8279204e680a88d165bcee8a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eeea4d99 3409c5db

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

+8 −9
Original line number Diff line number Diff line
@@ -83,9 +83,7 @@ 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;
@@ -931,13 +929,14 @@ public class CompanionDeviceManagerService extends SystemService { 
        }



        @Override

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

                String[] args, ShellCallback callback, ResultReceiver resultReceiver)

                throws RemoteException {

            new CompanionDeviceShellCommand(CompanionDeviceManagerService.this, mAssociationStore,

                    mDevicePresenceMonitor, mTransportManager, mSystemDataTransferRequestStore,

                    mAssociationRequestsProcessor)

                    .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, mTransportManager,

                    mSystemDataTransferRequestStore, mAssociationRequestsProcessor)

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

                            err.getFileDescriptor(), args);

        }



        @Override