Merge "release-request-8a6a1d17-d673-453b-8612-ea961499cd38-for-aosp-oreo-cts-release-4341710 snap-temp-L24800000103383547" into oreo-cts-release
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);
}
diff --git a/sdk/build_tools_source.prop_template b/sdk/build_tools_source.prop_template
index 6f4e5fd..f043706 100644
--- a/sdk/build_tools_source.prop_template
+++ b/sdk/build_tools_source.prop_template
@@ -1,4 +1,4 @@
Pkg.UserSrc=false
-#Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0
-Pkg.Revision=26.0.0 rc1
+Pkg.Revision=${PLATFORM_SDK_VERSION}.0.1
+#Pkg.Revision=26.0.0 rc1
diff --git a/sdk/platform_source.prop_template b/sdk/platform_source.prop_template
index 35a00af..0093ab1 100644
--- a/sdk/platform_source.prop_template
+++ b/sdk/platform_source.prop_template
@@ -2,7 +2,7 @@
Pkg.UserSrc=false
Platform.Version=${PLATFORM_VERSION}
Platform.CodeName=
-Pkg.Revision=1
+Pkg.Revision=2
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
Layoutlib.Api=15
