Merge changes from topic "stacks_envsetup" am: 759a6f75ff

am: 121c8d9024

Change-Id: I3e70d1b388cb6d4596408c942ca854f1995e8e92
This commit is contained in:
Josh Gao
2018-06-15 08:59:12 -07:00
committed by android-build-merger

View File

@@ -17,7 +17,8 @@
if [[ $1 =~ ^[0-9]+$ ]] ; then if [[ $1 =~ ^[0-9]+$ ]] ; then
PID="$1" PID="$1"
elif [ "$1" ] ; then elif [ "$1" ] ; then
PIDLIST="$(pid $1)" # Try --exact first, and fallback to nonexact if we find nothing.
PIDLIST="$(pid --exact $1 || pid $1)"
if [[ $PIDLIST =~ ^[0-9]+$ ]] ; then if [[ $PIDLIST =~ ^[0-9]+$ ]] ; then
PID="$PIDLIST" PID="$PIDLIST"
elif [ "$PIDLIST" ] ; then elif [ "$PIDLIST" ] ; then