From ab08de3764a3fe5c7954cd631ee8b472c2477975 Mon Sep 17 00:00:00 2001
From: Remi NGUYEN VAN <reminv@google.com>
Date: Wed, 27 Mar 2019 12:04:27 +0900
Subject: Rename NetworkStackPermissionStub

Use NetworkStackPermissionConfig instead.
Also remove the source directory: soong now manages to build the package
without it.

Bug: 129317412
Test: Flashed, booted, WiFi working
(clean cherry-pick of aosp I45299c12598cd3b33bfd78ae8698d98b77b18dc0)

Change-Id: I7bdc058dddfa483823074055ad5c9d7d2efd37b9
---
 Android.bp                                         | 28 +++++++++++++++
 AndroidManifest.xml                                | 40 ++++++++++++++++++++++
 .../android/server/NetworkPermissionConfig.java    | 26 ++++++++++++++
 3 files changed, 94 insertions(+)
 create mode 100644 Android.bp
 create mode 100644 AndroidManifest.xml
 create mode 100644 src/com/android/server/NetworkPermissionConfig.java

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..d0d3276
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,28 @@
+//
+// 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.
+//
+
+// Stub APK to define permissions for NetworkStack
+android_app {
+    name: "NetworkPermissionConfig",
+    // TODO: mark app as hasCode=false in manifest once soong stops complaining about apps without
+    // a classes.dex.
+    srcs: ["src/**/*.java"],
+    platform_apis: true,
+    min_sdk_version: "28",
+    certificate: "networkstack",
+    privileged: true,
+    manifest: "AndroidManifest.xml",
+}
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
new file mode 100644
index 0000000..34f987c
--- /dev/null
+++ b/AndroidManifest.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * 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.
+ */
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.networkstack.permissionconfig"
+    android:sharedUserId="android.uid.networkstack"
+    android:versionCode="11"
+    android:versionName="Q-initial">
+    <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28" />
+    <!--
+    This package only exists to define the below permissions, and enforce that they are only
+    granted to apps sharing the same signature.
+    Permissions defined here are intended to be used only by the NetworkStack: both
+    NetworkStack and this stub APK are to be signed with a dedicated certificate to ensure
+    that, with the below permissions being signature permissions.
+
+    This APK *must* be installed, even if the NetworkStack app is not installed, because otherwise,
+    any application will be able to define this permission and the system will give that application
+    full access to the network stack.
+     -->
+    <permission android:name="android.permission.MAINLINE_NETWORK_STACK"
+                android:protectionLevel="signature"/>
+
+    <application android:name="com.android.server.NetworkPermissionConfig"/>
+</manifest>
diff --git a/src/com/android/server/NetworkPermissionConfig.java b/src/com/android/server/NetworkPermissionConfig.java
new file mode 100644
index 0000000..c904e23
--- /dev/null
+++ b/src/com/android/server/NetworkPermissionConfig.java
@@ -0,0 +1,26 @@
+/*
+ * 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 {
+}
-- 
cgit v1.2.3


From 1cd77f1b06c897eb1c92a2426bff4209bce5fdd4 Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Sun, 28 Apr 2019 20:21:33 -0700
Subject: Fix version code pattern for NetworkPermissionConfig

Bug: 128677807

Change-Id: Ibb84a62ad512cffdd2430b64718ea0ef6f51ec35
---
 AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 34f987c..496fa4d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,7 +19,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.networkstack.permissionconfig"
     android:sharedUserId="android.uid.networkstack"
-    android:versionCode="11"
+    android:versionCode="210000000"
     android:versionName="Q-initial">
     <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28" />
     <!--
-- 
cgit v1.2.3


From a575119dddb921ff6d3b9819fc8de7bf021b3ea1 Mon Sep 17 00:00:00 2001
From: Remi NGUYEN VAN <reminv@google.com>
Date: Wed, 15 May 2019 16:14:51 +0900
Subject: Add build targets for non-mainline NetworkStack

Add PlatformCaptivePortalLogin and PlatformNetworkPermissionConfig build
targets to override CaptivePortalLogin and NetworkPermissionConfig with
platform-key-signed packages easily. The added packages are unused by
default but can simplify setup for OEMs that use InProcessNetworkStack.

Bug: 132635211
Test: Added the new packages to sailfish build, built image: device has
      the proper packages signed with the right keys, networking and
      captive portal working fine.

Change-Id: I09656deb6ba928f56b478adebb60268fa6f484b0
---
 Android.bp | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/Android.bp b/Android.bp
index d0d3276..6e50459 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,15 +14,28 @@
 // limitations under the License.
 //
 
-// Stub APK to define permissions for NetworkStack
-android_app {
-    name: "NetworkPermissionConfig",
+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,
     min_sdk_version: "28",
-    certificate: "networkstack",
     privileged: true,
     manifest: "AndroidManifest.xml",
 }
+
+// Stub APK to define permissions for NetworkStack
+android_app {
+    name: "NetworkPermissionConfig",
+    defaults: ["NetworkPermissionConfigDefaults"],
+    certificate: "networkstack",
+}
+
+// Alternative stub APK signed with platform certificate. To use with InProcessNetworkStack.
+android_app {
+    name: "PlatformNetworkPermissionConfig",
+    defaults: ["NetworkPermissionConfigDefaults"],
+    certificate: "platform",
+    overrides: ["NetworkPermissionConfig"],
+}
-- 
cgit v1.2.3


From 4fc75397ca879df903d36c7cbf941413cbd2e09b Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Wed, 29 May 2019 15:14:58 -0700
Subject: Add OWNERS file to block further submits so we can start migration.

BUG: 133225687
---
 OWNERS | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 OWNERS

diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..52193eb
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,5 @@
+set noparent
+
+lorenzo@google.com
+baligh@google.com
+delphij@google.com
-- 
cgit v1.2.3


From 815b53bcc19c9134dfe1726be08a19cccfa9badc Mon Sep 17 00:00:00 2001
From: Akshay <aksh@google.com>
Date: Fri, 7 Jun 2019 13:49:35 -0700
Subject: qt-dev should be v290000000 and targetSdkVersion=29

Bug: 129546105
Change-Id: I773434e61f4ef25c180ec590395672a021147e76
---
 AndroidManifest.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 496fa4d..fb37356 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,9 +19,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.networkstack.permissionconfig"
     android:sharedUserId="android.uid.networkstack"
-    android:versionCode="210000000"
-    android:versionName="Q-initial">
-    <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28" />
+    android:versionCode="290000000"
+    android:versionName="2019-09"
+>
+    <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29" />
     <!--
     This package only exists to define the below permissions, and enforce that they are only
     granted to apps sharing the same signature.
-- 
cgit v1.2.3