commit b4e882bfce08d7856292bfb4d7794c3d2acb24f3
author Treehugger Robot <treehugger-gerrit@google.com> Mon Feb 17 22:57:49 2020 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> Mon Feb 17 22:57:49 2020 +0000
tree bf0302230a79dcdb1f2df55e9ad31e06c7dfa6c7
parent 99c31b925c1081eb8f9ea7797c6dffa67af902db
parent c046c8905e380a22842f97e5ec29fbbba186c953

Merge "Check for dump permission before other permissions." am: f8af692214 am: c046c8905e

Change-Id: Ide554d628c5b68bad064bf156c8f9edf75db3fd2

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);
     }