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

Commit 1fc0bd6a authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Android (Google) Code Review
Browse files

Merge "Rename NetworkStackPermissionStub"

parents 8f8cf343 63b386cd
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@

// Stub APK to define permissions for NetworkStack
android_app {
    name: "NetworkStackPermissionStub",
    name: "NetworkPermissionConfig",
    // TODO: mark app as hasCode=false in manifest once soong stops complaining about apps without
    // a classes.dex.
    srcs: ["src/**/*.java"],
+2 −2
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.networkstack.permissionstub"
    package="com.android.networkstack.permissionconfig"
    android:sharedUserId="android.uid.networkstack"
    android:versionCode="11"
    android:versionName="Q-initial">
@@ -36,5 +36,5 @@
    <permission android:name="android.permission.MAINLINE_NETWORK_STACK"
                android:protectionLevel="signature"/>

    <application android:name="com.android.server.NetworkStackPermissionStub"/>
    <application android:name="com.android.server.NetworkPermissionConfig"/>
</manifest>
+3 −3
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ package com.android.server;
import android.app.Application;

/**
 * Empty application for NetworkStackStub that only exists because soong builds complain if APKs
 * have no source file.
 * Empty application for NetworkPermissionConfig that only exists because
 * soong builds complain if APKs have no source file.
 */
public class NetworkStackPermissionStub extends Application {
public class NetworkPermissionConfig extends Application {
}
+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ java_defaults {
        proguard_flags_files: ["proguard.flags"],
    },
    // 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