Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cfcbfa7 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Stop exposing generated AIDL from Tethering" am: ccf2c88a am: fdbd8202 

Change-Id: Id2ae2730ea1a3177729def2b967c8868e330fca4
parents f4255ac0 fdbd8202

packages/Tethering/common/TetheringLib/Android.bp

+0 −1
Original line number Original line Diff line number Diff line
@@ -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",

}

}

services/java/com/android/server/SystemServer.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -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";
@@ -2228,7 +2229,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 */,