Snap for 7798373 from 408042a7fa24d99438a6877862983e3c9506483d to mainline-resolv-release

Change-Id: I9e6a940e6a6c1e05b6341b61357c99b07e9681ff

3 files changed, 2 insertions, 30 deletions

diff --git a/Android.bp b/Android.bp
index d4b0ced..81af6ff 100644
--- a/Android.bp
+++ b/Android.bp
@@ -20,9 +20,6 @@ package {
 
 java_defaults {
     name: "NetworkPermissionConfigDefaults",
-    // TODO: mark app as hasCode=false in manifest once soong stops complaining about apps without
-    // a classes.dex.
-    srcs: ["src/**/*.java"],
     platform_apis: true,
     target_sdk_version: "30",
     min_sdk_version: "29",
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 219d1cd..9fa7b92 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -40,5 +40,6 @@
     <!-- The application must declare usesClearTraffic because it uses the same UID as the
          NetworkStack module, which does cleartext traffic (b/161860610). -->
     <application android:name="com.android.server.NetworkPermissionConfig"
-                 android:usesCleartextTraffic="true"/>
+                 android:usesCleartextTraffic="true"
+                 android:hasCode="false"/>
 </manifest>
diff --git a/src/com/android/server/NetworkPermissionConfig.java b/src/com/android/server/NetworkPermissionConfig.java
deleted file mode 100644
index c904e23..0000000
--- a/src/com/android/server/NetworkPermissionConfig.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.server;
-
-import android.app.Application;
-
-/**
- * Empty application for NetworkPermissionConfig that only exists because
- * soong builds complain if APKs have no source file.
- */
-public class NetworkPermissionConfig extends Application {
-}