From b45927fcca13f5a117f87928daff6c2eba66a712 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Mon, 14 Sep 2020 21:25:44 +0000 Subject: Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I07be8fb9004037dd4ff5280f27e1c2e8c711fd55 --- libs/WifiTrackerLib/res/values-ar/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/WifiTrackerLib/res/values-ar/strings.xml b/libs/WifiTrackerLib/res/values-ar/strings.xml index 9a376c721..40ac14995 100644 --- a/libs/WifiTrackerLib/res/values-ar/strings.xml +++ b/libs/WifiTrackerLib/res/values-ar/strings.xml @@ -23,7 +23,7 @@ "لا يتوفّر اتصال بالإنترنت" "مشكلة في المصادقة" "يُرجى التحقق من كلمة المرور وإعادة المحاولة" - "‏تعذّرت تهيئة عنوان IP" + "‏تعذّر إعداد عنوان IP" "غير مفعّلة" "نقطة الوصول ممتلئة مؤقتًا" "غير متصلة" -- cgit v1.2.3 From 92c5563699db288f7f58feb9fbd4c9bd1c42e003 Mon Sep 17 00:00:00 2001 From: Jimmy Chen Date: Tue, 15 Sep 2020 14:12:52 +0800 Subject: p2p: set default group owner intent for tests Bug: 168494067 Test: atest FrameworksWifiTests Change-Id: I0f09bbc9389ba535ecd99c379f789d1886c48343 --- .../src/com/android/server/wifi/p2p/SupplicantP2pIfaceHalTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/wifitests/src/com/android/server/wifi/p2p/SupplicantP2pIfaceHalTest.java b/tests/wifitests/src/com/android/server/wifi/p2p/SupplicantP2pIfaceHalTest.java index 6a7f2038c..b4943d776 100644 --- a/tests/wifitests/src/com/android/server/wifi/p2p/SupplicantP2pIfaceHalTest.java +++ b/tests/wifitests/src/com/android/server/wifi/p2p/SupplicantP2pIfaceHalTest.java @@ -2882,6 +2882,8 @@ public class SupplicantP2pIfaceHalTest extends WifiBaseTest { config.wps.setup = wpsProvMethod; config.wps.pin = pin; + config.groupOwnerIntent = WifiP2pServiceImpl.DEFAULT_GROUP_OWNER_INTENT; + return config; } -- cgit v1.2.3 From b7e74905fa971db47dc1e7fd2fae8de43bafd814 Mon Sep 17 00:00:00 2001 From: Hai Shalom Date: Mon, 14 Sep 2020 16:15:00 -0700 Subject: [Passpoint] Add indication flag to wifiscanner logs Add [PASSPOINT] flag to wifiscanner logs. Provides information about which networks advertise Passpoint capability in their IEs. Bug: 168493053 Test: dumpsys wifiscanner, verify output AndroidWiFiPasspoint [WPA2-EAP-CCMP][RSN-EAP-CCMP][ESS][PASSPOINT] Change-Id: I0dd03d0fa242d536662b62ff649e64e92303b04c Merged-In: I0dd03d0fa242d536662b62ff649e64e92303b04c (cherry picked from commit 37f793e7ff2a2c4851651e654596a5e6fdbdb350) --- service/java/com/android/server/wifi/util/ScanResultUtil.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/service/java/com/android/server/wifi/util/ScanResultUtil.java b/service/java/com/android/server/wifi/util/ScanResultUtil.java index dc2281ad2..4085045b5 100644 --- a/service/java/com/android/server/wifi/util/ScanResultUtil.java +++ b/service/java/com/android/server/wifi/util/ScanResultUtil.java @@ -233,6 +233,10 @@ public class ScanResultUtil { } else { rssiInfo = String.format("%9d ", r.level); } + if ((r.flags & ScanResult.FLAG_PASSPOINT_NETWORK) + == ScanResult.FLAG_PASSPOINT_NETWORK) { + r.capabilities += "[PASSPOINT]"; + } pw.printf(" %17s %9d %18s %7s %-32s %s\n", r.BSSID, r.frequency, -- cgit v1.2.3 From 80d0986ea4ec6d2bff2af02a9e1a31593c200540 Mon Sep 17 00:00:00 2001 From: xshu Date: Thu, 10 Sep 2020 19:46:04 -0700 Subject: Exponential backoff for external score blocklist (cherry-picked from 89ab95af87eff69a5865124fc4bc529e1f6efb52) Changes: 1. When the external scorer marks a network as unacceptable, block the BSSID for 0.5/1/2/... up to 64 minutes instead of the previous fixed 30 seconds. 2. Modified test cases to increase coverage. Bug: 158695052 Test: atest com.android.server.wifi Change-Id: I0f1413563530c8e66ea6a061c78bc49bffd61091 --- .../android/server/wifi/BssidBlocklistMonitor.java | 16 +++- .../com/android/server/wifi/WifiScoreReport.java | 4 +- service/res/values/config.xml | 7 ++ service/res/values/overlayable.xml | 1 + .../server/wifi/BssidBlocklistMonitorTest.java | 104 ++++++++++++++------- .../android/server/wifi/WifiScoreReportTest.java | 15 ++- 6 files changed, 102 insertions(+), 45 deletions(-) diff --git a/service/java/com/android/server/wifi/BssidBlocklistMonitor.java b/service/java/com/android/server/wifi/BssidBlocklistMonitor.java index d96fdb39e..e3fe32ab7 100644 --- a/service/java/com/android/server/wifi/BssidBlocklistMonitor.java +++ b/service/java/com/android/server/wifi/BssidBlocklistMonitor.java @@ -330,8 +330,7 @@ public class BssidBlocklistMonitor { if (shouldWaitForWatchdogToTriggerFirst(bssid, reasonCode)) { return false; } - int baseBlockDurationMs = mContext.getResources().getInteger( - R.integer.config_wifiBssidBlocklistMonitorBaseBlockDurationMs); + int baseBlockDurationMs = getBaseBlockDurationForReason(reasonCode); addToBlocklist(entry, getBlocklistDurationWithExponentialBackoff(currentStreak, baseBlockDurationMs), reasonCode, rssi); @@ -341,6 +340,17 @@ public class BssidBlocklistMonitor { return false; } + private int getBaseBlockDurationForReason(int blockReason) { + switch (blockReason) { + case REASON_FRAMEWORK_DISCONNECT_CONNECTED_SCORE: + return mContext.getResources().getInteger(R.integer + .config_wifiBssidBlocklistMonitorConnectedScoreBaseBlockDurationMs); + default: + return mContext.getResources().getInteger( + R.integer.config_wifiBssidBlocklistMonitorBaseBlockDurationMs); + } + } + /** * Note a failure event on a bssid and perform appropriate actions. * @return True if the blocklist has been modified. @@ -383,6 +393,8 @@ public class BssidBlocklistMonitor { ssid, bssid, connectionTime); if (connectionTime - prevConnectionTime > ABNORMAL_DISCONNECT_RESET_TIME_MS) { mWifiScoreCard.resetBssidBlocklistStreak(ssid, bssid, REASON_ABNORMAL_DISCONNECT); + mWifiScoreCard.resetBssidBlocklistStreak(ssid, bssid, + REASON_FRAMEWORK_DISCONNECT_CONNECTED_SCORE); } BssidStatus status = mBssidStatusMap.get(bssid); diff --git a/service/java/com/android/server/wifi/WifiScoreReport.java b/service/java/com/android/server/wifi/WifiScoreReport.java index 80a561d05..bd92c6dac 100644 --- a/service/java/com/android/server/wifi/WifiScoreReport.java +++ b/service/java/com/android/server/wifi/WifiScoreReport.java @@ -60,7 +60,6 @@ public class WifiScoreReport { private static final int WIFI_CONNECTED_NETWORK_SCORER_IDENTIFIER = 0; private static final int INVALID_SESSION_ID = -1; private static final long MIN_TIME_TO_WAIT_BEFORE_BLOCKLIST_BSSID_MILLIS = 29000; - private static final long DURATION_TO_BLOCKLIST_BSSID_AFTER_FIRST_EXITING_MILLIS = 30000; private static final long INVALID_WALL_CLOCK_MILLIS = -1; /** @@ -751,9 +750,8 @@ public class WifiScoreReport { if ((mLastScoreBreachLowTimeMillis != INVALID_WALL_CLOCK_MILLIS) && ((millis - mLastScoreBreachLowTimeMillis) >= MIN_TIME_TO_WAIT_BEFORE_BLOCKLIST_BSSID_MILLIS)) { - mBssidBlocklistMonitor.blockBssidForDurationMs(mWifiInfo.getBSSID(), + mBssidBlocklistMonitor.handleBssidConnectionFailure(mWifiInfo.getBSSID(), mWifiInfo.getSSID(), - DURATION_TO_BLOCKLIST_BSSID_AFTER_FIRST_EXITING_MILLIS, BssidBlocklistMonitor.REASON_FRAMEWORK_DISCONNECT_CONNECTED_SCORE, mWifiInfo.getRssi()); mLastScoreBreachLowTimeMillis = INVALID_WALL_CLOCK_MILLIS; diff --git a/service/res/values/config.xml b/service/res/values/config.xml index 1220c260a..0264c3eae 100644 --- a/service/res/values/config.xml +++ b/service/res/values/config.xml @@ -355,6 +355,13 @@ config_wifiBssidBlocklistMonitorFailureStreakCap is set to 7--> 300000 + + 30000 +