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

Merge "Expose bugreporting API as system API."

Browse Source 
am: 6ac57c669a

Change-Id: I98b7d492e8b800670a3127224d152b8fe75e758f
This commit is contained in:
Nandana Dutt
2019-01-28 19:40:54 -08:00
committed by android-build-merger
parent 6581b4116b 6ac57c669a
commit f1c0ec00a3
3 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
api/system-current.txt
View File

@@ -3941,6 +3941,36 @@ 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 {
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);
}
public abstract static class BugreportManager.BugreportCallback {
ctor public BugreportManager.BugreportCallback();
method public void onError(int);
method public void onFinished();
method public void onProgress(float);
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_USER_CONSENT_TIMED_OUT = 4; // 0x4
field public static final int BUGREPORT_ERROR_USER_DENIED_CONSENT = 3; // 0x3
}
public final class BugreportParams {
ctor public BugreportParams(@android.os.BugreportParams.BugreportMode 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
field public static final int BUGREPORT_MODE_REMOTE = 2; // 0x2
field public static final int BUGREPORT_MODE_TELEPHONY = 4; // 0x4
field public static final int BUGREPORT_MODE_WEAR = 3; // 0x3
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";

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

@@ -21,6 +21,7 @@ import android.annotation.IntDef;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.RequiresPermission; import android.annotation.RequiresPermission;
import android.annotation.SystemApi;
import android.annotation.SystemService; import android.annotation.SystemService;
import android.content.Context; import android.content.Context;
import android.os.IBinder.DeathRecipient; import android.os.IBinder.DeathRecipient;
@@ -35,8 +36,7 @@ import java.util.concurrent.Executor;
* *
* @hide * @hide
*/ */
// TODO: Expose API when the implementation is more complete. @SystemApi
//@SystemApi
@SystemService(Context.BUGREPORT_SERVICE) @SystemService(Context.BUGREPORT_SERVICE)
public class BugreportManager { public class BugreportManager {
private final Context mContext; private final Context mContext;

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

@@ -17,6 +17,7 @@
package android.os; package android.os;
import android.annotation.IntDef; import android.annotation.IntDef;
import android.annotation.SystemApi;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
@@ -26,8 +27,7 @@ import java.lang.annotation.RetentionPolicy;
* *
* @hide * @hide
*/ */
// TODO: Expose API when the implementation is more complete. @SystemApi
// @SystemApi
public final class BugreportParams { public final class BugreportParams {
private final int mMode; private final int mMode;