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

Commit 398c4d19 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Change Tethering package name"

parents f0862553 58b0f233

data/etc/privapp-permissions-platform.xml

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

}