SongFerng Wang
b68d161356
Merge "Remove the second network scan." into rvc-dev am: 28754bf6a8 am: 004083a21f
...
Change-Id: Idaa332aa45304d0975828774c18a980b08f39942
2020-05-05 03:52:50 +00:00
Bonian Chen
d737972b80
Merge "[Settings] Avoid from crash" into rvc-dev am: 7ff5f56ea6 am: e96b23a251
...
Change-Id: Ic39ceb05c07e14677df62561a4deef23b695b6d2
2020-05-05 03:52:40 +00:00
SongFerng Wang
a3b8126f58
Merge "Remove the second network scan." into rvc-dev am: 28754bf6a8 am: c2c4a49752
...
Change-Id: I14e38adb702a7ce281944d767601f68d8ee0f690
2020-05-05 03:51:26 +00:00
Bonian Chen
16d87ef9cc
Merge "[Settings] Avoid from crash" into rvc-dev am: 7ff5f56ea6 am: 004301ca4e
...
Change-Id: I64df699fde97b29bf9b2de3803de8c243dfa9512
2020-05-05 03:51:13 +00:00
Automerger Merge Worker
01f6620449
Merge "Merge "[Settings] Adopt TelephonyBasePreferenceController" into rvc-dev am: fb015a3c24 am: 551f515e6d" into rvc-d1-dev-plus-aosp
2020-05-05 03:50:57 +00:00
Bonian Chen
0e7240ae04
Merge "[Settings] Adopt TelephonyBasePreferenceController" into rvc-dev am: fb015a3c24 am: 24314ee382
...
Change-Id: Iccfe346e908efe77471648c7709c6f6fe196b284
2020-05-05 03:50:52 +00:00
Bonian Chen
1339c76d52
Merge "[Settings] Adopt TelephonyBasePreferenceController" into rvc-dev am: fb015a3c24 am: 551f515e6d
...
Change-Id: Ia6865db759bb2e28c5f248d38865fd5ed7b58369
2020-05-05 03:50:52 +00:00
SongFerng Wang
004083a21f
Merge "Remove the second network scan." into rvc-dev am: 28754bf6a8
...
Change-Id: Ic1bc6791cf56171349f81273fa9a7b7c210a194e
2020-05-05 03:33:35 +00:00
Bonian Chen
e96b23a251
Merge "[Settings] Avoid from crash" into rvc-dev am: 7ff5f56ea6
...
Change-Id: Iadad44a8f094c5e589409434dfc5ff54a9dc283b
2020-05-05 03:33:29 +00:00
SongFerng Wang
c2c4a49752
Merge "Remove the second network scan." into rvc-dev am: 28754bf6a8
...
Change-Id: I05b12d26ba3015a24e97080bb98f1be416ae60fb
2020-05-05 03:33:06 +00:00
Bonian Chen
24314ee382
Merge "[Settings] Adopt TelephonyBasePreferenceController" into rvc-dev am: fb015a3c24
...
Change-Id: I97309575254b6d316275f4365bc8fa102ae18447
2020-05-05 03:33:00 +00:00
Bonian Chen
004301ca4e
Merge "[Settings] Avoid from crash" into rvc-dev am: 7ff5f56ea6
...
Change-Id: I19f2b0afbc408df1ae548c50bbbadd35de399c1b
2020-05-05 03:32:59 +00:00
Bonian Chen
551f515e6d
Merge "[Settings] Adopt TelephonyBasePreferenceController" into rvc-dev am: fb015a3c24
...
Change-Id: I2875046cb301f1862e458e9e0ed806629b5aabc2
2020-05-05 03:32:51 +00:00
SongFerng Wang
28754bf6a8
Merge "Remove the second network scan." into rvc-dev
2020-05-05 03:20:53 +00:00
Bonian Chen
7ff5f56ea6
Merge "[Settings] Avoid from crash" into rvc-dev
2020-05-05 03:17:50 +00:00
Bonian Chen
fb015a3c24
Merge "[Settings] Adopt TelephonyBasePreferenceController" into rvc-dev
2020-05-05 03:17:18 +00:00
Arc Wang
39834ef280
Merge "[Wi-Fi] Modify NetworkRequestDialog title & summary" into rvc-dev am: 032f77052b am: 2a1515ac9b
...
Change-Id: I951cb9df4550ad11f93e97ed1e03a38e687a5fce
2020-05-05 01:37:51 +00:00
Arc Wang
7acc3f411d
Merge "[Wi-Fi] Modify NetworkRequestDialog title & summary" into rvc-dev am: 032f77052b am: 955ff8831c
...
Change-Id: I27e9dcac6ea6c8d5927769db26c87f060cc7ebfb
2020-05-05 01:33:07 +00:00
Arc Wang
2a1515ac9b
Merge "[Wi-Fi] Modify NetworkRequestDialog title & summary" into rvc-dev am: 032f77052b
...
Change-Id: I4444ead097f2c63c6c21be92ca442e0479d0af93
2020-05-05 01:21:40 +00:00
Arc Wang
955ff8831c
Merge "[Wi-Fi] Modify NetworkRequestDialog title & summary" into rvc-dev am: 032f77052b
...
Change-Id: I1e21a4fd28115e9fe3780e34cb878ad9936b0f6b
2020-05-05 01:21:34 +00:00
Arc Wang
032f77052b
Merge "[Wi-Fi] Modify NetworkRequestDialog title & summary" into rvc-dev
2020-05-05 01:02:05 +00:00
Julia Reynolds
1652d1c455
Update some notification strings am: 9bb55e1084 am: 9da53fe3b2
...
Change-Id: Ida358438bb57d1f4da394a2af4e24367e4d484c0
2020-05-04 19:45:52 +00:00
Julia Reynolds
cfe2924395
Update some notification strings am: 9bb55e1084 am: 5e1fc5ecf5
...
Change-Id: Id041d481dad03b20e70158ec752fa17214b44d4e
2020-05-04 19:45:38 +00:00
Julia Reynolds
9da53fe3b2
Update some notification strings am: 9bb55e1084
...
Change-Id: I967cf8a9a6b7eac95bab8e1ee90160c282ac2bcc
2020-05-04 19:27:01 +00:00
Julia Reynolds
5e1fc5ecf5
Update some notification strings am: 9bb55e1084
...
Change-Id: I7448f2bc4f2a0185a1d033e36b8f8c47a511d261
2020-05-04 19:26:59 +00:00
SongFerngWang
b7f98f7667
Remove the second network scan.
...
Fix: 153427564
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkSelectSettingsTest
(PASS)
Change-Id: If593fc4a4dd463bbc178b4864ad0ba01bb421b09
2020-05-04 22:31:15 +08:00
Julia Reynolds
9bb55e1084
Update some notification strings
...
Test: manual
Fixes: 155516603
Fixes: 155516894
Change-Id: I86058ebdb473890239236d30414cb05787832311
2020-05-04 10:25:57 -04:00
TreeHugger Robot
283b1f248f
Merge "Fix broken test cases" into rvc-dev am: 15254e3b5e am: f96e7d7219
...
Change-Id: I5689c7b3750db96236c1f9a6e1f17da82d2eb23c
2020-05-04 11:40:46 +00:00
TreeHugger Robot
1bef15bae0
Merge "Fix broken test cases" into rvc-dev am: 15254e3b5e am: 13f57006fd
...
Change-Id: I1ee997afce44502221b9a58ba09f2e5d0147d55f
2020-05-04 11:40:29 +00:00
TreeHugger Robot
f96e7d7219
Merge "Fix broken test cases" into rvc-dev am: 15254e3b5e
...
Change-Id: Ib0a7163b7338b39428857c292f7c3ff2cad94c44
2020-05-04 11:25:51 +00:00
TreeHugger Robot
13f57006fd
Merge "Fix broken test cases" into rvc-dev am: 15254e3b5e
...
Change-Id: I721b166d60d025986a67653bfadbb1acde849eae
2020-05-04 11:25:43 +00:00
Automerger Merge Worker
126bd277a0
Merge "Merge "[Settings] Code refactor" into rvc-dev am: 1ab100e936 am: 32e7ea78b2" into rvc-d1-dev-plus-aosp
2020-05-04 11:15:42 +00:00
Bonian Chen
4778daca83
Merge "[Settings] Code refactor" into rvc-dev am: 1ab100e936 am: 32e7ea78b2
...
Change-Id: I8afc77d204cb79228e3b33a803fb13a44c41b65b
2020-05-04 11:15:36 +00:00
Bonian Chen
59145acf3e
Merge "[Settings] Code refactor" into rvc-dev am: 1ab100e936 am: 91f2c3d931
...
Change-Id: I33efb3a4506e19b073d9898b640ff64c6a2d85a0
2020-05-04 11:15:35 +00:00
Bonian Chen
1467017836
Merge "[Settings] Enable access from non-UI thread" into rvc-dev am: 068eb89251 am: 7bb7200eab
...
Change-Id: Ia8b89c2764d9a3a06321ed4a5a086a860afd2ecf
2020-05-04 11:15:18 +00:00
Bonian Chen
23c89aced8
Merge "[Settings] Enable access from non-UI thread" into rvc-dev am: 068eb89251 am: 3ce8cab000
...
Change-Id: I24c9ea5acc61cb0abe5d897497e491bd5490789b
2020-05-04 11:15:03 +00:00
TreeHugger Robot
15254e3b5e
Merge "Fix broken test cases" into rvc-dev
2020-05-04 11:12:50 +00:00
Bonian Chen
32e7ea78b2
Merge "[Settings] Code refactor" into rvc-dev am: 1ab100e936
...
Change-Id: I091835b2c37c5dea6ad6d5bec1ef9aa586c602b2
2020-05-04 10:57:41 +00:00
Bonian Chen
91f2c3d931
Merge "[Settings] Code refactor" into rvc-dev am: 1ab100e936
...
Change-Id: Ib84d0d5f03553c4bec81cf9c9325410da60b7460
2020-05-04 10:57:34 +00:00
Bonian Chen
7bb7200eab
Merge "[Settings] Enable access from non-UI thread" into rvc-dev am: 068eb89251
...
Change-Id: I2174f9bfe34c5360ee3146b095c0e070efe52768
2020-05-04 10:57:34 +00:00
Bonian Chen
3ce8cab000
Merge "[Settings] Enable access from non-UI thread" into rvc-dev am: 068eb89251
...
Change-Id: Ia130cfc79ddeb92c25256aea7b84420ff29b9132
2020-05-04 10:57:26 +00:00
Bonian Chen
1ab100e936
Merge "[Settings] Code refactor" into rvc-dev
2020-05-04 10:41:47 +00:00
Bonian Chen
068eb89251
Merge "[Settings] Enable access from non-UI thread" into rvc-dev
2020-05-04 10:41:16 +00:00
Tsung-Mao Fang
17b882a94d
Fix broken test cases
...
Since we added a new API in ag/11355641,
we need to shadow this new new API.
Fix: 130916962
Test: run robo test
Change-Id: I2176253aae915d1a31043ebbf197d4dd1b1f2072
2020-05-04 17:22:01 +08:00
Bonian Chen
8c6cf27814
Merge "[Settings] Code refactor for availability session" into rvc-dev am: 07431066c4 am: 9d6ba23df3
...
Change-Id: I6746831af96e9462fbbeb0843ca8c5b6b52aea21
2020-05-04 09:16:31 +00:00
Automerger Merge Worker
f147b66486
Merge "Merge "[Settings] Code refactor for availability session" into rvc-dev am: 07431066c4 am: d6fd13ecc0" into rvc-d1-dev-plus-aosp
2020-05-04 09:15:02 +00:00
Bonian Chen
242dae37ce
Merge "[Settings] Code refactor for availability session" into rvc-dev am: 07431066c4 am: d6fd13ecc0
...
Change-Id: I12a42c2af7414bd290b927095eda5769f81ca082
2020-05-04 09:14:58 +00:00
Automerger Merge Worker
da4b69513d
Merge "Merge "Modify rule of remote media session UI" into rvc-dev am: 1424b594c9 am: 6a6650a58b" into rvc-d1-dev-plus-aosp
2020-05-04 09:14:57 +00:00
Automerger Merge Worker
99b7c321f9
Merge "Merge "Modify rule of remote media session UI" into rvc-dev am: 1424b594c9 am: 8e81088c03" into rvc-d1-dev-plus-aosp
2020-05-04 09:14:47 +00:00
tim peng
b558e57ada
Merge "Modify rule of remote media session UI" into rvc-dev am: 1424b594c9 am: 6a6650a58b
...
Change-Id: I3b094ebb0d24cd95020854104b8f06b7e5ef7a34
2020-05-04 09:14:44 +00:00
