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

Commit 52572701 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Make Context.BLOB_STORE_SERVICE public."

parents 4d95751e f56f7589

api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -10122,6 +10122,7 @@ package android.content { 
    field public static final int BIND_NOT_PERCEPTIBLE = 256; // 0x100

    field public static final int BIND_NOT_PERCEPTIBLE = 256; // 0x100

    field public static final int BIND_WAIVE_PRIORITY = 32; // 0x20

    field public static final int BIND_WAIVE_PRIORITY = 32; // 0x20

    field public static final String BIOMETRIC_SERVICE = "biometric";

    field public static final String BIOMETRIC_SERVICE = "biometric";

    field public static final String BLOB_STORE_SERVICE = "blob_store";

    field public static final String BLUETOOTH_SERVICE = "bluetooth";

    field public static final String BLUETOOTH_SERVICE = "bluetooth";

    field public static final String CAMERA_SERVICE = "camera";

    field public static final String CAMERA_SERVICE = "camera";

    field public static final String CAPTIONING_SERVICE = "captioning";

    field public static final String CAPTIONING_SERVICE = "captioning";

api/test-current.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -767,7 +767,6 @@ package android.content { 
    method public void setAutofillOptions(@Nullable android.content.AutofillOptions);

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

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

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

    method @RequiresPermission("android.permission.INTERACT_ACROSS_USERS") public void startActivityAsUser(@NonNull @RequiresPermission android.content.Intent, @NonNull android.os.UserHandle);

    method @RequiresPermission("android.permission.INTERACT_ACROSS_USERS") public void startActivityAsUser(@NonNull @RequiresPermission android.content.Intent, @NonNull android.os.UserHandle);

    field public static final String BLOB_STORE_SERVICE = "blob_store";

    field public static final String BUGREPORT_SERVICE = "bugreport";

    field public static final String BUGREPORT_SERVICE = "bugreport";

    field public static final String CONTENT_CAPTURE_MANAGER_SERVICE = "content_capture";

    field public static final String CONTENT_CAPTURE_MANAGER_SERVICE = "content_capture";

    field public static final String DEVICE_IDLE_CONTROLLER = "deviceidle";

    field public static final String DEVICE_IDLE_CONTROLLER = "deviceidle";

core/java/android/content/Context.java

+0 −4
Original line number Original line Diff line number Diff line
@@ -5064,11 +5064,7 @@ public abstract class Context { 
     *

     *

     * @see #getSystemService(String)

     * @see #getSystemService(String)

     * @see android.app.blob.BlobStoreManager

     * @see android.app.blob.BlobStoreManager

     *

     * TODO: make this public once BlobStoreManager is ready.

     * @hide

     */

     */

    @TestApi

    public static final String BLOB_STORE_SERVICE = "blob_store";

    public static final String BLOB_STORE_SERVICE = "blob_store";





    /**

    /**