summaryrefslogtreecommitdiff
path: root/core/java/android/content
diff options
context:
space:
mode:
authorXiao Ma <xiaom@google.com>2019-03-19 06:54:43 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-03-19 06:54:43 -0700
commit2ce206c82dc877c959e5fee436546d61553d448d (patch)
tree303f9121ec3f51da07928b829e53dd77947290ef /core/java/android/content
parent9d3862e4421fc700c448a2fd64f764e3d3fa74e2 (diff)
parent3176d5730884af8fee26b6a3ff2942c92d3d23df (diff)
Merge "Move the IpMemoryStore to the network stack." am: 93bf5ef495 am: 5db1518bfa
am: 3176d57308 Change-Id: I243056012d2f099d96a33657c0eb63a5b66a2cfe
Diffstat (limited to 'core/java/android/content')
-rw-r--r--core/java/android/content/Context.java8
1 files changed, 0 insertions, 8 deletions
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index bb1501fa1308..fb933b1a7163 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -3703,14 +3703,6 @@ public abstract class Context {
/**
* Use with {@link #getSystemService(String)} to retrieve a
- * {@link android.net.IpMemoryStore} to store and read information about
- * known networks.
- * @hide
- */
- public static final String IP_MEMORY_STORE_SERVICE = "ipmemorystore";
-
- /**
- * Use with {@link #getSystemService(String)} to retrieve a
* {@link android.net.IpSecManager} for encrypting Sockets or Networks with
* IPSec.
*