diff options
| author | Chad Brubaker <cbrubaker@google.com> | 2014-03-13 18:18:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-13 18:18:36 +0000 |
| commit | f5729a6a1573ba27f69a5c5dc144be3f8f60b026 (patch) | |
| tree | 9b71774cdb5e5b65cba115601a032db10d9458ab /core/java/android/app/ContextImpl.java | |
| parent | 91726f4ea7b60025490209ccb2637d712e8d75fd (diff) | |
| parent | 1011960c44a4f84d53d05199fe1ca09be9473822 (diff) | |
| download | frameworks_base-f5729a6a1573ba27f69a5c5dc144be3f8f60b026.zip frameworks_base-f5729a6a1573ba27f69a5c5dc144be3f8f60b026.tar.gz frameworks_base-f5729a6a1573ba27f69a5c5dc144be3f8f60b026.tar.bz2 | |
am 1011960c: am decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev
* commit '1011960c44a4f84d53d05199fe1ca09be9473822':
Add the calling package name to requestRouteToHost
Diffstat (limited to 'core/java/android/app/ContextImpl.java')
| -rw-r--r-- | core/java/android/app/ContextImpl.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index 966e90e..d9cad3b 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -363,10 +363,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() { |