summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Quang Luong <qal@google.com> 2021-12-13 12:11:39 -0800
committer Quang Luong <qal@google.com> 2022-01-20 15:13:49 -0800
commit79a07cf2841bb565ee245dcb9b1b69ab15373200 (patch)
treea8cd8c1b71369b7af0589d8bf0cdd992c6ac93b1
parent2ae152f748d46161c171a3c216d856f390fb723e (diff)
Create apk-in-apex to host wifi dialogs
Create a new application in the wifi apex to host wifi dialog UI. Implementation of the dialogs will be in later CLs. Certificates were generated via $ openssl req -x509 -newkey rsa:4096 -nodes -days 999999 -keyout key.pem -out com.android.wifi.dialog.x509.pem $ openssl pkcs8 -topk8 -inform PEM -outform DER -in key.pem -out com.android.wifi.dialog.pk8 -nocrypt as described in go/android-apex-howto Bug: 209032090 Test: build Change-Id: I4389101178bd48a5e88c8e41ad396c11a1d0a571
-rw-r--r--WifiDialog/Android.bp40
-rw-r--r--WifiDialog/AndroidManifest.xml26
-rw-r--r--WifiDialog/certs/com.android.wifi.dialog.pk8bin0 -> 2375 bytes
-rw-r--r--WifiDialog/certs/com.android.wifi.dialog.x509.pem36
-rw-r--r--WifiDialog/certs/key.pem52
-rw-r--r--apex/Android.bp1
-rw-r--r--framework/Android.bp1
7 files changed, 156 insertions, 0 deletions
diff --git a/WifiDialog/Android.bp b/WifiDialog/Android.bp
new file mode 100644
index 0000000000..5ccbe1a8e7
--- /dev/null
+++ b/WifiDialog/Android.bp
@@ -0,0 +1,40 @@
+// Copyright (C) 2022 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 {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_app {
+ name: "WifiDialog",
+ defaults: ["wifi-module-sdk-version-defaults"],
+ certificate: ":com.android.wifi.dialog.certificate",
+
+ static_libs: [
+ "androidx.appcompat_appcompat",
+ ],
+ resource_dirs: [],
+ srcs: ["src/**/*.java"],
+ sdk_version: "module_current",
+
+ apex_available: [
+ "com.android.wifi",
+ "test_com.android.wifi",
+ ]
+}
+
+android_app_certificate {
+ name: "com.android.wifi.dialog.certificate",
+ certificate: "certs/com.android.wifi.dialog"
+}
diff --git a/WifiDialog/AndroidManifest.xml b/WifiDialog/AndroidManifest.xml
new file mode 100644
index 0000000000..f53625bb4e
--- /dev/null
+++ b/WifiDialog/AndroidManifest.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2022 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.wifi.dialog">
+ <application
+ android:enabled="true"
+ android:configChanges="keyboardHidden|orientation|screenSize"
+ android:supportsRtl="true">
+ </application>
+</manifest>
diff --git a/WifiDialog/certs/com.android.wifi.dialog.pk8 b/WifiDialog/certs/com.android.wifi.dialog.pk8
new file mode 100644
index 0000000000..c66cb2912e
--- /dev/null
+++ b/WifiDialog/certs/com.android.wifi.dialog.pk8
Binary files differ
diff --git a/WifiDialog/certs/com.android.wifi.dialog.x509.pem b/WifiDialog/certs/com.android.wifi.dialog.x509.pem
new file mode 100644
index 0000000000..01aa64710d
--- /dev/null
+++ b/WifiDialog/certs/com.android.wifi.dialog.x509.pem
@@ -0,0 +1,36 @@
+-----BEGIN CERTIFICATE-----
+MIIGLTCCBBWgAwIBAgIUILJh9k1oya1dbS8FI8l9irhgP1owDQYJKoZIhvcNAQEL
+BQAwgaQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQH
+DA1Nb3VudGFpbiBWaWV3MRAwDgYDVQQKDAdBbmRyb2lkMRAwDgYDVQQLDAdBbmRy
+b2lkMSAwHgYDVQQDDBdjb20uYW5kcm9pZC53aWZpLmRpYWxvZzEiMCAGCSqGSIb3
+DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAgFw0yMjAxMTgyMjAxMzZaGA80NzU5
+MTIxNTIyMDEzNlowgaQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlh
+MRYwFAYDVQQHDA1Nb3VudGFpbiBWaWV3MRAwDgYDVQQKDAdBbmRyb2lkMRAwDgYD
+VQQLDAdBbmRyb2lkMSAwHgYDVQQDDBdjb20uYW5kcm9pZC53aWZpLmRpYWxvZzEi
+MCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCAiIwDQYJKoZIhvcN
+AQEBBQADggIPADCCAgoCggIBALucvwQpHKejalU766tEA8cnNvkkOt421u5DI/c/
+4p4YVsIYFLxQ3UgiKTIXBiuC9HueuFTlfS4BG5uMBRZjjjQPgzWm0DIiKDsy2o+b
+THWaI/cYWWOsGQi71TpBNpLxiDy5o+TMKdX9hH4skDdVzNU0EZRYikRaEs6jNAZj
+Pjr0vwi/rD2MxhAVB+pd0LF5YKUGIw0zOZ49WUZc/By02wRX94e2EK0cElZhLZ3p
+LAGdS0id++oAdG3Ygc5vY+xdxufCB+3d0Ph0q5BIqzeC1r5LYpwuw60zkfXebN5W
+8y6wrGysYDyjRqlUbirYTU5wFI2qxjlFnANJ955a3B3Rg8LzY4GLuGFxNMtVn7jX
+HgFq+bee2G90Tq15VyV2s1fX1M6+GVLkXgKEUG9RQQOEo5AeaK1XEQO3GRGcIhb3
+WBQqkZ7MTHwfZgKjsGUl/K0n+Tph4fv8vk2uirP8ia4xt45g80ltaFaTrLnYMEHH
+aP4/eb+PFl86a//GZB2iz2YWxHYGXVeSubPZWIdw3QGWmmm2tAtR2vYYnGEGIKxG
+Odb4l+wzwtnnbqB86vimGiSsY00c2ue2DwnzpTX/Ytm9+XQGtWwKsCRpMwnPXbqc
+S1WbxnKXX8yB4TgIWtA5nYdreRBX8bZ8li7Y/Deq4x94OS2sYt37+33Cylpaj3re
+Y5htAgMBAAGjUzBRMB0GA1UdDgQWBBQn6tC5Vb3mFD4wAS+DMAAYjpgy+zAfBgNV
+HSMEGDAWgBQn6tC5Vb3mFD4wAS+DMAAYjpgy+zAPBgNVHRMBAf8EBTADAQH/MA0G
+CSqGSIb3DQEBCwUAA4ICAQADXWiLKzioNHlKxU3g0TSCkRe8FtmmtleXS3pXouPw
+u1uEBZL0aM7pTyzgAdNJ8/IkyEA4orqlCJs+M262JloKh2ezY4l4u8QY9Wgr32IB
+U8cHztcs2hKlVRxH2aQi9P2ro2XVTh6/eYZN3X+B0+DS1rG6M4hJqQ+y3+hF8pop
+E92hQ8TKodsWKORMMeAjeBNQF+P/doOAWP1BkteDYheQH4iZ2GbABG8mOzLYbtYO
+F3lN4uOd9gN2pjkV/4mtJHamufep2sFuF/06W5G352qLWagBbZ4oo3CRYNkanqft
+tDY3rt2o0jOEWb7wYqdhgItq6sgFAFa9tC3/TuLhYvPeo6bQMOqbbWZmEGiCUgW6
+eOmBw/A7Pnes/5lWh4QXTFOcTxW9EBwfhJ1HcEp1JeTRWadtvi8iUzRD953t1dKw
+8u4hy9VsH+JuyEqsC85uWVPj4TNTAfY5TDK8I797NQFtPlsrTrHo46zEANjzNGvj
+GfzSMqxH0t+OD2gmMKML5mAsORBIhLfmn3kTXxgCW4aaOE+hQZ6vyiteD9LmrL0F
+yfvF5XNqJtzc4MbvRh9FvJejj5o9v1xO0/qyahDt7n3Mp/Ogsz2pdXdNBIWSnx6P
+FozaJjwSXUNI3Z8T8VAGWVpOabWExgWFClj9kOUI3iXk48aYHRBr53ZdoyPXZrf8
+og==
+-----END CERTIFICATE-----
diff --git a/WifiDialog/certs/key.pem b/WifiDialog/certs/key.pem
new file mode 100644
index 0000000000..4cbc2d608f
--- /dev/null
+++ b/WifiDialog/certs/key.pem
@@ -0,0 +1,52 @@
+-----BEGIN PRIVATE KEY-----
+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
+9yJMYim6jtFirfpa+8u1vxc9INTOaP0=
+-----END PRIVATE KEY-----
diff --git a/apex/Android.bp b/apex/Android.bp
index 231de3eab2..ad1a97eefb 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -34,6 +34,7 @@ apex_defaults {
apps: [
"OsuLogin",
"ServiceWifiResources",
+ "WifiDialog",
],
min_sdk_version: "30",
updatable: true,
diff --git a/framework/Android.bp b/framework/Android.bp
index 0730f28ff9..9490d8b729 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -152,6 +152,7 @@ java_sdk_library {
impl_library_visibility: [
"//frameworks/opt/net/wifi/service:__subpackages__",
"//packages/modules/Wifi/service:__subpackages__",
+ "//packages/modules/Wifi/WifiDialog:__subpackages__",
] + test_access_hidden_api_whitelist,
apex_available: [