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

Commit 2d9213d7 authored by Mark Chien's avatar Mark Chien Committed by Automerger Merge Worker
Browse files

Merge "Change tethering file structure to respect its package name" into rvc-dev am: ee6107e5 

Change-Id: Ia593900f8ec91326b52b7630a9c4f922bd743fe0
parents 80b70f76 ee6107e5

packages/Tethering/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
        android:process="com.android.networkstack.process"

        android:extractNativeLibs="false"

        android:persistent="true">

        <service android:name="com.android.server.connectivity.tethering.TetheringService"

        <service android:name="com.android.networkstack.tethering.TetheringService"

                 android:permission="android.permission.MAINLINE_NETWORK_STACK"

                 android:exported="true">

            <intent-filter>

packages/Tethering/AndroidManifest_InProcess.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
          android:process="system">

    <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29" />

    <application>

        <service android:name="com.android.server.connectivity.tethering.TetheringService"

        <service android:name="com.android.networkstack.tethering.TetheringService"

                 android:process="system"

                 android:permission="android.permission.MAINLINE_NETWORK_STACK"

                 android:exported="true">

packages/Tethering/proguard.flags

+1 −1
Original line number Diff line number Diff line 
# Keep class's integer static field for MessageUtils to parsing their name.

-keep class com.android.server.connectivity.tethering.Tethering$TetherMasterSM {

-keep class com.android.networkstack.tethering.Tethering$TetherMasterSM {

    static final int CMD_*;

    static final int EVENT_*;

}

packages/Tethering/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ 
                        TYPE_MOBILE_HIPRI is appended.



         For other changes applied to this list, now and in the future, see

         com.android.server.connectivity.tethering.TetheringConfiguration.

         com.android.networkstack.tethering.TetheringConfiguration.



         Note also: the order of this is important. The first upstream type

         for which a satisfying network exists is used.

packages/Tethering/src/com/android/server/connectivity/tethering/ConnectedClientsTracker.java→packages/Tethering/src/com/android/networkstack/tethering/ConnectedClientsTracker.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.server.connectivity.tethering;

package com.android.networkstack.tethering;



import static android.net.TetheringManager.TETHERING_WIFI;