commit 361f1d49af5c2fab8f6681c6a25249f5b1ab3563
author android-build-team Robot <android-build-team-robot@google.com> Tue Aug 08 22:23:14 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Aug 08 22:23:14 2017 +0000
tree 80bdf8d2383fcaa6bb75018f904ab601ac5fe897
parent 67e00fc930165af628d42a569622e7ac66a9ef6a
parent 20b4c125df751681c906ee6d9e5d882a8926eae0

Merge cherrypicks of [2689060] into oc-r3-release

Change-Id: Iced4f4997d04834ac26cfbba5ec292c6f8ebbe50

cmds/monkey/src/com/android/commands/monkey/MonkeyPermissionUtil.java

diff --git a/cmds/monkey/src/com/android/commands/monkey/MonkeyPermissionUtil.java b/cmds/monkey/src/com/android/commands/monkey/MonkeyPermissionUtil.java
index 13290e2..6f63669 100644
--- a/cmds/monkey/src/com/android/commands/monkey/MonkeyPermissionUtil.java
+++ b/cmds/monkey/src/com/android/commands/monkey/MonkeyPermissionUtil.java
@@ -129,7 +129,7 @@
                     continue;
                 }
                 for (String perm : info.requestedPermissions) {
-                    PermissionInfo pi = mPm.getPermissionInfo(perm, 0);
+                    PermissionInfo pi = mPm.getPermissionInfo(perm, "shell", 0);
                     if (pi != null && shouldTargetPermission(info.packageName, pi)) {
                         permissions.add(pi);
                     }