Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 05ec93ebc9

Change-Id: I4e26c7106070cde92bfacab7cbc99d4221a1791e
This commit is contained in:
Felipe Leme
2019-05-28 09:32:51 -07:00
committed by android-build-merger
parent 386af5159d 05ec93ebc9
commit baf82eb9d2
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/test-current.txt
View File

@@ -645,6 +645,7 @@ 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);
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 ROLLBACK_SERVICE = "rollback"; field public static final String ROLLBACK_SERVICE = "rollback";
field public static final String STATUS_BAR_SERVICE = "statusbar"; field public static final String STATUS_BAR_SERVICE = "statusbar";
field public static final String TEST_NETWORK_SERVICE = "test_network"; field public static final String TEST_NETWORK_SERVICE = "test_network";

1
core/java/android/content/Context.java
View File

@@ -4090,6 +4090,7 @@ public abstract class Context {
* @hide * @hide
* @see #getSystemService(String) * @see #getSystemService(String)
*/ */
@TestApi
public static final String CONTENT_CAPTURE_MANAGER_SERVICE = "content_capture"; public static final String CONTENT_CAPTURE_MANAGER_SERVICE = "content_capture";
/** /**