commit e6469dfc2a9677c0d840473e90405fb4f47f4fa3
author Felipe Leme <felipeal@google.com> Tue May 28 09:35:12 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue May 28 09:35:12 2019 -0700
tree 671cb3862768ee120d951fea94d08c53accff4e7
parent fa8c8ae862c6ae7f67e4e1bc73f5b6c6faf6d45f
parent a3e305d4fa1b6d8997c585f53f735c8f12338fa8

Merge "Made Context.CONTENT_CAPTURE_MANAGER_SERVICE visible for tests." into qt-dev am: 05ec93ebc9
am: a3e305d4fa

Change-Id: I4583525822fd839f602f6ea5cb184e00b63c8028

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index 0491efd..0fab5a5 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -645,6 +645,7 @@
     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

diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 654e698..941eda8 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -4090,6 +4090,7 @@
      * @hide
      * @see #getSystemService(String)
      */
+    @TestApi
     public static final String CONTENT_CAPTURE_MANAGER_SERVICE = "content_capture";
 
     /**