Erik Kline
f7ace4b51d
Merge changes Icd3d09aa,I4b070964 am: a0661c4fdf am: d3f4a27c59 am: de272fcd2a -s ours
...
am: 7d22a9dd78
2017-09-14 08:23:30 +00:00
Erik Kline
7d22a9dd78
Merge changes Icd3d09aa,I4b070964 am: a0661c4fdf am: d3f4a27c59
...
am: de272fcd2a
2017-09-14 08:20:30 +00:00
Erik Kline
de272fcd2a
Merge changes Icd3d09aa,I4b070964 am: a0661c4fdf
...
am: d3f4a27c59
2017-09-14 08:17:00 +00:00
Erik Kline
d3f4a27c59
Merge changes Icd3d09aa,I4b070964
...
am: a0661c4fdf
2017-09-14 08:14:09 +00:00
Treehugger Robot
a0661c4fdf
Merge changes Icd3d09aa,I4b070964
...
* changes:
Include IPv6 DNS servers in wifi details
Separate multiple DNS addresses with newlines.
2017-09-14 08:10:25 +00:00
Erik Kline
5b206aec69
Include IPv6 DNS servers in wifi details
...
Test: as follows
- built
- flashed
- booted
- export ROBOTEST_FILTER=WifiDetailPreferenceControllerTest \
make -j RunSettingsRoboTests
RunSettingsRoboTests:
RunSettingsRoboTests: Time: 19.821
RunSettingsRoboTests:
RunSettingsRoboTests: OK (37 tests)
RunSettingsRoboTests:
- make -j RunSettingsRoboTests
RunSettingsRoboTests: ...........................
RunSettingsRoboTests: Time: 424.847
RunSettingsRoboTests:
RunSettingsRoboTests: OK (2250 tests)
RunSettingsRoboTests:
Bug: 65037256
Bug: 65467586
Merged-In: If15181d557e9abce75111a6e1fff4e12586d7dbc
Merged-In: I55fbd611fee9f17215412a76b480cdee96f62b32
Change-Id: Icd3d09aa35c04101c41e2521b48e64f28f69ae29
(cherry picked from commit 9adc588749
2017-09-14 14:48:50 +09:00
Antony Sargent
514391ca82
Merge "Prevent brief flash of "Error" in hotspot status text" into oc-mr1-dev am: bc6dc5c20c
...
am: 151d5600b1
2017-09-14 03:39:01 +00:00
jackqdyulei
f7eae26ab4
Merge "Turn on wakeupAlarm anomaly detector" into oc-mr1-dev am: 7853f24405
...
am: 6f98ad5778
2017-09-14 03:38:24 +00:00
Bill Yi
e79fbaf991
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 93e8800b21 -s ours
...
am: c899692641
2017-09-14 03:37:34 +00:00
Antony Sargent
151d5600b1
Merge "Prevent brief flash of "Error" in hotspot status text" into oc-mr1-dev
...
am: bc6dc5c20c
2017-09-14 03:31:27 +00:00
jackqdyulei
6f98ad5778
Merge "Turn on wakeupAlarm anomaly detector" into oc-mr1-dev
...
am: 7853f24405
2017-09-14 03:30:48 +00:00
Bill Yi
c899692641
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 93e8800b21
2017-09-14 03:29:57 +00:00
Sundeep Ghuman
049d515dc4
Separate multiple DNS addresses with newlines.
...
Bug: b/65037256
Bug: 65037256
Test: make -j40 RunSettingsRoboTests
Merged-In: I676b5de60477f7c905b08b8bb361104e5f1e05b9
Merged-In: I61bcfc20d43133c12fb8fe78d7bd968af1ee59eb
Change-Id: I4b0709648f8e236177ea73338cfb0d42a5971c06
(cherry picked from commit 2716e841be
2017-09-14 11:38:12 +09:00
TreeHugger Robot
475df3c678
Merge "Change the permission labels to lowercase."
2017-09-14 00:23:05 +00:00
Antony Sargent
bc6dc5c20c
Merge "Prevent brief flash of "Error" in hotspot status text" into oc-mr1-dev
2017-09-14 00:04:42 +00:00
TreeHugger Robot
7853f24405
Merge "Turn on wakeupAlarm anomaly detector" into oc-mr1-dev
2017-09-13 23:08:25 +00:00
Doris Ling
a9693524bf
Change the permission labels to lowercase.
...
In the summary for Apps permissions, change the list of permissions
lable to lowercase instead.
Change-Id: I5b3133c33de7110dbec6ab179c6f1308c4ed481e
Fixes: 65049565
Test: make RunSettingsRoboTests
2017-09-13 15:23:06 -07:00
TreeHugger Robot
e4cab00ffa
Merge "Move search indexing into a separate class"
2017-09-13 19:43:38 +00:00
TreeHugger Robot
93e8800b21
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-09-13 19:34:27 +00:00
TreeHugger Robot
b0b1b9364c
Merge "Import translations. DO NOT MERGE"
2017-09-13 18:18:19 +00:00
Bill Yi
3b1c377d82
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: I34c1747c9f05b04794b7f563fc19f53467f21980
2017-09-13 09:45:46 -07:00
Bill Yi
d732b0a4e6
Import translations. DO NOT MERGE
...
Change-Id: Iead27f9c66c6bce2c1f3b27c29cf2c703da6dac6
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-09-13 09:33:48 -07:00
Emilian Peev
44c7447466
Merge "Settings: Add laser sensor preference" into oc-mr1-dev am: 22eb007eea
...
am: 11179290a2
2017-09-13 09:52:30 +00:00
jackqdyulei
75e7006e38
Merge "Init the pref summary in onCreate()" into oc-mr1-dev am: 7420c095a9
...
am: 55b71cf230
2017-09-13 09:50:48 +00:00
Xiangyu/Malcolm Chen
8c80f33e0e
Merge "In ApnEditor, restore preference values after re-creating." into oc-mr1-dev am: 8b6fd21f1e
...
am: 5bf7af0154
2017-09-13 09:48:58 +00:00
Matthew Fritze
7448204f36
Merge "Index the System status page" into oc-mr1-dev am: 6203bde8d3
...
am: 8896df965b
2017-09-13 09:47:02 +00:00
Rebecca Silberstein
be31cd3a79
Merge "Revert back to isDualBandSupported() for Wifi tethering." into oc-mr1-dev am: b975e352a2
...
am: 91f5a63262
2017-09-13 09:45:52 +00:00
Emilian Peev
11179290a2
Merge "Settings: Add laser sensor preference" into oc-mr1-dev
...
am: 22eb007eea
2017-09-13 08:40:10 +00:00
jackqdyulei
55b71cf230
Merge "Init the pref summary in onCreate()" into oc-mr1-dev
...
am: 7420c095a9
2017-09-13 08:39:31 +00:00
Xiangyu/Malcolm Chen
5bf7af0154
Merge "In ApnEditor, restore preference values after re-creating." into oc-mr1-dev
...
am: 8b6fd21f1e
2017-09-13 08:39:05 +00:00
Matthew Fritze
8896df965b
Merge "Index the System status page" into oc-mr1-dev
...
am: 6203bde8d3
2017-09-13 08:38:40 +00:00
Rebecca Silberstein
91f5a63262
Merge "Revert back to isDualBandSupported() for Wifi tethering." into oc-mr1-dev
...
am: b975e352a2
2017-09-13 08:38:14 +00:00
TreeHugger Robot
22eb007eea
Merge "Settings: Add laser sensor preference" into oc-mr1-dev
2017-09-13 07:19:35 +00:00
TreeHugger Robot
7420c095a9
Merge "Init the pref summary in onCreate()" into oc-mr1-dev
2017-09-13 01:38:20 +00:00
Xiangyu/Malcolm Chen
8b6fd21f1e
Merge "In ApnEditor, restore preference values after re-creating." into oc-mr1-dev
2017-09-13 01:07:29 +00:00
TreeHugger Robot
6203bde8d3
Merge "Index the System status page" into oc-mr1-dev
2017-09-13 00:06:27 +00:00
TreeHugger Robot
98fb28c8f2
Merge "Add OWNERS for folder bluetooth"
2017-09-12 23:48:55 +00:00
TreeHugger Robot
3ce7dfc354
Merge "Add OWNERS for folder fuelgauge"
2017-09-12 23:48:55 +00:00
TreeHugger Robot
88775759d8
Merge "Add OWNERS for folder users"
2017-09-12 23:48:55 +00:00
TreeHugger Robot
544961b1ee
Merge "Add OWNERS for folder notification"
2017-09-12 23:48:55 +00:00
TreeHugger Robot
e219a8782d
Merge "Add OWNERS for folder wifi"
2017-09-12 23:48:55 +00:00
TreeHugger Robot
347222d292
Merge "Add OWNERS for folder nfc"
2017-09-12 23:48:55 +00:00
TreeHugger Robot
a6d310b45a
Merge "Add OWNERS for folder tts"
2017-09-12 23:48:55 +00:00
TreeHugger Robot
545221ee72
Merge "Add OWNERS for folder location"
2017-09-12 23:48:55 +00:00
TreeHugger Robot
06fd05eb93
Merge "Add OWNERS for folder password"
2017-09-12 23:48:55 +00:00
TreeHugger Robot
a562bdef8b
Merge "Add OWNERS for folder inputmethod"
2017-09-12 23:48:55 +00:00
TreeHugger Robot
c652ff1a81
Merge "Add OWNERS for package enterprise"
2017-09-12 23:48:55 +00:00
TreeHugger Robot
5f7a3dee84
Merge "Add OWNERS for folder fingerprint"
2017-09-12 23:48:55 +00:00
TreeHugger Robot
e4aa914754
Merge "Add OWNERS for package backup"
2017-09-12 23:48:55 +00:00
TreeHugger Robot
b51dd8a119
Merge "Add OWNER for accessibility package."
2017-09-12 23:48:55 +00:00
