From e5104e36f9230547826fbcfa2f260932ef6cec69 Mon Sep 17 00:00:00 2001
From: David Su <dysu@google.com>
Date: Wed, 12 Feb 2020 17:27:00 -0800
Subject: [PATCH] Include OsuLogin in Wifi apex

Build OsuLogin against system_current and make it
available to the wifi apex.

Bug: 149346045
Test: Attempted to connect to an OSU network,
verify OsuLogin page pops up

Change-Id: Ib71772f09d85b544f1298493ca34b10243a6a9f5
---
 CleanSpec.mk                                              | 2 ++
 packages/OsuLogin/Android.bp                              | 8 ++++++--
 .../com/android/hotspot2/osulogin/OsuLoginActivity.java   | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 0b7ea2832afa7..02e8eecbb721b 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -260,6 +260,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/service-statsd.jar
 $(call add-clean-step, rm -rf $(SOONG_OUT_DIR)/.intermediates/frameworks/base/libincremental_aidl-cpp-source/)
 $(call add-clean-step, rm -rf $(SOONG_OUT_DIR)/.intermediates/frameworks/base/libincremental_manager_aidl-cpp-source/)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/InProcessTethering)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/OsuLogin)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system_other/system/app/OsuLogin)
 # ******************************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER
 # ******************************************************************
diff --git a/packages/OsuLogin/Android.bp b/packages/OsuLogin/Android.bp
index ac3abaca7a390..cd9cd1e6395dd 100644
--- a/packages/OsuLogin/Android.bp
+++ b/packages/OsuLogin/Android.bp
@@ -3,6 +3,10 @@ android_app {
     static_libs: ["androidx.legacy_legacy-support-v4"],
     resource_dirs: ["res"],
     srcs: ["src/**/*.java"],
-    platform_apis: true,
-    certificate: "platform",
+    sdk_version: "system_current",
+
+    apex_available: [
+        "com.android.wifi",
+        "test_com.android.wifi",
+    ],
 }
diff --git a/packages/OsuLogin/src/com/android/hotspot2/osulogin/OsuLoginActivity.java b/packages/OsuLogin/src/com/android/hotspot2/osulogin/OsuLoginActivity.java
index d554745819e64..9797846bd7b1c 100644
--- a/packages/OsuLogin/src/com/android/hotspot2/osulogin/OsuLoginActivity.java
+++ b/packages/OsuLogin/src/com/android/hotspot2/osulogin/OsuLoginActivity.java
@@ -18,7 +18,6 @@ package com.android.hotspot2.osulogin;
 
 import static android.net.NetworkCapabilities.NET_CAPABILITY_TRUSTED;
 
-import android.annotation.Nullable;
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -40,6 +39,7 @@ import android.webkit.WebViewClient;
 import android.widget.ProgressBar;
 import android.widget.Toast;
 
+import androidx.annotation.Nullable;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import java.net.MalformedURLException;