diff options
| author | Anton Hansson <hansson@google.com> | 2020-02-19 16:11:02 +0000 |
|---|---|---|
| committer | Anton Hansson <hansson@google.com> | 2020-02-19 16:26:05 +0000 |
| commit | 1a635493140b446358b7888f593fd034d3607528 (patch) | |
| tree | 8dd5bf30baf9e6433ccd7e38f33c14034e9036aa /services/java/com/android/server/SystemServer.java | |
| parent | 195fc891555b9cd5a13e9abf539da258ded92149 (diff) | |
Stop exposing generated AIDL from Tethering
We don't want new modules exposing stable aidl directly. APIs should
be defined as java @SystemApi. It also seems like nothing actually
depend on these interfaces, except one simple exception.
Bug: 147200698
Test: m
Change-Id: Ia4222fa35a9a2f3c75cebb12f75c536f27e2fe16
Merged-In: Ia4222fa35a9a2f3c75cebb12f75c536f27e2fe16
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index b93365ad0ad5..de7ae5509a18 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -41,7 +41,6 @@ import android.database.sqlite.SQLiteCompatibilityWalFlags; import android.database.sqlite.SQLiteGlobal; import android.hardware.display.DisplayManagerInternal; import android.net.ConnectivityModuleConnector; -import android.net.ITetheringConnector; import android.net.NetworkStackClient; import android.os.BaseBundle; import android.os.Binder; @@ -286,6 +285,8 @@ public final class SystemServer { private static final String CONTENT_SUGGESTIONS_SERVICE_CLASS = "com.android.server.contentsuggestions.ContentSuggestionsManagerService"; + private static final String TETHERING_CONNECTOR_CLASS = "android.net.ITetheringConnector"; + private static final String PERSISTENT_DATA_BLOCK_PROP = "ro.frp.pst"; private static final String UNCRYPT_PACKAGE_FILE = "/cache/recovery/uncrypt_file"; @@ -2226,7 +2227,7 @@ public final class SystemServer { try { // TODO: hide implementation details, b/146312721. ConnectivityModuleConnector.getInstance().startModuleService( - ITetheringConnector.class.getName(), + TETHERING_CONNECTOR_CLASS, PERMISSION_MAINLINE_NETWORK_STACK, service -> { ServiceManager.addService(Context.TETHERING_SERVICE, service, false /* allowIsolated */, |