Commit Graph

2167 Commits

Author SHA1 Message Date
Eric Schwarzenbach
7dfc73f7c9 Remove mSeen from AccessPoint.
Clean up unused variable and associated methods.

Bug: 64533622
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java

Change-Id: Ic7e2e0e606647aed95a6fb483f7c818c81e3bf3f
2017-08-16 11:17:32 -07:00
Eric Schwarzenbach
44268e3c67 Remove references to deprecated NetworkBadging class.
Cleanup. Replaces references to the badging enums with
AccessPoint.Speed. Recreates getWifiIcon functionality in Utils class.

Bug: 62355275
Test: manual (no behavioral changes)
Change-Id: I33fa70e3680431fd234a92e989f89dbe04798ad2
2017-08-15 20:33:05 +00:00
Justin Klaassen
d70da54f9f Merge "Update Qualcomm(R) aptX(TM) strings" into oc-dr1-dev am: 8d7cd4bcaa am: aaedb0e191
am: 80f15b0594

Change-Id: Ife96eb768668fe4597e81c8655174aa9748e57cd
2017-08-15 18:46:36 +00:00
Justin Klaassen
80f15b0594 Merge "Update Qualcomm(R) aptX(TM) strings" into oc-dr1-dev am: 8d7cd4bcaa
am: aaedb0e191

Change-Id: Ie8c5318db7dfb4dfa4009e9cb34ccc618bcc8077
2017-08-15 17:59:08 +00:00
Justin Klaassen
aaedb0e191 Merge "Update Qualcomm(R) aptX(TM) strings" into oc-dr1-dev
am: 8d7cd4bcaa

Change-Id: Id89bc7a8e7b64675ce269201d7afd2e0fca9040d
2017-08-15 17:31:54 +00:00
Justin Klaassen
2445f80938 Update Qualcomm(R) aptX(TM) strings
Bug: 63899732
Test: Verified strings in Settings > System > Developer Options.
Change-Id: I21d764b0c11ff1cc934d379b2062ecc5a697624c
2017-08-14 20:01:36 -07:00
Sundeep Ghuman
be3a74c2de Generate fallback speed label in AccessPoint.java
Cache all seen matching ScoredNetworks, and use these networks to
generate a fallback curve. This cache is kept in sync with WifiTracker's
WifiNetworkScoreCache, hence it does not permanently create any new
objects other than the map itself.

Bug: 63073866
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java

Change-Id: I0cdf17f63f0238e0e3a8324190f75d82beaa6672
2017-08-14 12:32:12 -07:00
Bill Yi
58f429278d Revert "Import translations. DO NOT MERGE"
This reverts commit 58d65a51d4.
Exempt-From-Owner-Approval: translation import

Change-Id: I0871fb39c8c152d7d7926871270e3a652fbd0b77
2017-08-14 13:37:04 +00:00
Bill Yi
58d65a51d4 Import translations. DO NOT MERGE
Change-Id: I1832b190126f6515f7d280611101c6c7884382ef
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-12 07:05:10 -07:00
Tony Mantler
265e7fbcc3 Don't lose dialogs during configuration change
Bug: 62442606
Test: Rotate device when a dialog is showing
Change-Id: Iba63343d4e52e8e3ed2489f2f9482e698baf6111
2017-08-09 14:41:25 -07:00
TreeHugger Robot
e32b433818 Merge "Import translations. DO NOT MERGE" 2017-08-09 15:48:24 +00:00
Eric Schwarzenbach
64d02323df Merge "Use NetworkKey factory methods instead of constructor." 2017-08-09 15:46:48 +00:00
The Android Open Source Project
4e3d4235c8 Import translations. DO NOT MERGE
Change-Id: I946d40e430aa3b574f5e710e25a633edbb67553c
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-08 17:09:06 -07:00
Fan Zhang
066864a6ed Merge "Remove logic for parsing dismiss rule" into oc-mr1-dev am: 6a820f2238
am: 774eace18c

Change-Id: Ib86300ac020de47871bb4c2c0557628ee9d8eeb8
2017-08-08 22:53:16 +00:00
Fan Zhang
774eace18c Merge "Remove logic for parsing dismiss rule" into oc-mr1-dev
am: 6a820f2238

Change-Id: Iea7029ed562585c1529419bfeff79590534ffe50
2017-08-08 22:27:49 +00:00
TreeHugger Robot
6a820f2238 Merge "Remove logic for parsing dismiss rule" into oc-mr1-dev 2017-08-08 22:13:11 +00:00
Sundeep Ghuman
591e96c105 Merge "Refactor WifiTracker sStaleScanResults." into oc-dr1-dev
am: e14d59a656

Change-Id: I2bcf3d52e970190d900005988cc0e562c8ab7b59
2017-08-08 21:31:38 +00:00
Sundeep Ghuman
ff09600616 Merge "Refactor WifiTracker sStaleScanResults." into oc-mr1-dev am: a5a660a84d
am: 9c628a7d7d

Change-Id: If982340d9d1bcc9eb903c743ebf83c77cbad4b40
2017-08-08 19:53:05 +00:00
Sundeep Ghuman
9c628a7d7d Merge "Refactor WifiTracker sStaleScanResults." into oc-mr1-dev
am: a5a660a84d

Change-Id: Id3804ecaf51b18731d21dc8ff4f592bfcaa3095c
2017-08-08 19:47:52 +00:00
jackqdyulei
e685cc06a8 Merge "Update string for not charging." into oc-mr1-dev am: ed0c5cf48f
am: 205afa7bd6

Change-Id: I5b669558511845402fbda458c748dce1c931733f
2017-08-08 19:42:54 +00:00
TreeHugger Robot
a5a660a84d Merge "Refactor WifiTracker sStaleScanResults." into oc-mr1-dev 2017-08-08 19:35:36 +00:00
jackqdyulei
205afa7bd6 Merge "Update string for not charging." into oc-mr1-dev
am: ed0c5cf48f

Change-Id: Ic91cca4e7babe179d13a82f850b634c98d55ff8c
2017-08-08 19:35:24 +00:00
TreeHugger Robot
ed0c5cf48f Merge "Update string for not charging." into oc-mr1-dev 2017-08-08 19:27:29 +00:00
Eric Schwarzenbach
733ea26747 Use NetworkKey factory methods instead of constructor.
Bug: 34346278
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java

Change-Id: I5f7e4e3268a3d7e372d1098f423b389784765807
2017-08-08 10:35:58 -07:00
Sundeep Ghuman
a580215fc3 Refactor WifiTracker sStaleScanResults.
In ag/2580164, in order to minimize changes, we used mutable static
state in WifiTracker to control cache eviction. This breaks a certain
flow in SetupWizard. This change reverts sStaleScanResults to an
instance member and then pipes the value into the AccessPoint update
call to control cache eviction instead of relying on error prone use of
mutable static state.

Bug: 63479352
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
&&
runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Manual: See bug

Change-Id: Ia6d79c1904294da69841cbdf6eafbf42fa70f2d0
Merged-In: Ia6d79c1904294da69841cbdf6eafbf42fa70f2d0
2017-08-08 09:45:57 -07:00
Sundeep Ghuman
d1e449267a Refactor WifiTracker sStaleScanResults.
In ag/2580164, in order to minimize changes, we used mutable static
state in WifiTracker to control cache eviction. This breaks a certain
flow in SetupWizard. This change reverts sStaleScanResults to an
instance member and then pipes the value into the AccessPoint update
call to control cache eviction instead of relying on error prone use of
mutable static state.

Bug: 63479352
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
&&
runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Manual: See bug

Change-Id: Ia6d79c1904294da69841cbdf6eafbf42fa70f2d0
2017-08-08 09:30:22 -07:00
TreeHugger Robot
8dc5772cfc Merge "Move LogPersist to SettingsLib" 2017-08-07 18:50:49 +00:00
Bill Yi
158bd8c90e Import translations. DO NOT MERGE
Change-Id: Ib2fd9bee8040fa4c57a62cbf22a64361201ab7cd
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-05 18:33:48 -07:00
Bill Yi
098e033d17 Import translations. DO NOT MERGE
Change-Id: I11e8908001cbf5e33e280ca2c8fb3b30c686f3f2
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-04 16:14:49 -07:00
Sundeep Ghuman
395c2cc1fc Merge "Fix race condition / test flakiness." into oc-dr1-dev am: 0c8e5b6dda am: 850ec9b235
am: 6911eb3879

Change-Id: I3b92831ece6dade82d334ad96d69937a520a79a2
2017-08-04 21:32:51 +00:00
Sundeep Ghuman
6911eb3879 Merge "Fix race condition / test flakiness." into oc-dr1-dev am: 0c8e5b6dda
am: 850ec9b235

Change-Id: Id33bd57718e1c59c216ba98a59979355a36ada60
2017-08-04 21:21:13 +00:00
Sundeep Ghuman
d2e8a019a4 Merge "Fix race condition / test flakiness." into oc-dr1-dev
am: 0c8e5b6dda

Change-Id: I3439609155e18644b713b2ae25dee1b15f28cfbc
2017-08-04 21:09:26 +00:00
Sundeep Ghuman
850ec9b235 Merge "Fix race condition / test flakiness." into oc-dr1-dev
am: 0c8e5b6dda

Change-Id: I0e7541f39696e226baf68418ea86ed94cea34827
2017-08-04 21:08:43 +00:00
TreeHugger Robot
0c8e5b6dda Merge "Fix race condition / test flakiness." into oc-dr1-dev 2017-08-04 20:59:34 +00:00
Tony Mantler
c48ba6a262 Move LogPersist to SettingsLib
Bug: 62442606
Test: LogdSizePreferenceControllerTest, LogpersistPreferenceControllerTest
Change-Id: Ie69248538a639e7b8ff0e1553b2393b38b1bf7fe
2017-08-04 13:57:22 -07:00
Fan Zhang
c07ae9cf09 Remove logic for parsing dismiss rule
We now still parse dismiss_rule from activity metadata, but intead of
treating it as "first show on Day x, then on day y if user dismiss
suggestion", we simply start showing suggestion on day x. If user
dismisses the suggestion, it's gone forever.

Change-Id: Ia4d14167a407983df22e582f8dbab0c2cc153e1e
Fix: 64297191
Test: robotests
2017-08-03 17:48:11 -07:00
Andre Eisenbach
1d5aefd120 Remove "Couldn't pair" prompt on ACTION_PAIRING_CANCEL am: 61ad5ae921 am: c0d1f46845
am: 5b0976d633

Change-Id: I966d5999a5800d1de6d0015ee4729407d1e37926
2017-08-03 19:22:59 +00:00
Andre Eisenbach
5b0976d633 Remove "Couldn't pair" prompt on ACTION_PAIRING_CANCEL am: 61ad5ae921
am: c0d1f46845

Change-Id: I8c0ffbccee4a53acc39d8cb164e1f32477294b73
2017-08-03 19:11:00 +00:00
Andre Eisenbach
39a9832df1 Remove "Couldn't pair" prompt on ACTION_PAIRING_CANCEL
am: 61ad5ae921

Change-Id: Iadbb0716f82a42366d8aba687208a1df81eafb70
2017-08-03 19:00:00 +00:00
Andre Eisenbach
c0d1f46845 Remove "Couldn't pair" prompt on ACTION_PAIRING_CANCEL
am: 61ad5ae921

Change-Id: I5726036ecf16992e1a9e56ac568b287547208a14
2017-08-03 18:59:59 +00:00
Andre Eisenbach
61ad5ae921 Remove "Couldn't pair" prompt on ACTION_PAIRING_CANCEL
ACTION_PAIRING_CANCEL is triggered as a result of an ACL connection
going down, causing a "Couldn't pair" prompt. This can happen on some
car kits, even if the pairing is successful and the car kit briefly
tearing down the ACL connection after pairing and resuming it
immediately afterwards.

If a connection gets disconnected during a normal bonding procedure, the
UNBOND_REASON_REMOTE_DEVICE_DOWN reason code for the
ACTION_BOND_STATE_CHANGED already indicates this issue and will inform
the user.

Bug: 63975046
Test: manual
Change-Id: I663d8b7700741927c72e38e30cd993c0b81511a9
2017-08-03 18:40:39 +00:00
Peter Qiu
41f3ad1c05 Merge "SettingsLib: wifi: add support for tracking carrier Wi-Fi APs" into oc-mr1-dev am: fca9a47ba8
am: 1387d056f9

Change-Id: Iad364bc777c571bac8aa1c31dcdc9e50ed815069
2017-08-03 04:47:05 +00:00
Peter Qiu
1387d056f9 Merge "SettingsLib: wifi: add support for tracking carrier Wi-Fi APs" into oc-mr1-dev
am: fca9a47ba8

Change-Id: I2e892a455ded1cb364eb449d35601c0ca3b7f02f
2017-08-03 04:36:31 +00:00
TreeHugger Robot
fca9a47ba8 Merge "SettingsLib: wifi: add support for tracking carrier Wi-Fi APs" into oc-mr1-dev 2017-08-03 04:28:24 +00:00
Fan Zhang
f0f9fa3307 Merge "Misc change to support loading dynamic summary/icon in app" 2017-08-02 21:40:02 +00:00
Fan Zhang
dadfd50325 Misc change to support loading dynamic summary/icon in app
- Add ThreadUtils.postOnBackground helper method
- Don't fallback to app.icon if tile's metadata contains icon uri
- Deprecate TITLE_RES_ID in favor of TITLE metadata

Bug: 63758074
Test: robotests
Change-Id: Ie60fb4677cdb12c3ff313ffdfdb4a4f4960fac0f
2017-08-02 21:38:49 +00:00
TreeHugger Robot
e5ae77c679 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 2017-08-02 15:20:57 +00:00
Bill Yi
7604382f25 Merge "Import translations. DO NOT MERGE" 2017-08-02 14:56:51 +00:00
Tomoharu Hatano
ea371385c7 Merge "Show correct security type for PasspointConfiguration" into oc-mr1-dev am: 5af90f9fc6
am: 38b792bed6

Change-Id: Ie5b2854bd9c3081dbcd4e405f7733abe3767e12a
2017-08-02 06:23:32 +00:00
Tomoharu Hatano
38b792bed6 Merge "Show correct security type for PasspointConfiguration" into oc-mr1-dev
am: 5af90f9fc6

Change-Id: I1cb9fabb9d3308312962305b6eb5d22314eb49a5
2017-08-02 06:08:07 +00:00