From 457411af20e8ad9a21310adcd544d76f6cfdf747 Mon Sep 17 00:00:00 2001 From: Peter Qiu Date: Fri, 10 Mar 2017 11:23:47 -0800 Subject: [PATCH] Osu: temporarily comment out the usage of deprecated intent definitions Bug: 35857805 Test: mmma frameworks/base/packages/Osu Change-Id: Ie4ea352e11b10a7c1f8780557554486bc2b4fcef --- packages/Osu/src/com/android/hotspot2/app/OSUService.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/Osu/src/com/android/hotspot2/app/OSUService.java b/packages/Osu/src/com/android/hotspot2/app/OSUService.java index 62a203dbfde0b..e9da113af747b 100644 --- a/packages/Osu/src/com/android/hotspot2/app/OSUService.java +++ b/packages/Osu/src/com/android/hotspot2/app/OSUService.java @@ -46,8 +46,9 @@ public class OSUService extends IntentService { private static final String[] INTENTS = { WifiManager.SCAN_RESULTS_AVAILABLE_ACTION, - WifiManager.PASSPOINT_WNM_FRAME_RECEIVED_ACTION, - WifiManager.PASSPOINT_ICON_RECEIVED_ACTION, + // TODO(b/32883320): use updated intent definitions. + //WifiManager.PASSPOINT_WNM_FRAME_RECEIVED_ACTION, + //WifiManager.PASSPOINT_ICON_RECEIVED_ACTION, WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION, WifiManager.WIFI_STATE_CHANGED_ACTION, WifiManager.NETWORK_STATE_CHANGED_ACTION, @@ -120,6 +121,8 @@ public class OSUService extends IntentService { case WifiManager.SCAN_RESULTS_AVAILABLE_ACTION: mOsuManager.pushScanResults(wifiManager.getScanResults()); break; + // TODO(b/32883320): use updated intent definitions. + /* case WifiManager.PASSPOINT_WNM_FRAME_RECEIVED_ACTION: long bssid = bundle.getLong(WifiManager.EXTRA_PASSPOINT_WNM_BSSID); String url = bundle.getString(WifiManager.EXTRA_PASSPOINT_WNM_URL); @@ -157,6 +160,7 @@ public class OSUService extends IntentService { bundle.getString(WifiManager.EXTRA_PASSPOINT_ICON_FILE), bundle.getByteArray(WifiManager.EXTRA_PASSPOINT_ICON_DATA)); break; + */ case WifiManager.NETWORK_STATE_CHANGED_ACTION: mOsuManager.networkConnectChange( (WifiInfo) intent.getParcelableExtra(WifiManager.EXTRA_WIFI_INFO));