Merge "Clean up bugreport API." (2e448380) · Commits · e / os / android_frameworks_base

api/system-current.txt

+3 −6

Original line number	Diff line number	Diff line
		@@ -4012,7 +4012,7 @@ package android.os {
		field public static final String EXTRA_EVENT_TIMESTAMP = "android.os.extra.EVENT_TIMESTAMP";
		}

		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);
		}
		@@ -4021,7 +4021,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
		@@ -4030,7 +4030,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
		@@ -4040,9 +4040,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 final class ConfigUpdate {
		field public static final String ACTION_UPDATE_CARRIER_ID_DB = "android.os.action.UPDATE_CARRIER_ID_DB";
		field public static final String ACTION_UPDATE_CARRIER_PROVISIONING_URLS = "android.intent.action.UPDATE_CARRIER_PROVISIONING_URLS";

core/java/android/os/BugreportManager.java

+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.

core/java/android/os/BugreportParams.java

+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 = {