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

Commit 2882406d authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Switch am command to go through "cmd activity". 

For almost everything...  except instrument, which still needs
to be run as the shell user so its UiAutomator callbacks
will work correctly (and not create security holes).

Test: manual

Change-Id: I2e62714a2d5b52501aa261b7e4d6b282b54a0027
parent 5d36bb6c

cmds/am/am

+7 −7
Original line number Diff line number Diff line 
#!/system/bin/sh

#

# Script to start "am" on the device, which has a very rudimentary

# shell.

#



if [ "$1" != "instrument" ] ; then

    cmd activity "$@"

else

    base=/system

    export CLASSPATH=$base/framework/am.jar

    exec app_process $base/bin com.android.commands.am.Am "$@"

fi

cmds/am/src/com/android/commands/am/Am.java

+6 −355

File changed.

Preview size limit exceeded, changes collapsed.

cmds/appops/appops

+2 −1
Original line number Diff line number Diff line 
cmd appops $@
 
#!/system/bin/sh

cmd appops "$@"

services/core/java/com/android/server/am/ActivityManagerShellCommand.java

+21 −219

File changed.

Preview size limit exceeded, changes collapsed.