Snap for 7929847 from 3386c9f7419e6f18eb5b02f91cb1809668a16c53 to mainline-wifi-release
Change-Id: I329a2edbd2f2ea9cfe50ba0e29dd958c855bc81b
diff --git a/OWNERS b/OWNERS
index 5e74ae0..62c5737 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1 +1,2 @@
-include platform/frameworks/base:/core/java/android/net/OWNERS
+set noparent
+file:platform/packages/modules/Connectivity:master:/OWNERS_core_networking
diff --git a/common/Android.bp b/common/Android.bp
index 68decf6..a9689f1 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -313,3 +313,30 @@
"//packages/modules/Wifi/service",
],
}
+
+// This file group is deprecated; new users should use net-utils-annotations
+filegroup {
+ name: "net-utils-annotations-srcs",
+ srcs: [
+ "annotations/android/net/annotations/PolicyDirection.java",
+ ],
+ visibility: [
+ "//frameworks/base",
+ ],
+}
+
+
+java_library {
+ name: "net-utils-annotations",
+ srcs: [":net-utils-annotations-srcs"],
+ libs: [
+ "framework-annotations-lib",
+ ],
+ sdk_version: "system_current",
+ min_sdk_version: "30",
+ visibility: ["//visibility:public"],
+ apex_available: [
+ "//apex_available:anyapex",
+ "//apex_available:platform",
+ ],
+}
diff --git a/common/annotations/android/net/annotations/PolicyDirection.java b/common/annotations/android/net/annotations/PolicyDirection.java
new file mode 100644
index 0000000..febd9b4
--- /dev/null
+++ b/common/annotations/android/net/annotations/PolicyDirection.java
@@ -0,0 +1,35 @@
+/*
+ * 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 android.net.annotations;
+
+import android.annotation.IntDef;
+import android.net.IpSecManager;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * IPsec traffic direction.
+ *
+ * <p>Mainline modules cannot reference hidden @IntDef. Moving this annotation to a separate class
+ * to allow others to statically include it.
+ *
+ * @hide
+ */
+@IntDef(value = {IpSecManager.DIRECTION_IN, IpSecManager.DIRECTION_OUT})
+@Retention(RetentionPolicy.SOURCE)
+public @interface PolicyDirection {}
diff --git a/common/native/OWNERS b/common/native/OWNERS
deleted file mode 100644
index 7655338..0000000
--- a/common/native/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-maze@google.com
