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

Merge "NotificationManager: clean calling identity in dump()."

Browse Source
This commit is contained in:
TreeHugger Robot
2018-06-26 16:40:18 +00:00
committed by Android (Google) Code Review
parent 58969298c1 bbb4b22f8b
commit 1b72a7f520
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -3125,14 +3125,19 @@ public class NotificationManagerService extends SystemService {
protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
if (!DumpUtils.checkDumpAndUsageStatsPermission(getContext(), TAG, pw)) return;
final DumpFilter filter = DumpFilter.parseFromArguments(args);
if (filter.stats) {
dumpJson(pw, filter);
} else if (filter.proto) {
dumpProto(fd, filter);
} else if (filter.criticalPriority) {
dumpNotificationRecords(pw, filter);
} else {
dumpImpl(pw, filter);
final long token = Binder.clearCallingIdentity();
try {
if (filter.stats) {
dumpJson(pw, filter);
} else if (filter.proto) {
dumpProto(fd, filter);
} else if (filter.criticalPriority) {
dumpNotificationRecords(pw, filter);
} else {
dumpImpl(pw, filter);
}
} finally {
Binder.restoreCallingIdentity(token);
}
}