commit 33e625e57167d269bf8b92309f1f8eecc5431ca0
author TreeHugger Robot <treehugger-gerrit@google.com> Fri May 10 00:04:19 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 10 00:04:19 2019 +0000
tree 8667f41b4b0bbf33f3574e9b5b0fa1f5cc883456
parent b0419da3d7840f00a1096814dd1ae7651d21e8b2
parent c00cf502630748dc5220e3a1ede95e2e2140efaa

Merge "[DO NOT MERGE] Remove --history from dumpsys appop" into qt-dev

services/core/java/com/android/server/appop/AppOpsService.java

diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java
index d04aa89..82a9168 100644
--- a/services/core/java/com/android/server/appop/AppOpsService.java
+++ b/services/core/java/com/android/server/appop/AppOpsService.java
@@ -3559,8 +3559,6 @@
         pw.println("    Limit output to data associated with the given package name.");
         pw.println("  --watchers");
         pw.println("    Only output the watcher sections.");
-        pw.println("  --history");
-        pw.println("    Output the historical data.");
     }
 
     private void dumpStatesLocked(@NonNull PrintWriter pw, @NonNull Op op,
@@ -3696,8 +3694,6 @@
                     }
                 } else if ("--watchers".equals(arg)) {
                     dumpWatchers = true;
-                } else if ("--history".equals(arg)) {
-                    dumpHistory = true;
                 } else if (arg.length() > 0 && arg.charAt(0) == '-'){
                     pw.println("Unknown option: " + arg);
                     return;