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

Commit 0f29d93d authored by Nandana Dutt's avatar Nandana Dutt Committed by android-build-merger
Browse files

Merge "Expose bugreporting service name" into qt-dev 

am: 8a69e0b3

Change-Id: I8dfc4cddcd62a06e8a54a83b1dfb132c33f91481
parents 4ea8e43e 8a69e0b3

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1362,6 +1362,7 @@ package android.content { 
    method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public void startActivityAsUser(@RequiresPermission @NonNull android.content.Intent, @NonNull android.os.UserHandle);

    field public static final String APP_PREDICTION_SERVICE = "app_prediction";

    field public static final String BACKUP_SERVICE = "backup";

    field public static final String BUGREPORT_SERVICE = "bugreport";

    field public static final String CONTENT_SUGGESTIONS_SERVICE = "content_suggestions";

    field public static final String CONTEXTHUB_SERVICE = "contexthub";

    field public static final String EUICC_CARD_SERVICE = "euicc_card";

api/test-current.txt

+29 −0
Original line number Diff line number Diff line
@@ -628,6 +628,7 @@ package android.content { 
    method public int getUserId();

    method public void setAutofillOptions(@Nullable android.content.AutofillOptions);

    method public void setContentCaptureOptions(@Nullable android.content.ContentCaptureOptions);

    field public static final String BUGREPORT_SERVICE = "bugreport";

    field public static final String ROLLBACK_SERVICE = "rollback";

    field public static final String TEST_NETWORK_SERVICE = "test_network";

  }
@@ -1575,6 +1576,34 @@ package android.os { 
    method @RequiresPermission("android.permission.POWER_SAVER") public boolean setChargingStateUpdateDelayMillis(int);

  }



  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);

  }



  public abstract static class BugreportManager.BugreportCallback {

    ctor public BugreportManager.BugreportCallback();

    method public void onError(int);

    method public void onFinished();

    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

    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(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

  }



  public class Build {

    method public static boolean is64BitAbi(String);

    field public static final boolean IS_EMULATOR;

core/java/android/content/Context.java

+1 −2
Original line number Diff line number Diff line
@@ -4564,8 +4564,7 @@ public abstract class Context { 
     * @see android.os.BugreportManager

     * @hide

     */

    // TODO: Expose API when the implementation is more complete.

    // @SystemApi

    @SystemApi @TestApi

    public static final String BUGREPORT_SERVICE = "bugreport";



    /**

core/java/android/os/BugreportManager.java

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.annotation.Nullable; 
import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.annotation.SystemService;

import android.annotation.TestApi;

import android.content.Context;

import android.util.Log;
@@ -43,6 +44,7 @@ import java.util.concurrent.Executor; 
 * @hide

 */

@SystemApi

@TestApi

@SystemService(Context.BUGREPORT_SERVICE)

public final class BugreportManager {

core/java/android/os/BugreportParams.java

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.os; 


import android.annotation.IntDef;

import android.annotation.SystemApi;

import android.annotation.TestApi;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;
@@ -28,6 +29,7 @@ import java.lang.annotation.RetentionPolicy; 
 * @hide

 */

@SystemApi

@TestApi

public final class BugreportParams {

    private final int mMode;