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
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
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
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
Kevin Chyn
59834e6bf4
Partial revert of ag/10482633
...
SUW is using activity result codes already. Let's stick with the old
behavior until/if there's a way to make it work nicely.
Fixes: 151058692
Test: Skip fingerprint in SUW. Fingerprint not shown again in SUW.
Change-Id: I3c52cddd568dc5ded6bf810272ffb77f0841c692
2020-03-10 17:26:26 -07: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
Chen Chen
847b534fdf
MetricId: Avoid byte[] and string ambiguity
...
Passing null to the function will result in conflict with Bluetooth proto
(int int int byte[] int)
Bug: 122571213
Test: Build
Change-Id: Iad90e67a2cdde86aabb95585975be56fc33361fe
2020-03-10 12:49:56 -07: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
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
Automerger Merge Worker
f54d333c24
[automerger skipped] Merge "Secret code fix - uses public symbol for secret" am: 716c06f700
am: 66d4405d1d
-s ours am: ae0bd4256f
-s ours
...
am skip reason: Change-Id I681d88d7f2f0f923850d33219a1ee56eedf87cad with SHA-1 27c6358127
is in history
Change-Id: If6fd20e1fc1fc4f39764072b87d01997d00bcd16
2020-03-10 17:42:38 +00:00
Nathan Harold
81d81e0bb4
Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11
am: 17718f979a
...
am: b61ad6c1b4
Change-Id: Ia958905336a068a7c064abe95e5221ce2345bc75
2020-03-10 10:38:27 -07:00
Automerger Merge Worker
9a71912db6
Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11
am: 17718f979a
am: 2cec639f03
...
Change-Id: Ibe4f5cd65b531f0b26a38cdef0227b1b482d4987
2020-03-10 17:31:59 +00:00
Treehugger Robot
f4e97c4e28
Merge "[Mainline] Remove NETWORK_TYPE_LTE_CA"
2020-03-10 17:26:27 +00:00
Automerger Merge Worker
ae0bd4256f
[automerger skipped] Merge "Secret code fix - uses public symbol for secret" am: 716c06f700
am: 66d4405d1d
-s ours
...
am skip reason: Change-Id I681d88d7f2f0f923850d33219a1ee56eedf87cad with SHA-1 27c6358127
is in history
Change-Id: I36220a7c22556640143212703a277955452a0ceb
2020-03-10 17:20:19 +00:00
Automerger Merge Worker
2cec639f03
Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11
am: 17718f979a
...
Change-Id: I0d35897985d9ab4506971bb75c5d4b614efedb4c
2020-03-10 17:19:23 +00:00
Automerger Merge Worker
803e605fd6
Merge "Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11
am: 43c4fa35da" into rvc-d1-dev-plus-aosp
2020-03-10 17:19:21 +00:00
Automerger Merge Worker
d7d02ee912
Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11
am: 43c4fa35da
...
Change-Id: I7dba7d4af1b3b8fe5ab12b2dea1a56456fc9f471
2020-03-10 17:19:17 +00:00
Automerger Merge Worker
b61ad6c1b4
Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11
am: 17718f979a
...
Change-Id: Ifae11bdeae6f9be5cbbfc7caa64c8aab66b1e7ac
2020-03-10 17:19:14 +00:00
Automerger Merge Worker
66d4405d1d
Merge "Secret code fix - uses public symbol for secret" am: 716c06f700
...
Change-Id: Ic2025dbfe0dcaf21b5a3a50c8caa778242440b6d
2020-03-10 16:59:32 +00:00
Automerger Merge Worker
43c4fa35da
Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11
...
Change-Id: I8727fec517436adf608b26fc1372c7c43cfa504a
2020-03-10 16:58:34 +00:00
Automerger Merge Worker
17718f979a
Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11
...
Change-Id: I4421beef3f7468b58d3b83c444fcebaf1a758d83
2020-03-10 16:58:22 +00:00
Nathan Harold
a8bee76d11
Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev
2020-03-10 16:35:02 +00:00
Daniel Bright
716c06f700
Merge "Secret code fix - uses public symbol for secret"
2020-03-10 16:31:01 +00:00
Automerger Merge Worker
f7180505c2
Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986
am: 2f2d8d5949
am: 548a47fa63
am: 90d62de46c
...
Change-Id: I9f0ed28ecc313316dfcf9226b2d8d03f20e9b24d
2020-03-10 15:58:02 +00:00