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

Commit 5a9d9f69 authored by markchien's avatar markchien
Browse files

Change Tethering package name 

".apex" is easy to confuse.
Rename as below:
apex: com.android.tethering.apex -> com.android.tethering
apk: com.android.tethering -> com.android.networkstack.tethering

Bug: 146471733
Test: build

Change-Id: I2c7647abb996539a3af6cfe0e0214a5e8927c0d6
Merged-In: I2c7647abb996539a3af6cfe0e0214a5e8927c0d6
parent 7382f03d

data/etc/privapp-permissions-platform.xml

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ applications that come with the platform 
        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>

    </privapp-permissions>



    <privapp-permissions package="com.android.tethering">

    <privapp-permissions package="com.android.networkstack.tethering">

        <permission name="android.permission.MANAGE_USB"/>

        <permission name="android.permission.MODIFY_PHONE_STATE"/>

        <permission name="android.permission.READ_NETWORK_USAGE_HISTORY"/>

packages/Tethering/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
 */

-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          package="com.android.tethering"

          package="com.android.networkstack.tethering"

          android:sharedUserId="android.uid.networkstack">

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

packages/Tethering/AndroidManifestBase.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
 */

-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          package="com.android.tethering"

          package="com.android.networkstack.tethering"

          android:versionCode="1"

          android:versionName="R-initial">

    <application

packages/Tethering/AndroidManifest_InProcess.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
 */

-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          package="com.android.tethering.inprocess"

          package="com.android.networkstack.tethering.inprocess"

          android:sharedUserId="android.uid.system"

          android:process="system">

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

packages/Tethering/apex/Android.bp

+7 −7
Original line number Diff line number Diff line
@@ -15,21 +15,21 @@ 
//



apex {

    name: "com.android.tethering.apex",

    name: "com.android.tethering",

    apps: ["Tethering"],

    manifest: "manifest.json",

    key: "com.android.tethering.apex.key",

    key: "com.android.tethering.key",



    androidManifest: "AndroidManifest.xml",

}



apex_key {

    name: "com.android.tethering.apex.key",

    public_key: "com.android.tethering.apex.avbpubkey",

    private_key: "com.android.tethering.apex.pem",

    name: "com.android.tethering.key",

    public_key: "com.android.tethering.avbpubkey",

    private_key: "com.android.tethering.pem",

}



android_app_certificate {

    name: "com.android.tethering.apex.certificate",

    certificate: "com.android.tethering.apex",

    name: "com.android.tethering.certificate",

    certificate: "com.android.tethering",

}