diff --git a/packages/NetworkStackPermissionStub/Android.bp b/packages/NetworkPermissionConfig/Android.bp similarity index 96% rename from packages/NetworkStackPermissionStub/Android.bp rename to packages/NetworkPermissionConfig/Android.bp index 8cee92e5fe6de..d0d3276c0e32d 100644 --- a/packages/NetworkStackPermissionStub/Android.bp +++ b/packages/NetworkPermissionConfig/Android.bp @@ -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"], diff --git a/packages/NetworkStackPermissionStub/AndroidManifest.xml b/packages/NetworkPermissionConfig/AndroidManifest.xml similarity index 92% rename from packages/NetworkStackPermissionStub/AndroidManifest.xml rename to packages/NetworkPermissionConfig/AndroidManifest.xml index e83f0503d2808..34f987c8f0d43 100644 --- a/packages/NetworkStackPermissionStub/AndroidManifest.xml +++ b/packages/NetworkPermissionConfig/AndroidManifest.xml @@ -17,7 +17,7 @@ */ --> @@ -36,5 +36,5 @@ - + diff --git a/packages/NetworkStackPermissionStub/src/com/android/server/NetworkStackPermissionStub.java b/packages/NetworkPermissionConfig/src/com/android/server/NetworkPermissionConfig.java similarity index 78% rename from packages/NetworkStackPermissionStub/src/com/android/server/NetworkStackPermissionStub.java rename to packages/NetworkPermissionConfig/src/com/android/server/NetworkPermissionConfig.java index 01e59d28d995e..c904e23636896 100644 --- a/packages/NetworkStackPermissionStub/src/com/android/server/NetworkStackPermissionStub.java +++ b/packages/NetworkPermissionConfig/src/com/android/server/NetworkPermissionConfig.java @@ -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 { } diff --git a/packages/NetworkStack/Android.bp b/packages/NetworkStack/Android.bp index 0bd5c5f591338..d56f97f55f7eb 100644 --- a/packages/NetworkStack/Android.bp +++ b/packages/NetworkStack/Android.bp @@ -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