Commit Graph

60952 Commits

Author SHA1 Message Date
TreeHugger Robot
11dbe14584 Merge "Fix TetherSettingsTest" into rvc-dev 2020-03-11 13:12:56 +00:00
Automerger Merge Worker
ec71e52496 Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" am: 23c382aa45
Change-Id: I3f9d4e48bce108de162bb11daa91338951a71b46
2020-03-11 13:09:00 +00:00
Automerger Merge Worker
fd3293d1db Merge "Tweak strings for assist app" into rvc-dev am: 16a7ba81f4
Change-Id: I2193e15b508b9c2c5186afb2afa186d8d3f690fd
2020-03-11 12:57:15 +00:00
Automerger Merge Worker
aeb13d1dd9 Merge "Tweak strings for assist app" into rvc-dev am: 16a7ba81f4
Change-Id: I2fbe22e43e922b97f23ebd08f7927730e035c1fa
2020-03-11 12:57:05 +00:00
Zoey Chen
23c382aa45 Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" 2020-03-11 12:54:05 +00:00
TreeHugger Robot
f2639347e3 Merge "Fix and Ignore broken test cases" 2020-03-11 12:39:44 +00:00
TreeHugger Robot
16a7ba81f4 Merge "Tweak strings for assist app" into rvc-dev 2020-03-11 12:38:44 +00:00
Automerger Merge Worker
cbfaa0df10 Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5 am: f3aa88ccf2 am: e7e184fdc8 am: 285ef8c7de am: dbbaabc17b
Change-Id: Ibc2917de83662e4e2672f7e087c62620a480268a
2020-03-11 12:16:25 +00:00
Automerger Merge Worker
532abad03d Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f am: 2df7ee7f0e am: 59da6a7c05 am: cd54f01f7d am: a1a249d973
Change-Id: Iac9d2bd80844925eac782a25f21e70137e34ffc0
2020-03-11 12:16:18 +00:00
Automerger Merge Worker
9e3e70c772 Merge "Update the OWNER files" into rvc-dev am: a38859b2b7 am: ebe7dcaff8 am: fde1a52ad1 am: ed5f5b195e am: 445b52265d
Change-Id: Ib6830d9fd2626a6c1d1c5d2eb1623f84ec71061c
2020-03-11 12:16:12 +00:00
Automerger Merge Worker
eed48b359e Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5 am: 01a0945e36 am: 132f9f38d8 am: 4489bb6334
Change-Id: I12fd0f815a6b0343b240c23bd0c0ca9bbc5274cc
2020-03-11 12:16:06 +00:00
Automerger Merge Worker
cf89c72400 Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f am: a3b983560b am: 90b0b7d10f am: 76051d2c6d
Change-Id: I454d1ad715d6a9f24b12e8ae3cdd02bf408eca45
2020-03-11 12:15:59 +00:00
Automerger Merge Worker
c48e9b5e8e Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5 am: f3aa88ccf2 am: 25325e9e20 am: e8d01bfdac
Change-Id: I59f9155d553d19c6186123c4d2fa3a8e73b2c2fe
2020-03-11 12:15:52 +00:00
Automerger Merge Worker
db7f6605bd Merge "Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f am: 2df7ee7f0e" into rvc-d1-dev-plus-aosp am: 998ab43fc2 am: 2328c28f80
Change-Id: Ia49c382eaee55bb1ae709d1c0fa5061ba8fafaa6
2020-03-11 12:15:46 +00:00
Automerger Merge Worker
9e6543fe00 Merge "Merge "Update the OWNER files" into rvc-dev am: a38859b2b7 am: 818e26464d" into rvc-d1-dev-plus-aosp am: c14719b4cb am: d40d267867
Change-Id: I50be55cd044586aae024442419ebc5b1e3b3bf62
2020-03-11 12:15:25 +00:00
Automerger Merge Worker
dbbaabc17b Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5 am: f3aa88ccf2 am: e7e184fdc8 am: 285ef8c7de
Change-Id: I3b20f0dd0c73c933a73a38f2a0f87695f7942a6d
2020-03-11 12:15:23 +00:00
Automerger Merge Worker
a1a249d973 Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f am: 2df7ee7f0e am: 59da6a7c05 am: cd54f01f7d
Change-Id: I2f57cdce8e079aab3a93685f01f647f6f357eb3d
2020-03-11 12:15:17 +00:00
Automerger Merge Worker
445b52265d Merge "Update the OWNER files" into rvc-dev am: a38859b2b7 am: ebe7dcaff8 am: fde1a52ad1 am: ed5f5b195e
Change-Id: Ia24e30937f00907b226d54eddd264f77190253ad
2020-03-11 12:15:04 +00:00
Automerger Merge Worker
18627953fe Merge "Update the OWNER files" into rvc-dev am: a38859b2b7 am: ebe7dcaff8 am: dc192bf8ed am: 4ca5489d70
Change-Id: Ic6213fe45e9169dd9c71cb7f0eff243b12f4b76d
2020-03-11 12:15:02 +00:00
Automerger Merge Worker
4489bb6334 Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5 am: 01a0945e36 am: 132f9f38d8
Change-Id: I9abf6e005e89764414cf9ff2c1bf91c86e8a5c28
2020-03-11 12:01:57 +00:00
Automerger Merge Worker
76051d2c6d Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f am: a3b983560b am: 90b0b7d10f
Change-Id: Iad1760b7c2981bc4612b985a4a2fc032243f7183
2020-03-11 12:01:52 +00:00
Automerger Merge Worker
e8d01bfdac Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5 am: f3aa88ccf2 am: 25325e9e20
Change-Id: Ifadfe25da56db629873b2b49e38d0723f6919632
2020-03-11 12:01:46 +00:00
Automerger Merge Worker
2328c28f80 Merge "Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f am: 2df7ee7f0e" into rvc-d1-dev-plus-aosp am: 998ab43fc2
Change-Id: I8cab6044283d05cf84443cc2c780c3184c89cefb
2020-03-11 12:01:41 +00:00
Automerger Merge Worker
d40d267867 Merge "Merge "Update the OWNER files" into rvc-dev am: a38859b2b7 am: 818e26464d" into rvc-d1-dev-plus-aosp am: c14719b4cb
Change-Id: I76ff226ebdbbf49c484c96048ed8d5971538a06f
2020-03-11 12:01:26 +00:00
Automerger Merge Worker
285ef8c7de Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5 am: f3aa88ccf2 am: e7e184fdc8
Change-Id: I6c827c786db5241c4585a842c16a05fa0970e45d
2020-03-11 12:01:16 +00:00
Automerger Merge Worker
cd54f01f7d Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f am: 2df7ee7f0e am: 59da6a7c05
Change-Id: I7a8a0627b8b3fe8cb57c2010202a2877cd8b081a
2020-03-11 12:01:11 +00:00
Automerger Merge Worker
ed5f5b195e Merge "Update the OWNER files" into rvc-dev am: a38859b2b7 am: ebe7dcaff8 am: fde1a52ad1
Change-Id: I7e1969815d5b0b6d8b107ca5200e8626fa01435b
2020-03-11 12:00:56 +00:00
Automerger Merge Worker
4ca5489d70 Merge "Update the OWNER files" into rvc-dev am: a38859b2b7 am: ebe7dcaff8 am: dc192bf8ed
Change-Id: I07b636295295bc7696bc2517cf3810b4308371e7
2020-03-11 12:00:56 +00:00
Automerger Merge Worker
132f9f38d8 Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5 am: 01a0945e36
Change-Id: Ib58a689a6d7dfbee62663729ddefa29eb9423f9e
2020-03-11 11:51:31 +00:00
Automerger Merge Worker
90b0b7d10f Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f am: a3b983560b
Change-Id: I65cf2ba52e0e2a1ac3aac10b3abb0c34976d8867
2020-03-11 11:51:26 +00:00
Automerger Merge Worker
e7e184fdc8 Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5 am: f3aa88ccf2
Change-Id: I24caecfcee12f22059d78fe681706aa7ad815b37
2020-03-11 11:51:06 +00:00
Automerger Merge Worker
59da6a7c05 Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f am: 2df7ee7f0e
Change-Id: I5f6ac60bbef325bf710978b211b3c6a4ac878c91
2020-03-11 11:51:01 +00:00
Automerger Merge Worker
25325e9e20 Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5 am: f3aa88ccf2
Change-Id: I1e6b3b26aa19fffc081123ff6eb000a3475866c7
2020-03-11 11:50:59 +00:00
Automerger Merge Worker
998ab43fc2 Merge "Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f am: 2df7ee7f0e" into rvc-d1-dev-plus-aosp 2020-03-11 11:50:58 +00:00
Automerger Merge Worker
c14719b4cb Merge "Merge "Update the OWNER files" into rvc-dev am: a38859b2b7 am: 818e26464d" into rvc-d1-dev-plus-aosp 2020-03-11 11:50:57 +00:00
Automerger Merge Worker
fde1a52ad1 Merge "Update the OWNER files" into rvc-dev am: a38859b2b7 am: ebe7dcaff8
Change-Id: I463ce8e41de0f920103b03f7a80d90ef721f82d2
2020-03-11 11:50:57 +00:00
Automerger Merge Worker
95e42d21b1 Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f am: 2df7ee7f0e
Change-Id: I26ee114ba8ee4491e555bb0edbadac78e0b07466
2020-03-11 11:50:55 +00:00
Automerger Merge Worker
dc192bf8ed Merge "Update the OWNER files" into rvc-dev am: a38859b2b7 am: ebe7dcaff8
Change-Id: Ib261729db09b768a4f32502ee5dd405b36eee893
2020-03-11 11:50:51 +00:00
Automerger Merge Worker
84e4f2d2f2 Merge "Update the OWNER files" into rvc-dev am: a38859b2b7 am: 818e26464d
Change-Id: Id28ebe3d9a403632607687afdfa75239c00cc609
2020-03-11 11:50:50 +00:00
Automerger Merge Worker
01a0945e36 Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5
Change-Id: I93e4bb5a6504c40bd708da9a461f0b8414838971
2020-03-11 11:41:00 +00:00
Automerger Merge Worker
f3aa88ccf2 Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5
Change-Id: I5cf0e713e0016b1463ba7e7e39628adc3cc407c2
2020-03-11 11:40:51 +00:00
TreeHugger Robot
21338186d5 Merge "Fix NPE when coming back to settings homepage." into rvc-dev 2020-03-11 11:40:02 +00:00
Automerger Merge Worker
a3b983560b Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f
Change-Id: I3fd8ec7621579ec4530cb0e37b9f8cfae72b737e
2020-03-11 11:34:48 +00:00
Automerger Merge Worker
2df7ee7f0e Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f
Change-Id: I7191ca8a3c7c1afcd4472649c11eb19eb0df919d
2020-03-11 11:34:37 +00:00
Yi-Ling Chuang
b8eb466dd1 Fix WifiTetherSettingsTest
Bug: 151201888
Test: run WifiTetherSettingsTest successfully
Change-Id: I80df83f3dc720c80734ec083c33bab5c56c52796
2020-03-11 19:33:09 +08:00
TreeHugger Robot
f9570ad33f Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev 2020-03-11 11:32:12 +00:00
Automerger Merge Worker
818e26464d Merge "Update the OWNER files" into rvc-dev am: a38859b2b7
Change-Id: Ia773a05c5375a17f8745dd2edf41f7ecf6f20151
2020-03-11 11:29:17 +00:00
Automerger Merge Worker
ebe7dcaff8 Merge "Update the OWNER files" into rvc-dev am: a38859b2b7
Change-Id: I8507db93e0193beb937e6684c18d4fbbdef08c99
2020-03-11 11:29:06 +00:00
zoey chen
3bfbb818c7 Fix Card 2's pin shows ON when only turn on card 1's pin
Bug: 150258187
Test: manual
Change-Id: Ifc54090da6737d31a2eb71eeabe6846592ff32fc
2020-03-11 11:10:39 +00:00
TreeHugger Robot
a38859b2b7 Merge "Update the OWNER files" into rvc-dev 2020-03-11 11:08:21 +00:00