Merge "Require that bugreport requesters have DUMP."
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index 44f2d12..1ede6e9 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -7415,9 +7415,7 @@
}
public void requestBugReport() {
- // No permission check because this can't do anything harmful --
- // it will just eventually cause the user to be presented with
- // a UI to select where the bug report goes.
+ enforceCallingPermission(android.Manifest.permission.DUMP, "requestBugReport");
SystemProperties.set("ctl.start", "bugreport");
}