summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorNick Pelly <npelly@google.com>2012-07-31 09:17:54 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-07-31 09:17:54 -0700
commit1af5ac1b6801c4da2ef689449fd1fd2eba1ff48e (patch)
tree9904a0d9c1c4106857cef6461f8ceb526885e7c8 /core
parent28b452fddf85de27ad88b2b5de884c8428e74f1e (diff)
parent48c5eb018b1731bd47caccd43cda2cd36ebc271f (diff)
downloadframeworks_base-1af5ac1b6801c4da2ef689449fd1fd2eba1ff48e.zip
frameworks_base-1af5ac1b6801c4da2ef689449fd1fd2eba1ff48e.tar.gz
frameworks_base-1af5ac1b6801c4da2ef689449fd1fd2eba1ff48e.tar.bz2
Merge "DO NOT MERGE. Add package-name-prefix blacklist for location updates." into jb-dev
Diffstat (limited to 'core')
-rw-r--r--core/java/android/app/ContextImpl.java6
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() {