From 9705284f81bd17b172f8958fe69d83b856fa35a3 Mon Sep 17 00:00:00 2001 From: Ecco Park Date: Fri, 7 Sep 2018 15:49:24 -0700 Subject: passpoint-r2: add the ANQP IE dump in ANQP cache dump. For the DUMPSYS for PasspointManager, we normally print out Passpoint credential as well as ANQP cache. However, in the ANQP cache dump, it only just print out the AP name and ANQP element count. In order to debug passpoint issue, we need to know ANQP elements in details. Sample prints with this CL: Dump of PasspointManager PasspointManager - Providers Begin --- PasspointManager - Providers End --- PasspointManager - Next provider ID to be assigned 0 Last sweep 0:02:34.084 ago. :1: 9 elements, expires in 0:57:37.738 - HSConnectionCapability{mStatusList=[ProtocolTuple{mProtocol=6, mPort=80, mStatus=1}, ProtocolTuple{mProtocol=6, mPort=20, mStatus=1}, ProtocolTuple{mProtocol=6, mPort=22, mStatus=1}, ProtocolTuple{mProtocol=6, mPort=443, mStatus=1}, ProtocolTuple{mProtocol=17, mPort=500, mStatus=1}, ProtocolTuple{mProtocol=1, mPort=0, mStatus=1}]} HSFriendlyName{mNames=[Test:eng]} IPAddressTypeAvailability{mV4Availability=0, mV6Availability=0} NAIRealmElement{mRealmDataList=[NAIRealmElement{mRealms=[test.com] mEAPMethods=[]}, NAIRealmElement{mRealms=[wlan.mnc111.mcc222.3gppnetwork.org] mEAPMethods=[]}, NAIRealmElement{mRealms=[wlan.mnc112.mcc333.3gppnetwork.org] mEAPMethods=[]}, NAIRealmElement{mRealms=[wlan.mnc444.mcc333.3gppnetwork.org] mEAPMethods=[]}]} DomainName{mDomains=[test.com]} VenueName{ mNames=[]} HSWanMetrics{mStatus=1, mSymmetric=true, mCapped=false, mDlSpeed=4294967295, mUlSpeed=4294967295, mDlLoad=99.609375, mUlLoad=99.609375, mLMD=65535} ThreeGPPNetwork{mNetworks=[CellularNetwork{mPlmnList=[11111, 1112222, 333333]}]} OSUProviders{mOsuSsid=TEST-OSU, mProviders=[OsuProviderInfo{mFriendlyNames=[Test:eng], mServerUri=https://test.com/soap/, mMethodList=[1], mIconInfoList=[IconInfo{Width=256, Height=256, Language=eng, IconType='png', FileName='testappicon.png'}], mNetworkAccessIdentifier=, mServiceDescriptions=[Test Wireless:eng]}]} :1: 6 elements, expires in 0:57:37.730 - IPAddressTypeAvailability{mV4Availability=1, mV6Availability=2} NAIRealmElement{mRealmDataList=[NAIRealmElement{mRealms=[test.com] mEAPMethods=[]}]} DomainName{mDomains=[test.com, testpot.net]} VenueName{ mNames=[]} ThreeGPPNetwork{mNetworks=[CellularNetwork{mPlmnList=[11111, 222410]}]} OSUProviders{mOsuSsid=, mProviders=[]} Bug: 112851773 Test: ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh Test: adb bugreport Signed-off-by: Ecco Park Change-Id: I975a64e55b3b1978d63035c4194a346e2af241c0 --- service/java/com/android/server/wifi/hotspot2/ANQPData.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'service') diff --git a/service/java/com/android/server/wifi/hotspot2/ANQPData.java b/service/java/com/android/server/wifi/hotspot2/ANQPData.java index 6dbbe8ac0..26286a881 100644 --- a/service/java/com/android/server/wifi/hotspot2/ANQPData.java +++ b/service/java/com/android/server/wifi/hotspot2/ANQPData.java @@ -73,7 +73,10 @@ public class ANQPData { sb.append(mANQPElements.size()).append(" elements, "); long now = mClock.getElapsedSinceBootMillis(); sb.append(" expires in ").append(Utils.toHMS(mExpiryTime - now)).append(' '); - sb.append(expired(now) ? 'x' : '-'); + sb.append(expired(now) ? 'x' : '-').append("\n"); + for (Map.Entry entry: mANQPElements.entrySet()) { + sb.append(entry.getValue()).append("\n"); + } return sb.toString(); } } -- cgit v1.2.3