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

Commit 32a02e1a authored by David Su's avatar David Su Committed by Android (Google) Code Review
Browse files

Merge "Include OsuLogin in Wifi apex"

parents 7d295851 e5104e36
Loading
Loading
Loading
Loading
+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
# ******************************************************************
+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",
    ],
}
+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;