Commit Graph

59909 Commits

Author SHA1 Message Date
Automerger Merge Worker
84e4f2d2f2 Merge "Update the OWNER files" into rvc-dev am: a38859b2b7 am: 818e26464d
Change-Id: Id28ebe3d9a403632607687afdfa75239c00cc609
2020-03-11 11:50:50 +00:00
Automerger Merge Worker
818e26464d Merge "Update the OWNER files" into rvc-dev am: a38859b2b7
Change-Id: Ia773a05c5375a17f8745dd2edf41f7ecf6f20151
2020-03-11 11:29:17 +00:00
TreeHugger Robot
a38859b2b7 Merge "Update the OWNER files" into rvc-dev 2020-03-11 11:08:21 +00:00
Sunny Shao
3d3757683c Update the OWNER files
Bug: 151179432
Test: manual review
Change-Id: I2bfd917c2bea2d71303ed9aecf29d850f12eec3d
2020-03-11 16:45:14 +08:00
Automerger Merge Worker
ae2fc32aba [automerger skipped] Merge "Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED" am: 7ef5614ee2 am: 382ac6e42e -s ours am: 020efc050a -s ours
am skip reason: Change-Id I9404e2c3c816311c7ef3875622fe5cd5a315ec58 with SHA-1 721467c679 is in history

Change-Id: I2769a1e4215440a5f501ef02f4c79df68bd234b4
2020-03-11 06:19:48 +00:00
Automerger Merge Worker
020efc050a [automerger skipped] Merge "Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED" am: 7ef5614ee2 am: 382ac6e42e -s ours
am skip reason: Change-Id I9404e2c3c816311c7ef3875622fe5cd5a315ec58 with SHA-1 721467c679 is in history

Change-Id: I62f64918ee1bf00cad66f117b400c4404f7e7996
2020-03-11 06:04:38 +00:00
Automerger Merge Worker
382ac6e42e Merge "Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED" am: 7ef5614ee2
Change-Id: I2881def2e37235b8d9ef4d9d82ad0abc6e7ecab4
2020-03-11 05:51:49 +00:00
Treehugger Robot
7ef5614ee2 Merge "Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED" 2020-03-11 05:40:34 +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
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
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
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
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
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
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
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
c702fbbccc Merge "[Mainline] Remove NETWORK_TYPE_LTE_CA" am: f4e97c4e28
Change-Id: Ib2887b224883d82cdc4abdde4a9af34838ed39b9
2020-03-10 17:47:07 +00: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
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
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
8f2a1abc03 Merge "Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 am: 379902636b" into rvc-d1-dev-plus-aosp 2020-03-10 15:16:13 +00:00
Automerger Merge Worker
1035d589ea Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 am: 379902636b
Change-Id: Ia97c8d3286b9ab95fa8e7d5a5de96aaa071c1a6a
2020-03-10 15:16:06 +00:00
Automerger Merge Worker
ce61a52720 Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 am: 2f2d8d5949
Change-Id: I0ad2bf3fc2c50cd29776a939ea4d907dd4db9c9a
2020-03-10 15:16:03 +00:00
Automerger Merge Worker
379902636b Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986
Change-Id: If8964911c25b2d5cc8a38e4dd319ceb91ce95fe2
2020-03-10 15:02:13 +00:00
Automerger Merge Worker
2f2d8d5949 Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986
Change-Id: I4bfd5350cbf0365770f3504206febce23ef2c09f
2020-03-10 15:02:04 +00:00
TreeHugger Robot
1334a7e986 Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev 2020-03-10 14:45:46 +00:00
Automerger Merge Worker
dbb18e85e4 Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 am: 0a6442df22
Change-Id: Iec3c9cfebc740ec2b04ff315fc6e18282ccaa8bd
2020-03-10 12:43:44 +00:00