diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-02-10 12:10:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-10 12:10:30 +0000 |
| commit | 7dc8a7f592f962bf86e161243114d3f7b6c47ead (patch) | |
| tree | 6b6539c1e15b8662dd65818738478b73f5449d20 /core/java/android | |
| parent | 6a38e544a20e4192471dd5b2a380c5c15104a3c2 (diff) | |
| parent | 5edd77be5c0336384f96af6c83201055c9a44c3c (diff) | |
Merge "Split out the ipsec API surface and use framework-connectivity-tiramisu" am: 5edd77be5c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960193
Change-Id: Ic3518daa2fc4e6219be1b1de547c21b7eee814e4
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/SystemServiceRegistry.java | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java index f9739a489453..3766dc8a66f6 100644 --- a/core/java/android/app/SystemServiceRegistry.java +++ b/core/java/android/app/SystemServiceRegistry.java @@ -128,12 +128,10 @@ import android.net.ConnectivityFrameworkInitializer; import android.net.ConnectivityFrameworkInitializerTiramisu; import android.net.EthernetManager; import android.net.IEthernetManager; -import android.net.IIpSecService; import android.net.INetworkPolicyManager; import android.net.INetworkStatsService; import android.net.IPacProxyManager; import android.net.IVpnManager; -import android.net.IpSecManager; import android.net.NetworkPolicyManager; import android.net.NetworkScoreManager; import android.net.NetworkWatchlistManager; @@ -420,15 +418,6 @@ public final class SystemServiceRegistry { return new VcnManager(ctx, service); }}); - registerService(Context.IPSEC_SERVICE, IpSecManager.class, - new CachedServiceFetcher<IpSecManager>() { - @Override - public IpSecManager createService(ContextImpl ctx) throws ServiceNotFoundException { - IBinder b = ServiceManager.getService(Context.IPSEC_SERVICE); - IIpSecService service = IIpSecService.Stub.asInterface(b); - return new IpSecManager(ctx, service); - }}); - registerService(Context.COUNTRY_DETECTOR, CountryDetector.class, new StaticServiceFetcher<CountryDetector>() { @Override |