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
diff --git a/packages/OsuLogin/Android.bp b/packages/OsuLogin/Android.bp
index ac3abac..cd9cd1e 100644
--- a/packages/OsuLogin/Android.bp
+++ b/packages/OsuLogin/Android.bp
@@ -3,6 +3,10 @@
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 d554745..9797846 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 @@
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.widget.ProgressBar;
import android.widget.Toast;
+import androidx.annotation.Nullable;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import java.net.MalformedURLException;