diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-08 03:31:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-08 03:31:37 +0000 |
| commit | 506e7c6b35780240e0f780be69b2f2f89feaff44 (patch) | |
| tree | 25bedf8a005db616191ca9c562a640b8ef4b77c7 /core/java | |
| parent | cb0b5bd957308aaaa75ae8a02a6b919501a291ca (diff) | |
| parent | fb1647dd3a303a1a9733aa67b8f2d350f117bbc2 (diff) | |
Merge "Make Context.NETWORK_POLICY_SERVICE @SystemApi" am: b5b0b321f6 am: fb1647dd3a
Change-Id: Ic7afab228d5d1bb8f222fb2e828674b03c9dd3e4
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/Context.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 902c6b9dd36d..f3596411fb6b 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -3918,6 +3918,7 @@ public abstract class Context { */ public static final String NETWORK_STATS_SERVICE = "netstats"; /** {@hide} */ + @SystemApi public static final String NETWORK_POLICY_SERVICE = "netpolicy"; /** {@hide} */ public static final String NETWORK_WATCHLIST_SERVICE = "network_watchlist"; |