commit f8af6922140dbe93e077f4f9fd49a18f111831d1
author Treehugger Robot <treehugger-gerrit@google.com> Mon Feb 17 22:31:24 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 17 22:31:24 2020 +0000
tree 69578116cd9a6ed6fb628c043be1b3821e47596d
parent 88ec62afa90be17332c62fafea8f1235202630b3
parent c14c79bbf376162b327c27a9bf8cfe371864e187

Merge "Check for dump permission before other permissions."

services/core/java/com/android/server/compat/PlatformCompat.java

diff --git a/services/core/java/com/android/server/compat/PlatformCompat.java b/services/core/java/com/android/server/compat/PlatformCompat.java
index a5d9aa2..85b8ec6 100644
--- a/services/core/java/com/android/server/compat/PlatformCompat.java
+++ b/services/core/java/com/android/server/compat/PlatformCompat.java
@@ -234,8 +234,8 @@
 
     @Override
     protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
-        checkCompatChangeReadAndLogPermission();
         if (!DumpUtils.checkDumpAndUsageStatsPermission(mContext, "platform_compat", pw)) return;
+        checkCompatChangeReadAndLogPermission();
         mCompatConfig.dumpConfig(pw);
     }