From af57e9532ce76582a030cac52005e8cb0f8547e2 Mon Sep 17 00:00:00 2001 From: Hai Shalom Date: Fri, 19 Jun 2020 16:34:17 -0700 Subject: [Passpoint] Remove R2 broadcasts Remove R2 broadcasts for Icon, deauth imminent and subscription remediation. These broadcasts are not used and not necessary, and also leaked the Passpoint AP BSSID without location permission. Bug: 157748906 Test: atest PasspointManagerTest Change-Id: I25aba4c7a39150e9df483890f575d3e3767723be (cherry picked from commit 6f1aafe2d4b979cf64ab7a5150a021f977cfed37) Merged-In: I25aba4c7a39150e9df483890f575d3e3767723be --- .../server/wifi/hotspot2/PasspointManager.java | 43 +--------------------- 1 file changed, 2 insertions(+), 41 deletions(-) (limited to 'service') diff --git a/service/java/com/android/server/wifi/hotspot2/PasspointManager.java b/service/java/com/android/server/wifi/hotspot2/PasspointManager.java index 75596b548..8f4349a1f 100644 --- a/service/java/com/android/server/wifi/hotspot2/PasspointManager.java +++ b/service/java/com/android/server/wifi/hotspot2/PasspointManager.java @@ -17,16 +17,6 @@ package com.android.server.wifi.hotspot2; import static android.app.AppOpsManager.OPSTR_CHANGE_WIFI_STATE; -import static android.net.wifi.WifiManager.ACTION_PASSPOINT_DEAUTH_IMMINENT; -import static android.net.wifi.WifiManager.ACTION_PASSPOINT_ICON; -import static android.net.wifi.WifiManager.ACTION_PASSPOINT_SUBSCRIPTION_REMEDIATION; -import static android.net.wifi.WifiManager.EXTRA_BSSID_LONG; -import static android.net.wifi.WifiManager.EXTRA_DELAY; -import static android.net.wifi.WifiManager.EXTRA_ESS; -import static android.net.wifi.WifiManager.EXTRA_FILENAME; -import static android.net.wifi.WifiManager.EXTRA_ICON; -import static android.net.wifi.WifiManager.EXTRA_SUBSCRIPTION_REMEDIATION_METHOD; -import static android.net.wifi.WifiManager.EXTRA_URL; import static com.android.server.wifi.hotspot2.Utils.isCarrierEapMethod; @@ -34,8 +24,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.app.AppOpsManager; import android.content.Context; -import android.content.Intent; -import android.graphics.drawable.Icon; import android.net.wifi.ScanResult; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiEnterpriseConfig; @@ -48,7 +36,6 @@ import android.net.wifi.hotspot2.pps.HomeSp; import android.os.Handler; import android.os.Looper; import android.os.Process; -import android.os.UserHandle; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.text.TextUtils; @@ -164,38 +151,12 @@ public class PasspointManager { @Override public void onIconResponse(long bssid, String fileName, byte[] data) { - Intent intent = new Intent(ACTION_PASSPOINT_ICON); - intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT); - intent.putExtra(EXTRA_BSSID_LONG, bssid); - intent.putExtra(EXTRA_FILENAME, fileName); - if (data != null) { - intent.putExtra(EXTRA_ICON, Icon.createWithData(data, 0, data.length)); - } - mContext.sendBroadcastAsUser(intent, UserHandle.ALL, - android.Manifest.permission.ACCESS_WIFI_STATE); + // Empty } @Override public void onWnmFrameReceived(WnmData event) { - // %012x HS20-SUBSCRIPTION-REMEDIATION "%u %s", osu_method, url - // %012x HS20-DEAUTH-IMMINENT-NOTICE "%u %u %s", code, reauth_delay, url - Intent intent; - if (event.isDeauthEvent()) { - intent = new Intent(ACTION_PASSPOINT_DEAUTH_IMMINENT); - intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT); - intent.putExtra(EXTRA_BSSID_LONG, event.getBssid()); - intent.putExtra(EXTRA_URL, event.getUrl()); - intent.putExtra(EXTRA_ESS, event.isEss()); - intent.putExtra(EXTRA_DELAY, event.getDelay()); - } else { - intent = new Intent(ACTION_PASSPOINT_SUBSCRIPTION_REMEDIATION); - intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT); - intent.putExtra(EXTRA_BSSID_LONG, event.getBssid()); - intent.putExtra(EXTRA_SUBSCRIPTION_REMEDIATION_METHOD, event.getMethod()); - intent.putExtra(EXTRA_URL, event.getUrl()); - } - mContext.sendBroadcastAsUser(intent, UserHandle.ALL, - android.Manifest.permission.ACCESS_WIFI_STATE); + // Empty } } -- cgit v1.2.3