commit 16e17ed8b098f2f1a22366c80070d9ddfd5745d6
author android-build-team Robot <android-build-team-robot@google.com> Fri Jul 28 17:27:00 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Jul 28 17:27:00 2017 +0000
tree 80bdf8d2383fcaa6bb75018f904ab601ac5fe897
parent 67e00fc930165af628d42a569622e7ac66a9ef6a
parent 5d3ae1c9564780ec98b6378c90528b002c0b9e54

Merge cherrypicks of [2622852, 2622193, 2622194, 2622195, 2622933, 2622990, 2622991, 2622992, 2622993, 2622994, 2622995, 2622934, 2622196, 2622975, 2622996, 2622997, 2622998, 2623050, 2622935, 2622197, 2623051, 2622936, 2622918, 2622919, 2622999] into oc-release

Change-Id: I203bfc4f8aa1a01172b92b63b17f9c8376481ce2

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);
                     }