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

Commit aae8aa3d authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by android-build-merger
Browse files

Merge "Rename NetworkStackPermissionStub" am: 073e73a0 

am: 63d998d8

Change-Id: Iffecb9d56fe90d9c62e963c2c38094f0c2b21f39
parents aafb4b05 63d998d8

packages/NetworkStackPermissionStub/Android.bp→packages/NetworkPermissionConfig/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ 




// Stub APK to define permissions for NetworkStack

// Stub APK to define permissions for NetworkStack

android_app {

android_app {

    name: "NetworkStackPermissionStub",

    name: "NetworkPermissionConfig",

    // TODO: mark app as hasCode=false in manifest once soong stops complaining about apps without

    // TODO: mark app as hasCode=false in manifest once soong stops complaining about apps without

    // a classes.dex.

    // a classes.dex.

    srcs: ["src/**/*.java"],

    srcs: ["src/**/*.java"],

packages/NetworkStackPermissionStub/AndroidManifest.xml→packages/NetworkPermissionConfig/AndroidManifest.xml

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

 */

-->

-->

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

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

    package="com.android.networkstack.permissionstub"

    package="com.android.networkstack.permissionconfig"

    android:sharedUserId="android.uid.networkstack"

    android:sharedUserId="android.uid.networkstack"

    android:versionCode="11"

    android:versionCode="11"

    android:versionName="Q-initial">

    android:versionName="Q-initial">
@@ -36,5 +36,5 @@ 
    <permission android:name="android.permission.MAINLINE_NETWORK_STACK"

    <permission android:name="android.permission.MAINLINE_NETWORK_STACK"

                android:protectionLevel="signature"/>

                android:protectionLevel="signature"/>





    <application android:name="com.android.server.NetworkStackPermissionStub"/>

    <application android:name="com.android.server.NetworkPermissionConfig"/>

</manifest>
 
</manifest>

packages/NetworkStackPermissionStub/src/com/android/server/NetworkStackPermissionStub.java→packages/NetworkPermissionConfig/src/com/android/server/NetworkPermissionConfig.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -19,8 +19,8 @@ package com.android.server; 
import android.app.Application;

import android.app.Application;





/**

/**

 * Empty application for NetworkStackStub that only exists because soong builds complain if APKs

 * Empty application for NetworkPermissionConfig that only exists because

 * have no source file.

 * soong builds complain if APKs have no source file.

 */

 */

public class NetworkStackPermissionStub extends Application {

public class NetworkPermissionConfig extends Application {

}
 
}

packages/NetworkStack/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -53,7 +53,7 @@ java_defaults { 
        proguard_flags_files: ["proguard.flags"],

        proguard_flags_files: ["proguard.flags"],

    },

    },

    // The permission configuration *must* be included to ensure security of the device

    // The permission configuration *must* be included to ensure security of the device

    required: ["NetworkStackPermissionStub"],

    required: ["NetworkPermissionConfig"],

}

}





// Non-updatable network stack running in the system server process for devices not using the module

// Non-updatable network stack running in the system server process for devices not using the module