Merge "Add a static to get the Ip Memory Store" am: bee0cbe5df

am: 9f1414dac1

Change-Id: Ibcd5e3cfb34262b69661329878f27587eaf84180

1 files changed, 5 insertions, 0 deletions

diff --git a/core/java/android/net/IpMemoryStore.java b/core/java/android/net/IpMemoryStore.java
index b35f09743877..2f4d9bc6a89a 100644
--- a/core/java/android/net/IpMemoryStore.java
+++ b/core/java/android/net/IpMemoryStore.java
@@ -171,4 +171,9 @@ public class IpMemoryStore {
             throw e.rethrowFromSystemServer();
         }
     }
+
+    /** Gets an instance of the memory store */
+    public static IpMemoryStore getMemoryStore(final Context context) {
+        return (IpMemoryStore) context.getSystemService(Context.IP_MEMORY_STORE_SERVICE);
+    }
 }