summaryrefslogtreecommitdiff
path: root/core/java/android/app/ContextImpl.java
diff options
context:
space:
mode:
authorChad Brubaker <cbrubaker@google.com>2014-03-11 17:51:45 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-03-11 17:51:45 +0000
commitdecfd7079b622f9135aeb8f7b2ec48005c844c38 (patch)
tree671c1c7722b338e2627c0554cf87cf33f1ff8359 /core/java/android/app/ContextImpl.java
parente9821bf2380bfa325e6398a6390a4083007d3006 (diff)
parent18dd015e6edfb5f46e364f89f84e43d356d58c4a (diff)
Merge "Add the calling package name to requestRouteToHost" into klp-dev
Diffstat (limited to 'core/java/android/app/ContextImpl.java')
-rw-r--r--core/java/android/app/ContextImpl.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java
index 190ddb4b879a..962a16960311 100644
--- a/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@ -356,10 +356,11 @@ class ContextImpl extends Context {
ctx.mMainThread.getHandler());
}});
- registerService(CONNECTIVITY_SERVICE, new StaticServiceFetcher() {
- public Object createStaticService() {
+ registerService(CONNECTIVITY_SERVICE, new ServiceFetcher() {
+ public Object createService(ContextImpl ctx) {
IBinder b = ServiceManager.getService(CONNECTIVITY_SERVICE);
- return new ConnectivityManager(IConnectivityManager.Stub.asInterface(b));
+ return new ConnectivityManager(IConnectivityManager.Stub.asInterface(b),
+ ctx.getPackageName());
}});
registerService(COUNTRY_DETECTOR, new StaticServiceFetcher() {