Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Adding permission check for dumping visible windows" into rvc-dev am: 10bee631fd

Browse Source 
Change-Id: Ie0048725192de4b949d3f13428530f6162a7b458
This commit is contained in:
TreeHugger Robot
2020-05-27 23:04:18 +00:00
committed by Automerger Merge Worker
parent d28171ff45 10bee631fd
commit acfb372f56
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/WindowManagerShellCommand.java
View File

@@ -351,6 +351,11 @@ public class WindowManagerShellCommand extends ShellCommand {
} }
private int runDumpVisibleWindowViews(PrintWriter pw) { private int runDumpVisibleWindowViews(PrintWriter pw) {
if (!mInternal.checkCallingPermission(android.Manifest.permission.DUMP,
"runDumpVisibleWindowViews()")) {
throw new SecurityException("Requires DUMP permission");
}
try (ZipOutputStream out = new ZipOutputStream(getRawOutputStream())) { try (ZipOutputStream out = new ZipOutputStream(getRawOutputStream())) {
ArrayList<Pair<String, ByteTransferPipe>> requestList = new ArrayList<>(); ArrayList<Pair<String, ByteTransferPipe>> requestList = new ArrayList<>();
synchronized (mInternal.mGlobalLock) { synchronized (mInternal.mGlobalLock) {