Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20d52b36 authored by Gavin Corkery's avatar Gavin Corkery
Browse files

Make onFinished(String) a SystemApi 

Since this callback is only used by retrieveBugreport
which is a SystemApi, the callback itself should also be
a SystemApi.

Test: atest CtsRootBugreportTestCases
Bug: 267620533
Change-Id: I6c11a86acbf6485a86e5a7baf76031f8c2bce264
parent bef72a40

core/api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -32149,7 +32149,6 @@ package android.os { 
    method public void onEarlyReportFinished();

    method public void onError(int);

    method public void onFinished();

    method public void onFinished(@NonNull String);

    method public void onProgress(@FloatRange(from=0.0f, to=100.0f) float);

    field public static final int BUGREPORT_ERROR_ANOTHER_REPORT_IN_PROGRESS = 5; // 0x5

    field public static final int BUGREPORT_ERROR_INVALID_INPUT = 1; // 0x1

core/api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -9943,6 +9943,10 @@ package android.os { 
    method @RequiresPermission(android.Manifest.permission.DUMP) @WorkerThread public void startBugreport(@NonNull android.os.ParcelFileDescriptor, @Nullable android.os.ParcelFileDescriptor, @NonNull android.os.BugreportParams, @NonNull java.util.concurrent.Executor, @NonNull android.os.BugreportManager.BugreportCallback);

  }













  public abstract static class BugreportManager.BugreportCallback {













    method public void onFinished(@NonNull String);













  }



























  public final class BugreportParams {















    ctor public BugreportParams(int);















    ctor public BugreportParams(int, int);

























core/java/android/os/BugreportManager.java



+4
−6




























Original line number
Diff line number
Diff line








@@ -70,10 +70,7 @@ public final class BugreportManager {













     * An interface describing the callback for bugreport progress and status.















     *















     * <p>Callers will receive {@link #onProgress} calls as the bugreport progresses, followed by a













     * terminal call to either {@link #onFinished} or {@link #onError}. Note that













     * {@link #onFinished(String)} will only be invoked when calling {@code startBugreport} with the













     * {@link BugreportParams#BUGREPORT_FLAG_DEFER_CONSENT} flag set. Otherwise,













     * {@link #onFinished()} will be invoked.













     * terminal call to either {@link #onFinished} or {@link #onError}.















     *















     * <p>If an issue is encountered while starting the bugreport asynchronously, callers will















     * receive an {@link #onError} call without any {@link #onProgress} callbacks.










@@ -149,8 +146,7 @@ public final class BugreportManager {













        /** Called when taking bugreport finishes successfully.















         *















         * <p>This callback will be invoked if the













         * {@link BugreportParams#BUGREPORT_FLAG_DEFER_CONSENT} flag is not set. Otherwise, the













         * {@link #onFinished(String)} callback will be invoked.













         * {@link BugreportParams#BUGREPORT_FLAG_DEFER_CONSENT} flag is not set.















         */















        public void onFinished() {}

























@@ -161,8 +157,10 @@ public final class BugreportManager {













         * {@link #onFinished()} callback will be invoked.















         *















         * @param bugreportFile the absolute path of the generated bugreport file.













         * @hide































         */













        @SystemApi















        public void onFinished(@NonNull String bugreportFile) {}































        /**