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

Commit a14a4ce9 authored by Sudheer Shanka's avatar Sudheer Shanka
Browse files

Override handleShellCommand() in NPMS. 

Overriding handleShellCommand() instead of onShellCommand() which
takes care of verifying that the caller is root or shell uid.

Fixes: 151959438
Test: manual
Change-Id: I3fc90a603fbe151347167fc892557f5b60dd5b76
parent 155e594f

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

+6 −6
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ import android.os.HandlerThread; 
import android.os.INetworkManagementService;

import android.os.Message;

import android.os.MessageQueue.IdleHandler;

import android.os.ParcelFileDescriptor;

import android.os.PersistableBundle;

import android.os.PowerManager;

import android.os.PowerManager.ServiceType;
@@ -185,8 +186,6 @@ import android.os.PowerWhitelistManager; 
import android.os.Process;

import android.os.RemoteCallbackList;

import android.os.RemoteException;

import android.os.ResultReceiver;

import android.os.ShellCallback;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.Trace;
@@ -3678,10 +3677,11 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
    }



    @Override

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

            String[] args, ShellCallback callback, ResultReceiver resultReceiver) {

        (new NetworkPolicyManagerShellCommand(mContext, this)).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 NetworkPolicyManagerShellCommand(mContext, this).exec(this,

                in.getFileDescriptor(), out.getFileDescriptor(), err.getFileDescriptor(), args);

    }



    void setDebugUid(int uid) {