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

Commit f9434b61 authored by Robin Lee's avatar Robin Lee Committed by Automerger Merge Worker
Browse files

Merge "Only enforce caller is root for special commands" into udc-dev am: 418d02ed 

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



Change-Id: I18f409bb3961249488f632462bef627adf0bc3ba
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b6e6e6b3 418d02ed

services/core/java/com/android/server/dreams/DreamShellCommand.java

+20 −16
Original line number Diff line number Diff line
@@ -39,27 +39,25 @@ public class DreamShellCommand extends ShellCommand { 


    @Override

    public int onCommand(String cmd) {

        final int callingUid = Binder.getCallingUid();

        if (callingUid != Process.ROOT_UID) {

            Slog.e(TAG, "Must be root before calling Dream shell commands");

            return -1;

        }



        if (TextUtils.isEmpty(cmd)) {

            return super.handleDefaultCommands(cmd);

        }

        if (DEBUG) {

            Slog.d(TAG, "onCommand:" + cmd);

        }



        try {

            switch (cmd) {

                case "start-dreaming":

                    enforceCallerIsRoot();

                    return startDreaming();

                case "stop-dreaming":

                    enforceCallerIsRoot();

                    return stopDreaming();

                default:

                    return super.handleDefaultCommands(cmd);

            }

        } catch (SecurityException e) {

            getOutPrintWriter().println(e);

            return -1;

        }

    }



    private int startDreaming() {
@@ -72,6 +70,12 @@ public class DreamShellCommand extends ShellCommand { 
        return 0;

    }



    private void enforceCallerIsRoot() {

        if (Binder.getCallingUid() != Process.ROOT_UID) {

            throw new SecurityException("Must be root to call Dream shell commands");

        }

    }



    @Override

    public void onHelp() {

        PrintWriter pw = getOutPrintWriter();