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

Merge "API: Supress existing inconsistent Context service names"

Browse Source 
am: 3b35f3dfef

Change-Id: I93d19a74fc2194b7f088069e3b89a9a28917e54a
This commit is contained in:
Adrian Roos
2020-01-17 12:48:33 -08:00
committed by android-build-merger
parent 002ba59e2b 3b35f3dfef
commit 72bb1fa6c2
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,7 @@ import android.annotation.StringDef;
import android.annotation.StringRes; import android.annotation.StringRes;
import android.annotation.StyleRes; import android.annotation.StyleRes;
import android.annotation.StyleableRes; import android.annotation.StyleableRes;
import android.annotation.SuppressLint;
import android.annotation.SystemApi; import android.annotation.SystemApi;
import android.annotation.TestApi; import android.annotation.TestApi;
import android.annotation.UserIdInt; import android.annotation.UserIdInt;
@@ -3827,6 +3828,7 @@ public abstract class Context {
*/ */
@SystemApi @SystemApi
@TestApi @TestApi
@SuppressLint("ServiceName")
public static final String STATUS_BAR_SERVICE = "statusbar"; public static final String STATUS_BAR_SERVICE = "statusbar";
/** /**
@@ -3921,6 +3923,7 @@ public abstract class Context {
public static final String NETWORK_STATS_SERVICE = "netstats"; public static final String NETWORK_STATS_SERVICE = "netstats";
/** {@hide} */ /** {@hide} */
@SystemApi @SystemApi
@SuppressLint("ServiceName")
public static final String NETWORK_POLICY_SERVICE = "netpolicy"; public static final String NETWORK_POLICY_SERVICE = "netpolicy";
/** {@hide} */ /** {@hide} */
public static final String NETWORK_WATCHLIST_SERVICE = "network_watchlist"; public static final String NETWORK_WATCHLIST_SERVICE = "network_watchlist";
@@ -4230,6 +4233,7 @@ public abstract class Context {
* @see #getSystemService(String) * @see #getSystemService(String)
*/ */
@TestApi @TestApi
@SuppressLint("ServiceName") // TODO: This should be renamed to CONTENT_CAPTURE_SERVICE
public static final String CONTENT_CAPTURE_MANAGER_SERVICE = "content_capture"; public static final String CONTENT_CAPTURE_MANAGER_SERVICE = "content_capture";
/** /**