Merge "Remove registerSection API with optional Executor" into rvc-dev am: ca87d86d59

Change-Id: I3f1e6601a5871ec0ddaa0c0de742f028f7dae7fd

api/system-current.txt

@@ -8269,7 +8269,6 @@ package android.os {
     method @Nullable @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public android.os.IncidentManager.IncidentReport getIncidentReport(android.net.Uri);
     method @NonNull @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public java.util.List<android.net.Uri> getIncidentReportList(String);
     method @RequiresPermission(android.Manifest.permission.APPROVE_INCIDENT_REPORTS) public java.util.List<android.os.IncidentManager.PendingReport> getPendingReports();
-    method public void registerSection(int, @NonNull String, @NonNull android.os.IncidentManager.DumpCallback);
     method public void registerSection(int, @NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.os.IncidentManager.DumpCallback);
     method @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public void reportIncident(android.os.IncidentReportArgs);
     method @RequiresPermission("android.permission.REQUEST_INCIDENT_REPORT_APPROVAL") public void requestAuthorization(int, String, int, android.os.IncidentManager.AuthListener);

api/test-current.txt

@@ -2409,7 +2409,6 @@ package android.os {
     method @Nullable @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public android.os.IncidentManager.IncidentReport getIncidentReport(android.net.Uri);
     method @NonNull @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public java.util.List<android.net.Uri> getIncidentReportList(String);
     method @RequiresPermission(android.Manifest.permission.APPROVE_INCIDENT_REPORTS) public java.util.List<android.os.IncidentManager.PendingReport> getPendingReports();
-    method public void registerSection(int, @NonNull String, @NonNull android.os.IncidentManager.DumpCallback);
     method public void registerSection(int, @NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.os.IncidentManager.DumpCallback);
     method @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public void reportIncident(android.os.IncidentReportArgs);
     method @RequiresPermission("android.permission.REQUEST_INCIDENT_REPORT_APPROVAL") public void requestAuthorization(int, String, int, android.os.IncidentManager.AuthListener);

core/java/android/os/IncidentManager.java

@@ -567,7 +567,8 @@ public class IncidentManager {
     }
 
     /**
-     * Register a callback to dump an extended incident report section with the given id and name.
+     * Register a callback to dump an extended incident report section with the given id and name,
+     * running on the supplied executor.
      *
      * Calling <code>registerSection</code> with a duplicate id will override previous registration.
      * However, the request must come from the same calling uid.
@@ -578,23 +579,6 @@ public class IncidentManager {
      *                 Also see incident.proto for other rules about the ID.
      * @param name     the name to display in logs and/or stderr when taking an incident report
      *                 containing this section, mainly for debugging purpose
-     * @param callback the callback function to be invoked when an incident report with all sections
-     *                 or sections matching the given id is being taken
-     */
-    public void registerSection(int id, @NonNull String name, @NonNull DumpCallback callback) {
-        registerSection(id, name, mContext.getMainExecutor(), callback);
-    }
-
-    /**
-     * Register a callback to dump an extended incident report section with the given id and name,
-     * running on the supplied executor.
-     *
-     * @param id       the ID of the extended section. It should be unique system-wide, and be
-     *                 different from IDs of all existing section in
-     *                 frameworks/base/core/proto/android/os/incident.proto.
-     *                 Also see incident.proto for other rules about the ID.
-     * @param name     the name to display in logs and/or stderr when taking an incident report
-     *                 containing this section, mainly for debugging purpose
      * @param executor the executor used to run the callback
      * @param callback the callback function to be invoked when an incident report with all sections
      *                 or sections matching the given id is being taken