Jack Yu
c973fcc45d
[automerger skipped] Merge "Added slot index in area info broadcast" am: 07f1ec2cca
am: d1cd033f6f
-s ours am: e3d56edd8b
-s ours am: 73a4b1dbbd
-s ours am: f5b6614485
-s ours
...
am skip reason: Change-Id Icd1bcc2fa905bae6b0f2220e9a27178711bac0c7 with SHA-1 5a4dabcba2
is in history
Change-Id: I010e6a5a205a497779ed47fae23b7befc66c066e
2020-03-25 05:48:08 +00:00
Jack Yu
f5b6614485
[automerger skipped] Merge "Added slot index in area info broadcast" am: 07f1ec2cca
am: d1cd033f6f
-s ours am: e3d56edd8b
-s ours am: 73a4b1dbbd
-s ours
...
am skip reason: Change-Id Icd1bcc2fa905bae6b0f2220e9a27178711bac0c7 with SHA-1 5a4dabcba2
is in history
Change-Id: I7019b8d391688f96fceebba052ca34367cb981d4
2020-03-25 05:36:32 +00:00
Bonian Chen
eab41ff9de
Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05
am: 0f4345cdf6
am: 243d1a61b7
am: c8cb51a422
am: 97a1bf9c61
...
Change-Id: I3a142c081f0f1d89b668dfa9a18b0531c6f0da4a
2020-03-25 05:15:52 +00:00
SongFerng Wang
1cfbf165d9
Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c
am: e8604065d6
am: f30fa1c861
am: f90f7cf31b
am: 2f901a72f7
...
Change-Id: I1f0780be42aba8f0be4a630f1795ce2e8e95f6a6
2020-03-25 05:15:44 +00:00
Bonian Chen
0c982a6e58
Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05
am: fdca269a5e
am: 082ce97eba
am: f8693e511a
...
Change-Id: I9e2a8039bf27e08fc47d35060b49159645271743
2020-03-25 05:15:37 +00:00
SongFerng Wang
d43d0759ac
Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c
am: a2fea961c2
am: f58b07ae72
am: 13f59bc23c
...
Change-Id: I3c1d7a16a7f0a35e3944d934941f81b56deff717
2020-03-25 05:15:30 +00:00
Jack Yu
73a4b1dbbd
[automerger skipped] Merge "Added slot index in area info broadcast" am: 07f1ec2cca
am: d1cd033f6f
-s ours am: e3d56edd8b
-s ours
...
am skip reason: Change-Id Icd1bcc2fa905bae6b0f2220e9a27178711bac0c7 with SHA-1 5a4dabcba2
is in history
Change-Id: I805e66304252ed003d3a7721e9b44692adcf5b6d
2020-03-25 05:15:27 +00:00
Bonian Chen
e1c699c7af
Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05
am: 0f4345cdf6
am: ff7dc60895
am: 8f9c9e6402
...
Change-Id: I29886624ce72c8cb3ca6c297ccb7ff1d63e435c2
2020-03-25 05:15:23 +00:00
SongFerng Wang
00f2672399
Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c
am: e8604065d6
am: 3d28629f5e
am: 869883bcd8
...
Change-Id: I774908569013ae9c0f5d4a620dbe09258b9fa05e
2020-03-25 05:15:17 +00:00
Bonian Chen
97a1bf9c61
Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05
am: 0f4345cdf6
am: 243d1a61b7
am: c8cb51a422
...
Change-Id: I8263653c202eb546b9a3650f17de296b46d47c40
2020-03-25 05:14:56 +00:00
SongFerng Wang
2f901a72f7
Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c
am: e8604065d6
am: f30fa1c861
am: f90f7cf31b
...
Change-Id: If740b309c96cfacb4a91da2b2d5771db566de791
2020-03-25 05:14:49 +00:00
Jack Yu
e3d56edd8b
[automerger skipped] Merge "Added slot index in area info broadcast" am: 07f1ec2cca
am: d1cd033f6f
-s ours
...
am skip reason: Change-Id Icd1bcc2fa905bae6b0f2220e9a27178711bac0c7 with SHA-1 5a4dabcba2
is in history
Change-Id: I233cd5c76e77cd31fdcfd10b4a864b472813afdf
2020-03-25 05:00:44 +00:00
Bonian Chen
f8693e511a
Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05
am: fdca269a5e
am: 082ce97eba
...
Change-Id: I311499c5d91a6bd89c2ca4cf737708973f0f8d3d
2020-03-25 05:00:31 +00:00
SongFerng Wang
13f59bc23c
Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c
am: a2fea961c2
am: f58b07ae72
...
Change-Id: I2600b0cc513cc2efb10e7f4f7489ea8bab4a866c
2020-03-25 05:00:22 +00:00
Bonian Chen
8f9c9e6402
Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05
am: 0f4345cdf6
am: ff7dc60895
...
Change-Id: Iff72ccacfbead5cdc1bcc297cc15dd529526eff7
2020-03-25 05:00:13 +00:00
Bonian Chen
c8cb51a422
Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05
am: 0f4345cdf6
am: 243d1a61b7
...
Change-Id: I54bd6dbc2c85aaf6f7edac03cde57e9d160f1659
2020-03-25 04:59:46 +00:00
SongFerng Wang
869883bcd8
Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c
am: e8604065d6
am: 3d28629f5e
...
Change-Id: I3dc6fa3c7a6c8fbf0f9a6f87895aa5777a7bb64c
2020-03-25 04:59:41 +00:00
SongFerng Wang
f90f7cf31b
Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c
am: e8604065d6
am: f30fa1c861
...
Change-Id: Id223e18fbe00e4eb1f35c379929620dd30b9abbb
2020-03-25 04:59:37 +00:00
Bonian Chen
082ce97eba
Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05
am: fdca269a5e
...
Change-Id: I5666b526b7113dce4ab004ea34f92df1cc57071d
2020-03-25 04:51:45 +00:00
Bonian Chen
243d1a61b7
Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05
am: 0f4345cdf6
...
Change-Id: Ic5c58238e13d1b235125c34badaccdf7196930f8
2020-03-25 04:51:36 +00:00
SongFerng Wang
f58b07ae72
Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c
am: a2fea961c2
...
Change-Id: I56a1f5911a3e1b31f030a8392e5e41289bbb7744
2020-03-25 04:51:27 +00:00
SongFerng Wang
f30fa1c861
Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c
am: e8604065d6
...
Change-Id: Ia7332d609bd40646005985fd296876d4f44a3c1e
2020-03-25 04:51:26 +00:00
Bonian Chen
ff7dc60895
Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05
am: 0f4345cdf6
...
Change-Id: Ibce5efebb8c0fd20471811f7cd5ce324a5b347c1
2020-03-25 04:51:01 +00:00
SongFerng Wang
3d28629f5e
Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c
am: e8604065d6
...
Change-Id: I2bb4ec5e524099f1d3fccf53e55dcca27d1e0ad6
2020-03-25 04:50:42 +00:00
Jack Yu
d1cd033f6f
Merge "Added slot index in area info broadcast" am: 07f1ec2cca
...
Change-Id: Iaab7b201cd25d3854031d65ce828829108b427c4
2020-03-25 04:42:15 +00:00
Bonian Chen
fdca269a5e
Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05
...
Change-Id: I11095d23554c38e431bef78aee0665853367a8dd
2020-03-25 04:42:03 +00:00
Bonian Chen
0f4345cdf6
Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05
...
Change-Id: I82b04e8dadd3559c7d12d6bba1df7cd2e968c89b
2020-03-25 04:41:24 +00:00
Bonian Chen
f9bb3b4d05
Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev
2020-03-25 04:35:04 +00:00
SongFerng Wang
a2fea961c2
Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c
...
Change-Id: Ic3357eec640d4023714877a555dcc82dec3fe67c
2020-03-25 04:34:36 +00:00
SongFerng Wang
e8604065d6
Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c
...
Change-Id: Icc2051fe3015fbd5913689be03f3a2f4a1baef58
2020-03-25 04:33:50 +00:00
Jack Yu
07f1ec2cca
Merge "Added slot index in area info broadcast"
2020-03-25 04:30:21 +00:00
SongFerng Wang
d33b66304c
Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev
2020-03-25 04:16:18 +00:00
Jason Chiu
94735f2316
Merge "Move sticky cards to the bottom" into rvc-dev am: bff181f846
am: dd5ee8b808
am: 8c0e3d930f
am: 336dc70ee8
am: 8ba7dd091f
...
Change-Id: I1f598be58587995ce28501d86076a3b7f78221d1
2020-03-25 03:30:17 +00:00
Jason Chiu
3407ab5f5a
Merge "Move sticky cards to the bottom" into rvc-dev am: bff181f846
am: dd5ee8b808
am: e667999738
am: 618d63f83c
...
Change-Id: Iea56f7fff9cd4e761d5c509dec663e832493f295
2020-03-25 03:28:46 +00:00
Jason Chiu
8ba7dd091f
Merge "Move sticky cards to the bottom" into rvc-dev am: bff181f846
am: dd5ee8b808
am: 8c0e3d930f
am: 336dc70ee8
...
Change-Id: I0d215cbac5575177f65d5a9c7bcc2f765a7a369b
2020-03-25 03:28:17 +00:00
Jason Chiu
84f86702eb
Merge "Move sticky cards to the bottom" into rvc-dev am: bff181f846
am: 8c4d31c8c4
am: 6839ead7c6
am: 11a6cbd998
...
Change-Id: I12c636fb6cb9bf698465ca5aa167918478029ec1
2020-03-25 03:27:20 +00:00
Jason Chiu
618d63f83c
Merge "Move sticky cards to the bottom" into rvc-dev am: bff181f846
am: dd5ee8b808
am: e667999738
...
Change-Id: I6da03518f0e6d7986ec3a0029f60599eccf63ba3
2020-03-25 03:13:10 +00:00
Jason Chiu
336dc70ee8
Merge "Move sticky cards to the bottom" into rvc-dev am: bff181f846
am: dd5ee8b808
am: 8c0e3d930f
...
Change-Id: I6c085977a466a24260a93b99230ff355f2f7c285
2020-03-25 03:12:12 +00:00
Jason Chiu
11a6cbd998
Merge "Move sticky cards to the bottom" into rvc-dev am: bff181f846
am: 8c4d31c8c4
am: 6839ead7c6
...
Change-Id: I86d5423e0a1e00494eb8a81a544b0a8d54098587
2020-03-25 03:11:44 +00:00
Jason Chiu
e667999738
Merge "Move sticky cards to the bottom" into rvc-dev am: bff181f846
am: dd5ee8b808
...
Change-Id: I88cacc0496ced3c175aa5be206a8e06e92a2f166
2020-03-25 02:59:45 +00:00
Jason Chiu
6839ead7c6
Merge "Move sticky cards to the bottom" into rvc-dev am: bff181f846
am: 8c4d31c8c4
...
Change-Id: If17eb07bc5080c69e395afe2ba60f5ad3e3dbeab
2020-03-25 02:59:12 +00:00
Jason Chiu
8c0e3d930f
Merge "Move sticky cards to the bottom" into rvc-dev am: bff181f846
am: dd5ee8b808
...
Change-Id: I817413b15da63ab99bef8fc5655a3060f28ed09d
2020-03-25 02:59:11 +00:00
Jason Chiu
8c4d31c8c4
Merge "Move sticky cards to the bottom" into rvc-dev am: bff181f846
...
Change-Id: I08aa3c6b3650480b6c631365a0eae049cc2a073f
2020-03-25 02:43:06 +00:00
Jason Chiu
dd5ee8b808
Merge "Move sticky cards to the bottom" into rvc-dev am: bff181f846
...
Change-Id: I5d527a528f71fe5077251832d1f44e29be8604af
2020-03-25 02:42:40 +00:00
Jason Chiu
bff181f846
Merge "Move sticky cards to the bottom" into rvc-dev
2020-03-25 02:28:07 +00:00
Jason Chiu
4e6841e7b5
Move sticky cards to the bottom
...
Sticky cards have higher scores and were on the top of homepage.
Bug: 149274976
Test: visual
Change-Id: I5fc2303ac42fff5bc4d44e355112ea4529253acd
2020-03-25 02:27:43 +00:00
Bonian Chen
806c9d5214
[Settings] Code refactor on MobileNetworkActivity
...
Apply the behavior of ProxySubscriptionManager into
MobileNetworkActivity.
Bug: 149190278
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkActivityTest
Change-Id: I2d4b12dead7a9ea68cc8e335cd37f22226fe295f
2020-03-25 10:19:40 +08:00
TreeHugger Robot
af7932120b
Merge "Fix Passpoint network details privacy and ssid" into rvc-dev am: 56fb482acf
am: cc07420ed7
am: 8606696674
am: 16e1ff4802
am: c062fa0111
...
Change-Id: If3d18d37610902682b8b69564de5230065a3171b
2020-03-25 02:05:09 +00:00
Automerger Merge Worker
b527cd64f6
Merge "Merge "Fix Passpoint network details privacy and ssid" into rvc-dev am: 56fb482acf
am: cc07420ed7" into rvc-d1-dev-plus-aosp am: 0c443e813e
am: 50675e4f24
...
Change-Id: Iac3847dde304bd44b6fc2758e91dcbaedbeea36e
2020-03-25 02:04:51 +00:00
TreeHugger Robot
b33d60d868
Merge "Fix Passpoint network details privacy and ssid" into rvc-dev am: 56fb482acf
am: 395d0fb2b4
am: 2e65c42842
am: ca0f8a39f3
...
Change-Id: Ibfdd761415f506f511c4f33202f94a20e0f64406
2020-03-25 02:04:09 +00:00