Merge "Made Context.CONTENT_CAPTURE_MANAGER_SERVICE visible for tests." into qt-dev am: 05ec93ebc9
am: a3e305d4fa
Change-Id: I4583525822fd839f602f6ea5cb184e00b63c8028
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";
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";
/**