diff options
| author | Peter Qiu <zqiu@google.com> | 2017-03-23 23:13:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-23 23:13:39 +0000 |
| commit | e5be458980ba6313368341c3caf6cf614438fd81 (patch) | |
| tree | 0f1d4109381c144cee6f118ea74e6dadf31fc4fd /service | |
| parent | 9af726975141f59dab95524b11c33e1d9fd16da0 (diff) | |
| parent | c0b42e0f03a02a22f3b0b50c64220c640e818b2d (diff) | |
Merge "hotspot2: use android.graphics.drawable.Icon for Passpoint icon data" am: e7efc1b20e am: 497c2e277d
am: c0b42e0f03
Change-Id: Ib78f5c93985ef13db11264401ecddf2acb21d421
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/hotspot2/PasspointManager.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/service/java/com/android/server/wifi/hotspot2/PasspointManager.java b/service/java/com/android/server/wifi/hotspot2/PasspointManager.java index 0e4620673..f472d86db 100644 --- a/service/java/com/android/server/wifi/hotspot2/PasspointManager.java +++ b/service/java/com/android/server/wifi/hotspot2/PasspointManager.java @@ -22,13 +22,14 @@ import static android.net.wifi.WifiManager.ACTION_PASSPOINT_SUBSCRIPTION_REMEDIA 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_ICON_INFO; +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 android.content.Context; import android.content.Intent; -import android.net.wifi.IconInfo; +import android.graphics.drawable.Icon; import android.net.wifi.ScanResult; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiEnterpriseConfig; @@ -123,7 +124,10 @@ public class PasspointManager { 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_ICON_INFO, new IconInfo(fileName, data)); + 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); } |