Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5104e36 authored by David Su's avatar David Su
Browse files

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
parent 62612562

CleanSpec.mk

+2 −0
Original line number Diff line number Diff line
@@ -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

# ******************************************************************

packages/OsuLogin/Android.bp

+6 −2
Original line number Diff line number Diff line
@@ -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",

    ],

}

packages/OsuLogin/src/com/android/hotspot2/osulogin/OsuLoginActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -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;