Automerger Merge Worker
ec2dfee42f
Merge "[Settings] Use WifiConfiguration#setSecurityParams" into rvc-dev am: ed3fc8626d am: 950169adbe
...
Change-Id: I7152ebee368a8ddef5d66e265f8a3540de1ce64f
2020-03-09 23:08:50 +00:00
Automerger Merge Worker
950169adbe
Merge "[Settings] Use WifiConfiguration#setSecurityParams" into rvc-dev am: ed3fc8626d
...
Change-Id: I5540ada2462da22ccfb1d4887e0253618c8e6100
2020-03-09 22:51:22 +00:00
Hai Shalom
ed3fc8626d
Merge "[Settings] Use WifiConfiguration#setSecurityParams" into rvc-dev
2020-03-09 22:32:49 +00:00
Hai Shalom
5bb13ebefe
[Settings] Use WifiConfiguration#setSecurityParams
...
Use WifiConfiguration#setSecurityParams instead of manually
initializing security params.
Bug: 150889755
Test: Created new connections and manually connected to open, WPA2,
WPA3, EAP and SUITE-B networks.
Change-Id: I42f4c21a37428ee87be14f6ba09dc54fa327054a
2020-03-09 22:25:56 +00:00
Automerger Merge Worker
0458c5a89e
Merge "[Settings] NullPointerException when disable eSIM/Fi" into rvc-dev am: 613dcd9dfe am: 72d0b2773b
...
Change-Id: I5826f7661412707ee8530b122dde498d99893b1f
2020-03-09 20:26:53 +00:00
Automerger Merge Worker
9b416d0092
Merge "[Settings] NullPointerException when disable eSIM/Fi" into rvc-dev am: 613dcd9dfe am: 976cf076de
...
Change-Id: I69c77b10cc02383d96ca7138a4903727cd099cb1
2020-03-09 20:14:45 +00:00
Automerger Merge Worker
72d0b2773b
Merge "[Settings] NullPointerException when disable eSIM/Fi" into rvc-dev am: 613dcd9dfe
...
Change-Id: Ia1696bcb7e420ae4d1da0b604ce0ac53352d3b12
2020-03-09 20:08:32 +00:00
Automerger Merge Worker
976cf076de
Merge "[Settings] NullPointerException when disable eSIM/Fi" into rvc-dev am: 613dcd9dfe
...
Change-Id: I5ec80028f5e0d6cb98f87f625391a86eb8816510
2020-03-09 20:01:39 +00:00
Bonian Chen
613dcd9dfe
Merge "[Settings] NullPointerException when disable eSIM/Fi" into rvc-dev
2020-03-09 17:13:50 +00:00
Automerger Merge Worker
c42a5d7502
Merge "Merge "Update rule to display output switcher Slice" into rvc-dev am: 9607eb334b am: 9d598078e6" into rvc-d1-dev-plus-aosp
2020-03-09 14:09:15 +00:00
Automerger Merge Worker
2cce9a709a
Merge "Update rule to display output switcher Slice" into rvc-dev am: 9607eb334b am: 0dfda78ac6
...
Change-Id: I40bdad221db39e5ecd3b0cc80e39d07d4716c2df
2020-03-09 14:09:07 +00:00
Automerger Merge Worker
c6b21fd5b9
Merge "Update rule to display output switcher Slice" into rvc-dev am: 9607eb334b am: 9d598078e6
...
Change-Id: Ie5220280da0f5a7f8310042f15b44e60d36fea08
2020-03-09 14:09:07 +00:00
Automerger Merge Worker
0dfda78ac6
Merge "Update rule to display output switcher Slice" into rvc-dev am: 9607eb334b
...
Change-Id: If69ac9654ef855b253970c036e9d0b7eb5a7c18e
2020-03-09 13:54:53 +00:00
Automerger Merge Worker
9d598078e6
Merge "Update rule to display output switcher Slice" into rvc-dev am: 9607eb334b
...
Change-Id: I354d7527ffef7967634bd90acb01640fb1308be8
2020-03-09 13:54:52 +00:00
Automerger Merge Worker
e76e43f29c
Merge "Fix WirelessDebuggingEnablerTest failures." into rvc-dev am: 5d6c309d65 am: 84f730c4c6
...
Change-Id: I740cdaa5f5852fcb370cf96764de3f1a1e19f318
2020-03-09 13:43:35 +00:00
Automerger Merge Worker
606474fb18
Merge "Fix WirelessDebuggingEnablerTest failures." into rvc-dev am: 5d6c309d65 am: b28ffa4fe2
...
Change-Id: I479946bb01490d66f95b5d9585b04523d35a3ebb
2020-03-09 13:43:06 +00:00
tim peng
9607eb334b
Merge "Update rule to display output switcher Slice" into rvc-dev
2020-03-09 13:42:53 +00:00
Automerger Merge Worker
b28ffa4fe2
Merge "Fix WirelessDebuggingEnablerTest failures." into rvc-dev am: 5d6c309d65
...
Change-Id: I73e48e5b1bf69469aca1d0d47ba0f32a8129888d
2020-03-09 13:26:45 +00:00
Automerger Merge Worker
84f730c4c6
Merge "Fix WirelessDebuggingEnablerTest failures." into rvc-dev am: 5d6c309d65
...
Change-Id: I5868df45a8ca4741e0d4d789d78991088f2627a1
2020-03-09 13:26:38 +00:00
TreeHugger Robot
5d6c309d65
Merge "Fix WirelessDebuggingEnablerTest failures." into rvc-dev
2020-03-09 13:09:31 +00:00
Automerger Merge Worker
855f7a3924
Merge "Show paired devices on Bluetooth device slice card" into rvc-dev am: e547a87055 am: eb590720a9
...
Change-Id: I977b549730b0aa38dfbf95f32037f818a9227a8e
2020-03-09 12:49:18 +00:00
Automerger Merge Worker
cd764217aa
Merge "Show paired devices on Bluetooth device slice card" into rvc-dev am: e547a87055 am: 5e1159a21b
...
Change-Id: If60573a1b98cd52c3289a3f9db4e42d74d64d162
2020-03-09 12:49:01 +00:00
Automerger Merge Worker
eb590720a9
Merge "Show paired devices on Bluetooth device slice card" into rvc-dev am: e547a87055
...
Change-Id: Id6e67b1f3d59890ca9c9f2ac93783fe0a199084d
2020-03-09 12:30:22 +00:00
Automerger Merge Worker
5e1159a21b
Merge "Show paired devices on Bluetooth device slice card" into rvc-dev am: e547a87055
...
Change-Id: I476fd4bc7d5d2087a3ae42af3fdceea5a653a728
2020-03-09 12:30:11 +00:00
TreeHugger Robot
e547a87055
Merge "Show paired devices on Bluetooth device slice card" into rvc-dev
2020-03-09 12:19:08 +00:00
Automerger Merge Worker
a6d6cc06ec
[automerger skipped] Merge "Fix PlatformCompatDashboardTest." am: 805f137935 am: 976f7bfe78 -s ours am: 5208d31a72 -s ours
...
am skip reason: Change-Id I833669f7f2a5128bdeda7451b8ff6e0bb753c500 with SHA-1 76f93fe912
2020-03-09 11:23:39 +00:00
Automerger Merge Worker
5208d31a72
[automerger skipped] Merge "Fix PlatformCompatDashboardTest." am: 805f137935 am: 976f7bfe78 -s ours
...
am skip reason: Change-Id I833669f7f2a5128bdeda7451b8ff6e0bb753c500 with SHA-1 76f93fe912
2020-03-09 11:17:32 +00:00
Automerger Merge Worker
976f7bfe78
Merge "Fix PlatformCompatDashboardTest." am: 805f137935
...
Change-Id: Idc37972c9db03c70ce537951e983009e22f15476
2020-03-09 11:05:26 +00:00
Anna Trostanetski
805f137935
Merge "Fix PlatformCompatDashboardTest."
2020-03-09 10:53:02 +00:00
Yi-Ling Chuang
40e8c1523b
Fix WirelessDebuggingEnablerTest failures.
...
Fixes: 151065069
Test: robotests
Change-Id: I0bd04e95a66113f379ca7328a4cd31df0ce40b54
2020-03-09 18:36:25 +08:00
Jason Chiu
130629b1db
Show paired devices on Bluetooth device slice card
...
- support tapping to activate for all available media devices including
Hearing aid and Headset
- support tapping to connect for previously connected devices
Bug: 149667096
Test: robotest
Change-Id: I25f74b1b20fbb1876200a561775aa675ff60ac37
2020-03-09 17:43:29 +08:00
Automerger Merge Worker
69c1b703df
Merge "ShortcutPreference Toggle design (2/n)" into rvc-dev am: 42dcad9b2b am: 0571803b3e
...
Change-Id: If7fed6bf73563001c47fb238aab1cddc60f3a342
2020-03-09 08:29:55 +00:00
Tim Peng
9c2968ab21
Update rule to display output switcher Slice
...
-Display when Cast device is available
-Add test case
Bug: 150907688
Test: make -j42 RunSettingsRoboTests
Change-Id: I1aa2fbe7b77a0274816af47bbc372eae9d7944c9
2020-03-09 16:29:53 +08:00
Automerger Merge Worker
6a6d437ffb
Merge "ShortcutPreference Toggle design (2/n)" into rvc-dev am: 42dcad9b2b am: 888ebb0dbb
...
Change-Id: If70d8e287b77b2b8dc68e2fa6a11beb78a75599f
2020-03-09 08:29:39 +00:00
Automerger Merge Worker
0571803b3e
Merge "ShortcutPreference Toggle design (2/n)" into rvc-dev am: 42dcad9b2b
...
Change-Id: I1aee655c4001e52f3af2ffe8b22c3edb615acee0
2020-03-09 08:20:59 +00:00
Automerger Merge Worker
888ebb0dbb
Merge "ShortcutPreference Toggle design (2/n)" into rvc-dev am: 42dcad9b2b
...
Change-Id: I2e0c16d8c8e0d593737f52afa97b65a9d474c1d1
2020-03-09 08:20:23 +00:00
Menghan Li
42dcad9b2b
Merge "ShortcutPreference Toggle design (2/n)" into rvc-dev
2020-03-09 08:01:56 +00:00
Automerger Merge Worker
22b6d23fae
Merge "[Wi-Fi] Remove redundant code" into rvc-dev am: 5a4257deb4 am: 9b0ed6dfbf
...
Change-Id: Ib64f939080800aac93a03ef510d0219d7367fbb3
2020-03-09 05:39:26 +00:00
Automerger Merge Worker
815f3498b8
Merge "[Wi-Fi] Remove redundant code" into rvc-dev am: 5a4257deb4 am: 0ebbf934af
...
Change-Id: I4c6bb18524bf97a065b4733ff50e5d3084ee6edd
2020-03-09 05:39:15 +00:00
Automerger Merge Worker
9b0ed6dfbf
Merge "[Wi-Fi] Remove redundant code" into rvc-dev am: 5a4257deb4
...
Change-Id: I5b68b2275b29089ebb9c6b509a02cc6f857a23e5
2020-03-09 05:29:48 +00:00
Automerger Merge Worker
0ebbf934af
Merge "[Wi-Fi] Remove redundant code" into rvc-dev am: 5a4257deb4
...
Change-Id: Ie8fdaae839e1eb0df5907f04738de2e49882906d
2020-03-09 05:29:36 +00:00
TreeHugger Robot
5a4257deb4
Merge "[Wi-Fi] Remove redundant code" into rvc-dev
2020-03-09 05:15:25 +00:00
Automerger Merge Worker
a080d8a016
Merge "Refresh summary when update state of preference" into rvc-dev am: bde2d44bb1 am: d4970a9df1
...
Change-Id: Ia59c42089646102ad763d6d952434d1efa25a89f
2020-03-09 04:28:48 +00:00
Automerger Merge Worker
221357cef9
Merge "Refresh summary when update state of preference" into rvc-dev am: bde2d44bb1 am: 8d7579e6b1
...
Change-Id: I2b94c6c407738096d1d3657c9012abbe5135d833
2020-03-09 04:28:32 +00:00
Automerger Merge Worker
d4970a9df1
Merge "Refresh summary when update state of preference" into rvc-dev am: bde2d44bb1
...
Change-Id: I035e835ec5565100464fe1b14108b49cedca7546
2020-03-09 04:13:27 +00:00
Automerger Merge Worker
8d7579e6b1
Merge "Refresh summary when update state of preference" into rvc-dev am: bde2d44bb1
...
Change-Id: Idbaf87b5e50930bd2a7aa2af3ec6b87e32b31e16
2020-03-09 04:13:26 +00:00
Automerger Merge Worker
fed106ea1e
Merge "Merge "Add setBackgroundColor() in VideoPreference" into rvc-dev am: 7d6011be10 am: be6aa4d56e" into rvc-d1-dev-plus-aosp
2020-03-09 04:04:38 +00:00
Automerger Merge Worker
c2395edf5e
Merge "Add setBackgroundColor() in VideoPreference" into rvc-dev am: 7d6011be10 am: 0e05847f2b
...
Change-Id: Ibbc6c35ba70781c42a5f339690bb82d322232b2f
2020-03-09 04:04:32 +00:00
Automerger Merge Worker
a87391d147
Merge "Add setBackgroundColor() in VideoPreference" into rvc-dev am: 7d6011be10 am: be6aa4d56e
...
Change-Id: I191139d52e10eff9fb0151f1c5c5dde8e6735beb
2020-03-09 04:04:31 +00:00
TreeHugger Robot
bde2d44bb1
Merge "Refresh summary when update state of preference" into rvc-dev
2020-03-09 04:01:11 +00:00
