Automerger Merge Worker
bb1deeca73
Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98
am: cb9cfc19c3
am: 570ec6a4a1
am: 99974b69db
...
Change-Id: I4a70e6fb297ea12873dc7b71f4bb1de3bafb703d
2020-03-11 05:08:29 +00:00
Automerger Merge Worker
99974b69db
Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98
am: cb9cfc19c3
am: 570ec6a4a1
...
Change-Id: I32a2fffe6ba73fefeece5d52b8263b4955ca29ac
2020-03-11 04:54:22 +00:00
Automerger Merge Worker
570ec6a4a1
Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98
am: cb9cfc19c3
...
Change-Id: Ic62a6994e362f797100bedb425bbc024fc518a34
2020-03-11 04:34:02 +00:00
Automerger Merge Worker
a422c8146e
Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7
am: 88321847f2
am: a4f49c2211
am: 579a1462a0
am: 0027417aec
...
Change-Id: I052dd96b5c213224481da62327e69274fcb5ee85
2020-03-11 04:20:51 +00:00
Automerger Merge Worker
56113b2cd1
Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7
am: 18bc0af360
am: 135cf3abc6
am: 005f196f26
...
Change-Id: If5c3c370edefe7d40f80b5c46cc9ebf1b8d86553
2020-03-11 04:20:37 +00:00
Automerger Merge Worker
0027417aec
Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7
am: 88321847f2
am: a4f49c2211
am: 579a1462a0
...
Change-Id: I3ae3c0a62cd0557bd8c03688f587fb59030273dc
2020-03-11 04:20:28 +00:00
Automerger Merge Worker
cb9cfc19c3
Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98
...
Change-Id: I0764e99d5970a34f7cf3a01665870123151a94f5
2020-03-11 04:20:12 +00:00
Automerger Merge Worker
5ed31a7e16
Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7
am: 88321847f2
am: be6dd1a9c5
am: 81d2c6dad2
...
Change-Id: I979fa95da971363f2da11e46781e5076aa0517ec
2020-03-11 04:20:09 +00:00
Arc Wang
b8fb854e98
Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev
2020-03-11 04:00:49 +00:00
Automerger Merge Worker
005f196f26
Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7
am: 18bc0af360
am: 135cf3abc6
...
Change-Id: I0b31971968bc1e4b363bd378af95d307df0570b4
2020-03-11 04:00:25 +00:00
Automerger Merge Worker
81d2c6dad2
Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7
am: 88321847f2
am: be6dd1a9c5
...
Change-Id: I3b8eac3e75f61718dfae5f77a4e0cd35828cee51
2020-03-11 04:00:14 +00:00
Automerger Merge Worker
579a1462a0
Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7
am: 88321847f2
am: a4f49c2211
...
Change-Id: Ib3dd9cf888c4de1c29d193bc4f606fb256b6d9e9
2020-03-11 04:00:13 +00:00
Automerger Merge Worker
a4f49c2211
Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7
am: 88321847f2
...
Change-Id: Id257eb221584b0236ca15ed49486419979a8e828
2020-03-11 03:46:30 +00:00
Automerger Merge Worker
135cf3abc6
Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7
am: 18bc0af360
...
Change-Id: I4aa03884f25151d96cac094b64c475b17397cb99
2020-03-11 03:46:28 +00:00
Automerger Merge Worker
be6dd1a9c5
Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7
am: 88321847f2
...
Change-Id: Ie2c912682699d8dcc71eed50cb26a325d5d52bf5
2020-03-11 03:46:17 +00:00
Automerger Merge Worker
18bc0af360
Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7
...
Change-Id: I6ba6d60334ef3bdd9a873ae5435f6757789f7842
2020-03-11 03:33:24 +00:00
Automerger Merge Worker
88321847f2
Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7
...
Change-Id: I56111d64a362e93fae8ff5b12af7f12e53bfc043
2020-03-11 03:33:13 +00:00
Automerger Merge Worker
eeb762a663
[automerger skipped] Merge "Remove reference of Phoneconstants for SUBSCRIPTION_KEY" am: bb8841c22e
am: d0d3fd6457
-s ours am: e9711ca347
-s ours am: a50ef9ba54
-s ours am: 51c34c1004
-s ours
...
am skip reason: Change-Id Ic635b11c995077ebf1e143d9562b100d7730fe52 with SHA-1 a381196b8b
is in history
Change-Id: Id19a7b4b36f29ee0f029d1f274f934b3b180a32b
2020-03-11 03:24:03 +00:00
TreeHugger Robot
6aa40f6ea7
Merge "Revert "Ignore some failed tests."" into rvc-dev
2020-03-11 03:16:49 +00:00
Yi-Ling Chuang
ef4550c504
Revert "Ignore some failed tests."
...
This reverts commit db4fd2b1c3
.
Reason for revert: Test failures are fixed.
Fixes: 150914017
Change-Id: I561816d51427f1141aae42128659b42cc25221dd
2020-03-11 03:16:33 +00:00
Automerger Merge Worker
51c34c1004
[automerger skipped] Merge "Remove reference of Phoneconstants for SUBSCRIPTION_KEY" am: bb8841c22e
am: d0d3fd6457
-s ours am: e9711ca347
-s ours am: a50ef9ba54
-s ours
...
am skip reason: Change-Id Ic635b11c995077ebf1e143d9562b100d7730fe52 with SHA-1 a381196b8b
is in history
Change-Id: I2c10c3f11662da6cd5d81e9f25908be9481f147e
2020-03-11 03:06:37 +00:00
Automerger Merge Worker
a50ef9ba54
[automerger skipped] Merge "Remove reference of Phoneconstants for SUBSCRIPTION_KEY" am: bb8841c22e
am: d0d3fd6457
-s ours am: e9711ca347
-s ours
...
am skip reason: Change-Id Ic635b11c995077ebf1e143d9562b100d7730fe52 with SHA-1 a381196b8b
is in history
Change-Id: Ifd675716ba383ae3d92520808293044f7750d4bf
2020-03-11 02:40:40 +00:00
Automerger Merge Worker
e9711ca347
[automerger skipped] Merge "Remove reference of Phoneconstants for SUBSCRIPTION_KEY" am: bb8841c22e
am: d0d3fd6457
-s ours
...
am skip reason: Change-Id Ic635b11c995077ebf1e143d9562b100d7730fe52 with SHA-1 a381196b8b
is in history
Change-Id: I9079a3807c1d493ccc3cba4e188db11da94eeaaa
2020-03-11 02:20:11 +00:00
Automerger Merge Worker
d0d3fd6457
Merge "Remove reference of Phoneconstants for SUBSCRIPTION_KEY" am: bb8841c22e
...
Change-Id: I3a0714c6e42bf6dde1371f2c188b4fa3bc4aceba
2020-03-11 02:01:13 +00:00
Bonian Chen
bb8841c22e
Merge "Remove reference of Phoneconstants for SUBSCRIPTION_KEY"
2020-03-11 01:45:14 +00:00
Automerger Merge Worker
1ca731169f
Merge "Fix Tx link speed still showing after disconnecting from wifi network" into rvc-dev am: bff2347964
am: b56ca208d9
am: e09cffdfdb
am: c8ec6b0fd6
am: 07513e6385
...
Change-Id: I5d01e70f113e024450bf34945798ba655da43c66
2020-03-11 01:22:32 +00:00
Automerger Merge Worker
aa94a44d64
Merge "Fix Tx link speed still showing after disconnecting from wifi network" into rvc-dev am: bff2347964
am: 6e0521fefd
am: 3e4484fff8
am: 43fa1fb3fd
...
Change-Id: I628041360c43586c7e1a2aabeed68639f7051c40
2020-03-11 01:22:02 +00:00
Automerger Merge Worker
07513e6385
Merge "Fix Tx link speed still showing after disconnecting from wifi network" into rvc-dev am: bff2347964
am: b56ca208d9
am: e09cffdfdb
am: c8ec6b0fd6
...
Change-Id: Id443beaa04534aeeb5de12437cae4bcaac3e1b34
2020-03-11 01:21:41 +00:00
Automerger Merge Worker
c5b9a68b08
Merge "Fix Tx link speed still showing after disconnecting from wifi network" into rvc-dev am: bff2347964
am: b56ca208d9
am: 855712ea9c
am: 6dad4a0da6
...
Change-Id: I97d35aaa014bdf02a986bd8405e88083ae154fc8
2020-03-11 01:21:11 +00:00
Automerger Merge Worker
43fa1fb3fd
Merge "Fix Tx link speed still showing after disconnecting from wifi network" into rvc-dev am: bff2347964
am: 6e0521fefd
am: 3e4484fff8
...
Change-Id: I3f63f2955a6c7c7f58befcfdafb15cf1fc3548ba
2020-03-11 01:07:19 +00:00
Automerger Merge Worker
c8ec6b0fd6
Merge "Fix Tx link speed still showing after disconnecting from wifi network" into rvc-dev am: bff2347964
am: b56ca208d9
am: e09cffdfdb
...
Change-Id: I36b5bbba5da4c9983643af41629e06c83faa90d6
2020-03-11 01:07:11 +00:00
Automerger Merge Worker
6dad4a0da6
Merge "Fix Tx link speed still showing after disconnecting from wifi network" into rvc-dev am: bff2347964
am: b56ca208d9
am: 855712ea9c
...
Change-Id: I255b315e8a6d67af25421d4f28c97197fabf6513
2020-03-11 01:07:10 +00:00
Automerger Merge Worker
3e4484fff8
Merge "Fix Tx link speed still showing after disconnecting from wifi network" into rvc-dev am: bff2347964
am: 6e0521fefd
...
Change-Id: I6b21470e6516fbd9be5ff886a50a8cea99363b16
2020-03-11 01:01:57 +00:00
Automerger Merge Worker
e09cffdfdb
Merge "Fix Tx link speed still showing after disconnecting from wifi network" into rvc-dev am: bff2347964
am: b56ca208d9
...
Change-Id: I8c71ba4fec4304dbb8d5370c0f71c0ec8202a93d
2020-03-11 00:54:35 +00:00
Automerger Merge Worker
855712ea9c
Merge "Fix Tx link speed still showing after disconnecting from wifi network" into rvc-dev am: bff2347964
am: b56ca208d9
...
Change-Id: Ie893d697eeb6cce7d490bd061ff755730e6e4a38
2020-03-11 00:54:23 +00:00
Automerger Merge Worker
6e0521fefd
Merge "Fix Tx link speed still showing after disconnecting from wifi network" into rvc-dev am: bff2347964
...
Change-Id: I69e1948eef5f572f6de11f2a6ef8021970d85924
2020-03-11 00:43:56 +00:00
Automerger Merge Worker
b56ca208d9
Merge "Fix Tx link speed still showing after disconnecting from wifi network" into rvc-dev am: bff2347964
...
Change-Id: I1f920eab1476d7365ea1cac9fd680f4b2aa56637
2020-03-11 00:42:55 +00:00
Quang Luong
bff2347964
Merge "Fix Tx link speed still showing after disconnecting from wifi network" into rvc-dev
2020-03-11 00:31:29 +00:00
Automerger Merge Worker
1c769d5e9a
[automerger skipped] Merge "[Mainline] Remove NETWORK_TYPE_LTE_CA" am: f4e97c4e28
am: c702fbbccc
-s ours am: bb25e17d43
-s ours am: 1421fce9d9
-s ours am: 8849909a58
-s ours
...
am skip reason: Change-Id I1eed95ee1060aff953306a696e91e0205acdad7c with SHA-1 a632c79d32
is in history
Change-Id: Icf2cb47019a751a2ffb0ab29e2cc3ad3b5c85503
2020-03-10 21:46:14 +00:00
Automerger Merge Worker
8849909a58
[automerger skipped] Merge "[Mainline] Remove NETWORK_TYPE_LTE_CA" am: f4e97c4e28
am: c702fbbccc
-s ours am: bb25e17d43
-s ours am: 1421fce9d9
-s ours
...
am skip reason: Change-Id I1eed95ee1060aff953306a696e91e0205acdad7c with SHA-1 a632c79d32
is in history
Change-Id: I0c3cdbe44bb24ff09c742c3db29a78b914dbc115
2020-03-10 21:27:53 +00:00
Automerger Merge Worker
1421fce9d9
[automerger skipped] Merge "[Mainline] Remove NETWORK_TYPE_LTE_CA" am: f4e97c4e28
am: c702fbbccc
-s ours am: bb25e17d43
-s ours
...
am skip reason: Change-Id I1eed95ee1060aff953306a696e91e0205acdad7c with SHA-1 a632c79d32
is in history
Change-Id: Ifdd27a0ebface4aeb4ff72e4129b51236f406ab1
2020-03-10 21:14:10 +00:00
Automerger Merge Worker
bb25e17d43
[automerger skipped] Merge "[Mainline] Remove NETWORK_TYPE_LTE_CA" am: f4e97c4e28
am: c702fbbccc
-s ours
...
am skip reason: Change-Id I1eed95ee1060aff953306a696e91e0205acdad7c with SHA-1 a632c79d32
is in history
Change-Id: I6373b613d7555c796ceaed8469e57ddcc4d5fe60
2020-03-10 21:01:16 +00:00
Automerger Merge Worker
6ee9d72747
[automerger skipped] Merge "Secret code fix - uses public symbol for secret" am: 716c06f700
am: 66d4405d1d
-s ours am: ae0bd4256f
-s ours am: f54d333c24
-s ours am: b5fcf3d808
-s ours
...
am skip reason: Change-Id I681d88d7f2f0f923850d33219a1ee56eedf87cad with SHA-1 27c6358127
is in history
Change-Id: I695f72ebbfe0b2eea6a725cefab2a39ff7abcd64
2020-03-10 21:00:39 +00:00
Daniel Bright
b5fcf3d808
[automerger skipped] Merge "Secret code fix - uses public symbol for secret" am: 716c06f700
am: 66d4405d1d
-s ours am: ae0bd4256f
-s ours
...
am: f54d333c24
-s ours
am skip reason: change_id I681d88d7f2f0f923850d33219a1ee56eedf87cad with SHA1 27c6358127
is in history
Change-Id: I22b3f51df7db0b7a2ad6c914d9d810bddbe6c47a
2020-03-10 11:20:31 -07:00
Automerger Merge Worker
4e94e83200
Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11
am: 17718f979a
am: 2cec639f03
am: 9a71912db6
am: 4a86cb889e
...
Change-Id: Id9be8e0343f9bbd3a4e8fee0383771fff548becb
2020-03-10 17:56:19 +00:00
Automerger Merge Worker
a2d863629f
Merge "Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11
am: 43c4fa35da" into rvc-d1-dev-plus-aosp am: 803e605fd6
am: 1c026bcb55
...
Change-Id: Iaf992838431baa09ca678c0ea334ac391fb326da
2020-03-10 17:55:52 +00:00
Automerger Merge Worker
b4da4c8c9b
Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11
am: 17718f979a
am: b61ad6c1b4
am: 81d81e0bb4
...
Change-Id: Ia1e0a825849993c17818e0cc21fc9ef8ad80c93b
2020-03-10 17:55:14 +00:00
Automerger Merge Worker
4a86cb889e
Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11
am: 17718f979a
am: 2cec639f03
am: 9a71912db6
...
Change-Id: I66c797f51044b1adb6e2940adcb2021f49cef675
2020-03-10 17:47:12 +00:00
Automerger Merge Worker
c702fbbccc
Merge "[Mainline] Remove NETWORK_TYPE_LTE_CA" am: f4e97c4e28
...
Change-Id: Ib2887b224883d82cdc4abdde4a9af34838ed39b9
2020-03-10 17:47:07 +00:00
Nathan Harold
1c026bcb55
Merge "Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11
am: 43c4fa35da" into rvc-d1-dev-plus-aosp
...
am: 803e605fd6
Change-Id: I3c65528a9fbc2f5028948c185d43790f122da896
2020-03-10 10:46:18 -07:00