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

Commit a3e305d4 authored by Felipe Leme's avatar Felipe Leme Committed by android-build-merger
Browse files

Merge "Made Context.CONTENT_CAPTURE_MANAGER_SERVICE visible for tests." into qt-dev 

am: 05ec93eb

Change-Id: I9f0be45afbe50ca609f62ee32238a21b7beea0ba
parents 40be229b 05ec93eb

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -645,6 +645,7 @@ package android.content { 
    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 CONTENT_CAPTURE_MANAGER_SERVICE = "content_capture";

    field public static final String ROLLBACK_SERVICE = "rollback";

    field public static final String STATUS_BAR_SERVICE = "statusbar";

    field public static final String TEST_NETWORK_SERVICE = "test_network";

core/java/android/content/Context.java

+1 −0
Original line number Diff line number Diff line
@@ -4090,6 +4090,7 @@ public abstract class Context { 
     * @hide

     * @see #getSystemService(String)

     */

    @TestApi

    public static final String CONTENT_CAPTURE_MANAGER_SERVICE = "content_capture";



    /**