diff options
| author | Chad Brubaker <cbrubaker@google.com> | 2014-02-14 13:22:34 -0800 |
|---|---|---|
| committer | Chad Brubaker <cbrubaker@google.com> | 2014-03-05 13:35:20 -0800 |
| commit | 18dd015e6edfb5f46e364f89f84e43d356d58c4a (patch) | |
| tree | 5db8557580323b45df91d1a294e7ee5a97fadbb4 /core/java/android/app/ContextImpl.java | |
| parent | 2d1e8c49582fb91df0a05a778c228fc1cd89e026 (diff) | |
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 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() { |