Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Stop exposing generated AIDL from Tethering"

Browse Source
This commit is contained in:
Anton Hansson
2020-02-20 12:18:34 +00:00
committed by Gerrit Code Review
parent 3ff1caf424 1a63549314
commit ccf2c88a18
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/Tethering/common/TetheringLib/Android.bp
View File

@@ -83,7 +83,6 @@ java_library {
name: "framework-tethering-stubs", name: "framework-tethering-stubs",
srcs: [":framework-tethering-stubs-sources"], srcs: [":framework-tethering-stubs-sources"],
libs: ["framework-all"], libs: ["framework-all"],
static_libs: ["tethering-aidl-interfaces-java"],
sdk_version: "core_platform", sdk_version: "core_platform",
} }

5
services/java/com/android/server/SystemServer.java
View File

@@ -41,7 +41,6 @@ import android.database.sqlite.SQLiteCompatibilityWalFlags;
import android.database.sqlite.SQLiteGlobal; import android.database.sqlite.SQLiteGlobal;
import android.hardware.display.DisplayManagerInternal; import android.hardware.display.DisplayManagerInternal;
import android.net.ConnectivityModuleConnector; import android.net.ConnectivityModuleConnector;
import android.net.ITetheringConnector;
import android.net.NetworkStackClient; import android.net.NetworkStackClient;
import android.os.BaseBundle; import android.os.BaseBundle;
import android.os.Binder; import android.os.Binder;
@@ -286,6 +285,8 @@ public final class SystemServer {
private static final String CONTENT_SUGGESTIONS_SERVICE_CLASS = private static final String CONTENT_SUGGESTIONS_SERVICE_CLASS =
"com.android.server.contentsuggestions.ContentSuggestionsManagerService"; "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 PERSISTENT_DATA_BLOCK_PROP = "ro.frp.pst";
private static final String UNCRYPT_PACKAGE_FILE = "/cache/recovery/uncrypt_file"; private static final String UNCRYPT_PACKAGE_FILE = "/cache/recovery/uncrypt_file";
@@ -2226,7 +2227,7 @@ public final class SystemServer {
try { try {
// TODO: hide implementation details, b/146312721. // TODO: hide implementation details, b/146312721.
ConnectivityModuleConnector.getInstance().startModuleService( ConnectivityModuleConnector.getInstance().startModuleService(
ITetheringConnector.class.getName(), TETHERING_CONNECTOR_CLASS,
PERMISSION_MAINLINE_NETWORK_STACK, service -> { PERMISSION_MAINLINE_NETWORK_STACK, service -> {
ServiceManager.addService(Context.TETHERING_SERVICE, service, ServiceManager.addService(Context.TETHERING_SERVICE, service,
false /* allowIsolated */, false /* allowIsolated */,