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

Commit 249b1a34 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Notif manager and captive portal app to read SSID again" into pi-dev

parents fdad4c51 2dcccbcc

packages/CaptivePortalLogin/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
    <uses-permission android:name="android.permission.INTERNET" />

    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

    <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" />

    <uses-permission android:name="android.permission.NETWORK_STACK" />



    <application android:label="@string/app_name"

                 android:usesCleartextTraffic="true">

packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java

+4 −7
Original line number Diff line number Diff line
@@ -26,12 +26,12 @@ import android.net.ConnectivityManager; 
import android.net.ConnectivityManager.NetworkCallback;

import android.net.Network;

import android.net.NetworkCapabilities;

import android.net.NetworkInfo;

import android.net.NetworkRequest;

import android.net.Proxy;

import android.net.Uri;

import android.net.dns.ResolvUtil;

import android.net.http.SslError;

import android.net.wifi.WifiInfo;

import android.os.Build;

import android.os.Bundle;

import android.provider.Settings;
@@ -534,15 +534,12 @@ public class CaptivePortalLoginActivity extends Activity { 
    }



    private String getHeaderTitle() {

        NetworkInfo info = mCm.getNetworkInfo(mNetwork);

        if (info == null || TextUtils.isEmpty(info.getExtraInfo())) {

            return getString(R.string.action_bar_label);

        }

        NetworkCapabilities nc = mCm.getNetworkCapabilities(mNetwork);

        if (!nc.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)) {

        if (nc == null || TextUtils.isEmpty(nc.getSSID())

            || !nc.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)) {

            return getString(R.string.action_bar_label);

        }

        return getString(R.string.action_bar_title, info.getExtraInfo().replaceAll("^\"|\"$", ""));

        return getString(R.string.action_bar_title, WifiInfo.removeDoubleQuotes(nc.getSSID()));

    }



    private String getHeaderSubtitle(URL url) {

services/core/java/com/android/server/connectivity/NetworkNotificationManager.java

+3 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.res.Resources;

import android.net.NetworkCapabilities;

import android.net.wifi.WifiInfo;

import android.os.UserHandle;

import android.telephony.TelephonyManager;

import android.util.Slog;
@@ -176,7 +177,8 @@ public class NetworkNotificationManager { 
            switch (transportType) {

                case TRANSPORT_WIFI:

                    title = r.getString(R.string.wifi_available_sign_in, 0);

                    details = r.getString(R.string.network_available_sign_in_detailed, extraInfo);

                    details = r.getString(R.string.network_available_sign_in_detailed,

                            WifiInfo.removeDoubleQuotes(nai.networkCapabilities.getSSID()));

                    break;

                case TRANSPORT_CELLULAR:

                    title = r.getString(R.string.network_available_sign_in, 0);