Merge "Check for dump permission before other permissions."

2020-02-17 22:31:24 +00:00
parent 88ec62afa9 c14c79bbf3
commit f8af692214
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/compat/PlatformCompat.java
+++ b/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);
    }