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

Commit 552e257a authored by Abhijeet Kaur's avatar Abhijeet Kaur
Browse files

Clean up bugreport API.

Make BugreportManager class final.

Add FloatRange annotation for BugreportManager.onProgress() function's
parameter.

Make @IntDef in BugreportMode hidden.

Bug: 126434607
Test: builds
Change-Id: I95f004106ba97bc9e99859a8b23b96a86b6a43f4
parent 5a27fecd
Loading
Loading
Loading
Loading
+3 −6
Original line number Diff line number Diff line
@@ -5161,7 +5161,7 @@ package android.os {
    method public Object onTransactStarted(android.os.IBinder, int);
  }
  public class BugreportManager {
  public final class BugreportManager {
    method @RequiresPermission(android.Manifest.permission.DUMP) public void cancelBugreport();
    method @RequiresPermission(android.Manifest.permission.DUMP) 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);
  }
@@ -5170,7 +5170,7 @@ package android.os {
    ctor public BugreportManager.BugreportCallback();
    method public void onError(int);
    method public void onFinished();
    method public void onProgress(float);
    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
    field public static final int BUGREPORT_ERROR_RUNTIME = 2; // 0x2
@@ -5179,7 +5179,7 @@ package android.os {
  }
  public final class BugreportParams {
    ctor public BugreportParams(@android.os.BugreportParams.BugreportMode int);
    ctor public BugreportParams(int);
    method public int getMode();
    field public static final int BUGREPORT_MODE_FULL = 0; // 0x0
    field public static final int BUGREPORT_MODE_INTERACTIVE = 1; // 0x1
@@ -5189,9 +5189,6 @@ package android.os {
    field public static final int BUGREPORT_MODE_WIFI = 5; // 0x5
  }
  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @IntDef(prefix={"BUGREPORT_MODE_"}, value={android.os.BugreportParams.BUGREPORT_MODE_FULL, android.os.BugreportParams.BUGREPORT_MODE_INTERACTIVE, android.os.BugreportParams.BUGREPORT_MODE_REMOTE, android.os.BugreportParams.BUGREPORT_MODE_WEAR, android.os.BugreportParams.BUGREPORT_MODE_TELEPHONY, android.os.BugreportParams.BUGREPORT_MODE_WIFI}) public static @interface BugreportParams.BugreportMode {
  }
  public static class Build.VERSION {
    field public static final String PREVIEW_SDK_FINGERPRINT;
  }
+3 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@
package android.os;

import android.annotation.CallbackExecutor;
import android.annotation.FloatRange;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
@@ -39,7 +40,7 @@ import java.util.concurrent.Executor;
 */
@SystemApi
@SystemService(Context.BUGREPORT_SERVICE)
public class BugreportManager {
public final class BugreportManager {
    private final Context mContext;
    private final IDumpstate mBinder;

@@ -90,7 +91,7 @@ public class BugreportManager {
         * Called when there is a progress update.
         * @param progress the progress in [0.0, 100.0]
         */
        public void onProgress(float progress) {}
        public void onProgress(@FloatRange(from = 0f, to = 100f) float progress) {}

        /**
         * Called when taking bugreport resulted in an error.
+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ public final class BugreportParams {

    /**
     * Defines acceptable types of bugreports.
     * @hide
     */
    @Retention(RetentionPolicy.SOURCE)
    @IntDef(prefix = { "BUGREPORT_MODE_" }, value = {