Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clean up bugreport API."

Browse Source
This commit is contained in:
Treehugger Robot
2019-03-13 14:07:43 +00:00
committed by Gerrit Code Review
parent abff3f4f21 0bbb9f6882
commit 2e44838064
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
api/system-current.txt
View File

@@ -4012,7 +4012,7 @@ package android.os {
field public static final String EXTRA_EVENT_TIMESTAMP = "android.os.extra.EVENT_TIMESTAMP"; 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 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); 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(); ctor public BugreportManager.BugreportCallback();
method public void onError(int); method public void onError(int);
method public void onFinished(); 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_ANOTHER_REPORT_IN_PROGRESS = 5; // 0x5
field public static final int BUGREPORT_ERROR_INVALID_INPUT = 1; // 0x1 field public static final int BUGREPORT_ERROR_INVALID_INPUT = 1; // 0x1
field public static final int BUGREPORT_ERROR_RUNTIME = 2; // 0x2 field public static final int BUGREPORT_ERROR_RUNTIME = 2; // 0x2
@@ -4030,7 +4030,7 @@ package android.os {
} }
public final class BugreportParams { public final class BugreportParams {
ctor public BugreportParams(@android.os.BugreportParams.BugreportMode int); ctor public BugreportParams(int);
method public int getMode(); method public int getMode();
field public static final int BUGREPORT_MODE_FULL = 0; // 0x0 field public static final int BUGREPORT_MODE_FULL = 0; // 0x0
field public static final int BUGREPORT_MODE_INTERACTIVE = 1; // 0x1 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 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 { 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_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"; field public static final String ACTION_UPDATE_CARRIER_PROVISIONING_URLS = "android.intent.action.UPDATE_CARRIER_PROVISIONING_URLS";

5
core/java/android/os/BugreportManager.java
View File

@@ -17,6 +17,7 @@
package android.os; package android.os;
import android.annotation.CallbackExecutor; import android.annotation.CallbackExecutor;
import android.annotation.FloatRange;
import android.annotation.IntDef; import android.annotation.IntDef;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
@@ -39,7 +40,7 @@ import java.util.concurrent.Executor;
*/ */
@SystemApi @SystemApi
@SystemService(Context.BUGREPORT_SERVICE) @SystemService(Context.BUGREPORT_SERVICE)
public class BugreportManager { public final class BugreportManager {
private final Context mContext; private final Context mContext;
private final IDumpstate mBinder; private final IDumpstate mBinder;
@@ -90,7 +91,7 @@ public class BugreportManager {
* Called when there is a progress update. * Called when there is a progress update.
* @param progress the progress in [0.0, 100.0] * @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. * Called when taking bugreport resulted in an error.

1
core/java/android/os/BugreportParams.java
View File

@@ -41,6 +41,7 @@ public final class BugreportParams {
/** /**
* Defines acceptable types of bugreports. * Defines acceptable types of bugreports.
* @hide
*/ */
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef(prefix = { "BUGREPORT_MODE_" }, value = { @IntDef(prefix = { "BUGREPORT_MODE_" }, value = {