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

Change-Id: I2724cd33d88cf8a75133f0dde46363f7c7721ccc

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

@@ -234,8 +234,8 @@ public class PlatformCompat extends IPlatformCompat.Stub {
 
     @Override
     protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
-        checkCompatChangeReadAndLogPermission();
         if (!DumpUtils.checkDumpAndUsageStatsPermission(mContext, "platform_compat", pw)) return;
+        checkCompatChangeReadAndLogPermission();
         mCompatConfig.dumpConfig(pw);
     }