Merge "Check the calling uid to ensure ProtoLog commands can only be used by...

import android.annotation.Nullable;

import android.annotation.SystemService;

import android.content.Context;

import android.os.Binder;

import android.os.IBinder;

import android.os.Process;

import android.os.RemoteException;

import android.os.ResultReceiver;

import android.os.ShellCallback;

    public void onShellCommand(@Nullable FileDescriptor in, @Nullable FileDescriptor out,

            @Nullable FileDescriptor err, @NonNull String[] args, @Nullable ShellCallback callback,

            @NonNull ResultReceiver resultReceiver) throws RemoteException {

        final int callingUid = Binder.getCallingUid();

        if (callingUid != Process.ROOT_UID && callingUid != Process.SHELL_UID) {

            resultReceiver.send(-1, null);

            throw new SecurityException("Shell commands are only callable by ADB");

        }

        new ProtoLogCommandHandler(this)

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

    }