Treehugger Robot
7ef5614ee2
Merge "Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED"
2020-03-11 05:40:34 +00:00
Automerger Merge Worker
96071bfe6d
Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98 am: cb9cfc19c3 am: 423c789130 am: e740596789
...
Change-Id: Ia8adddeb723d267eb051cc9b12db0492557c8ffc
2020-03-11 05:08:25 +00:00
Automerger Merge Worker
8584b3345b
Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98 am: 489d671497 am: 0daf548b0a
...
Change-Id: I5cf171bb528dcfea552c0e637b75aca6a630fe66
2020-03-11 04:54:31 +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
e740596789
Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98 am: cb9cfc19c3 am: 423c789130
...
Change-Id: I08b8fd741fdebd4caa5f354ddbc14fcfe5c1a0f3
2020-03-11 04:54:19 +00:00
Automerger Merge Worker
0daf548b0a
Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98 am: 489d671497
...
Change-Id: I4e4d1d0061f8a5b221d3c2449e901ab1c3c70830
2020-03-11 04:34:15 +00:00
Automerger Merge Worker
423c789130
Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98 am: cb9cfc19c3
...
Change-Id: Ic33bc4574017d972cd4007ab25373c9b6443652e
2020-03-11 04:34:11 +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
489d671497
Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98
...
Change-Id: I26425ff7fa3413bc5cb3458843f643bb346696e5
2020-03-11 04:20:28 +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
Daniel Bright
fa5ffc97e6
Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED
...
Bug: 148160428
Test: make, flash
Merged-In: I9404e2c3c816311c7ef3875622fe5cd5a315ec58
Change-Id: I9404e2c3c816311c7ef3875622fe5cd5a315ec58
2020-03-10 21:12:25 -07: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
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
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
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
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
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
Christopher Tate
36f182159f
DO NOT MERGE - Track framework changes to crashApplication
...
Bug: 128649910
Test: manual
Test: atest OsHostTests#testForegroundServiceBadNotification
Merged-In: Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc
Change-Id: I6894e3df309669ba98ad23432aa18d6043739aad
2020-03-10 15:52:05 -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
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
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
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: f54d333c2427c6358127
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
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
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
2020-03-10 10:38:27 -07:00
