diff options
| author | Chad Brubaker <cbrubaker@google.com> | 2014-02-14 13:22:34 -0800 |
|---|---|---|
| committer | Chad Brubaker <cbrubaker@google.com> | 2014-02-19 11:04:49 -0800 |
| commit | f81daa986e3a2d75c6f2398a59b965790484e0a2 (patch) | |
| tree | c89ae42e5c952109b113bb76d8309e0c8ebe767f /core/java/android/app/ContextImpl.java | |
| parent | 66d792b6631a8dfd0dd0b7abc75077760fa083cc (diff) | |
| download | frameworks_base-f81daa986e3a2d75c6f2398a59b965790484e0a2.zip frameworks_base-f81daa986e3a2d75c6f2398a59b965790484e0a2.tar.gz frameworks_base-f81daa986e3a2d75c6f2398a59b965790484e0a2.tar.bz2 | |
Add the calling package name to requestRouteToHost
The calling package name will be used to check if an application is a
system application when deciding if a route should be exempt from VPN
routing rules.
Bug: 12937545
Change-Id: I2c09c875fe9bb9685871a0a801ddcbb32fc17405
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 8d127c6..e879be3 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() { |