Merge "Change tethering file structure to respect its package name"

        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>

          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">

# 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_*;

}

                        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.

 * limitations under the License.

 */

package com.android.server.connectivity.tethering;

package com.android.networkstack.tethering;

import static android.net.TetheringManager.TETHERING_WIFI;