diff options
| author | Nick Pelly <npelly@google.com> | 2012-07-31 09:20:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-07-31 09:20:25 -0700 |
| commit | 5dcbe638ee063201fb476ef475d2beb347f02097 (patch) | |
| tree | ef72774687ea0a7585a00fe25227f1e84d1158a8 /core | |
| parent | 66f13d75107fac3e1f251b65229e6d99d212e380 (diff) | |
| parent | 1af5ac1b6801c4da2ef689449fd1fd2eba1ff48e (diff) | |
| download | frameworks_base-5dcbe638ee063201fb476ef475d2beb347f02097.zip frameworks_base-5dcbe638ee063201fb476ef475d2beb347f02097.tar.gz frameworks_base-5dcbe638ee063201fb476ef475d2beb347f02097.tar.bz2 | |
am 1af5ac1b: Merge "DO NOT MERGE. Add package-name-prefix blacklist for location updates." into jb-dev
* commit '1af5ac1b6801c4da2ef689449fd1fd2eba1ff48e':
DO NOT MERGE. Add package-name-prefix blacklist for location updates.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/ContextImpl.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index b902550..411f6d0 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -361,10 +361,10 @@ class ContextImpl extends Context { return PolicyManager.makeNewLayoutInflater(ctx.getOuterContext()); }}); - registerService(LOCATION_SERVICE, new StaticServiceFetcher() { - public Object createStaticService() { + registerService(LOCATION_SERVICE, new ServiceFetcher() { + public Object createService(ContextImpl ctx) { IBinder b = ServiceManager.getService(LOCATION_SERVICE); - return new LocationManager(ILocationManager.Stub.asInterface(b)); + return new LocationManager(ctx, ILocationManager.Stub.asInterface(b)); }}); registerService(NETWORK_POLICY_SERVICE, new ServiceFetcher() { |