62673 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Bonian Chen	ad83bf03ad	Merge "[Settings] Remove internal ImsManager access within MobileNetworkUtils" into rvc-dev am: 311941c7d3 am: 855152fd22 am: 92514b98a2 am: bb13961b1e ... Change-Id: I248eb9b8bd2ba89dbbb48c08845a3c7a1ffb75b3	2020-03-31 17:11:11 +00:00
Bonian Chen	bb13961b1e	Merge "[Settings] Remove internal ImsManager access within MobileNetworkUtils" into rvc-dev am: 311941c7d3 am: 855152fd22 am: 92514b98a2 ... Change-Id: I20628e74cc9f97326201ebcb36ee9c0705ee65f4	2020-03-31 16:55:54 +00:00
Artur Satayev	015e816bda	[automerger skipped] Merge "Do not exlicitly declare dependency on changeid processor." into rvc-dev am: 836dcbaf91 -s ours am: 44b344abc1 -s ours am: dc971988a4 -s ours ... am skip reason: Change-Id Icab88938f1a49a892e0d62b2a833b659d6725267 with SHA-1 f9cc52d670 is in history Change-Id: Ic4836b6d97650be6749dfb17ac8323e51503f7b1	2020-03-31 16:51:17 +00:00
Bonian Chen	c6c4b5def6	Merge "[Settings] Apply WifiCallingQueryImsState" into rvc-dev am: 54002ca154 am: d2fe2c9959 am: fa83a139ca ... Change-Id: I876086adfe4c5ec756daac8c1bb58aa64af25ce7	2020-03-31 16:50:57 +00:00
Bonian Chen	f6a8037223	Merge "[Settings] Remove internal ImsManager access within MobileNetworkUtils" into rvc-dev am: 311941c7d3 am: 855152fd22 am: f5b033015a ... Change-Id: Id49d4018120f3a4bd38779e67d8873efa4b78857	2020-03-31 16:50:54 +00:00
Artur Satayev	dc971988a4	[automerger skipped] Merge "Do not exlicitly declare dependency on changeid processor." into rvc-dev am: 836dcbaf91 -s ours am: 44b344abc1 -s ours ... am skip reason: Change-Id Icab88938f1a49a892e0d62b2a833b659d6725267 with SHA-1 f9cc52d670 is in history Change-Id: Icc12e1b4cb59e46860baae752938bd00b50c0f1a	2020-03-31 16:48:03 +00:00
Bonian Chen	92514b98a2	Merge "[Settings] Remove internal ImsManager access within MobileNetworkUtils" into rvc-dev am: 311941c7d3 am: 855152fd22 ... Change-Id: Ib61d0c6668a57b2e46e9a33778ba6d52613b6e91	2020-03-31 16:39:00 +00:00
Bonian Chen	fa83a139ca	Merge "[Settings] Apply WifiCallingQueryImsState" into rvc-dev am: 54002ca154 am: d2fe2c9959 ... Change-Id: I56e3d5cf3731b4188afbad5d88b8931b98fa21bf	2020-03-31 16:38:36 +00:00
Bonian Chen	f5b033015a	Merge "[Settings] Remove internal ImsManager access within MobileNetworkUtils" into rvc-dev am: 311941c7d3 am: 855152fd22 ... Change-Id: Ica2bc8b657f244a6341e67dd28db5c213bf33be0	2020-03-31 16:38:33 +00:00
Bonian Chen	d2fe2c9959	Merge "[Settings] Apply WifiCallingQueryImsState" into rvc-dev am: 54002ca154 ... Change-Id: I4cfc318b3ff3af20cb2edead69db0ef7c31430d9	2020-03-31 16:26:55 +00:00
Bonian Chen	855152fd22	Merge "[Settings] Remove internal ImsManager access within MobileNetworkUtils" into rvc-dev am: 311941c7d3 ... Change-Id: If4dec5a4bd6a24d0684aa30711a530d39a59ca63	2020-03-31 16:26:51 +00:00
Bonian Chen	54002ca154	Merge "[Settings] Apply WifiCallingQueryImsState" into rvc-dev	2020-03-31 16:09:27 +00:00
Bonian Chen	311941c7d3	Merge "[Settings] Remove internal ImsManager access within MobileNetworkUtils" into rvc-dev	2020-03-31 16:09:27 +00:00
TreeHugger Robot	98b4ce9184	Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev am: 4b45334288 am: 37e6acd9a5 am: b99184d84e am: 4be8b73f3e ... Change-Id: I6c96c53d6c3cbccb085e37cc6a4a79b7cd305e66	2020-03-31 16:00:38 +00:00
TreeHugger Robot	a7e1794024	Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev am: 4b45334288 am: 37e6acd9a5 am: 4bcd19b296 ... Change-Id: I8fed8c5f348136496ef868db294c4af04a5112d3	2020-03-31 15:46:07 +00:00
TreeHugger Robot	4be8b73f3e	Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev am: 4b45334288 am: 37e6acd9a5 am: b99184d84e ... Change-Id: I1e845fd38886716c2bbe016546815ab1aad53190	2020-03-31 15:45:50 +00:00
TreeHugger Robot	4bcd19b296	Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev am: 4b45334288 am: 37e6acd9a5 ... Change-Id: I4b3fa69ed60dbbd4fe936d463673ef8767fd982c	2020-03-31 15:34:52 +00:00
TreeHugger Robot	b99184d84e	Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev am: 4b45334288 am: 37e6acd9a5 ... Change-Id: I6410a4d0b06574df8e4688fe085a705d7befb07a	2020-03-31 15:34:45 +00:00
TreeHugger Robot	37e6acd9a5	Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev am: 4b45334288 ... Change-Id: I776a3e7e0418231db4e8ef72e3c1899228839941	2020-03-31 15:18:56 +00:00
TreeHugger Robot	4b45334288	Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev ... * changes: [Wi-Fi] Wi-Fi picker scrolls to top after a user clicked to connect [Wi-Fi] Fix Wi-Fi picker context menu 'Connect' button	2020-03-31 15:01:09 +00:00
Automerger Merge Worker	c77942943f	Merge "Merge "Show all apps that requested cross profile permission" into rvc-dev am: 7fb6f35c3a am: bf7e468f0c am: 14d05685a1 am: 0329f2fcbe" into rvc-qpr-dev-plus-aosp	2020-03-31 14:09:10 +00:00
Kholoud Mohamed	3927250190	Merge "Show all apps that requested cross profile permission" into rvc-dev am: 7fb6f35c3a am: bf7e468f0c am: 14d05685a1 am: 0329f2fcbe ... Change-Id: I639cdcd0cc5ca1ea977369684fe986d0887a1602	2020-03-31 14:09:05 +00:00
Kholoud Mohamed	1910a64cf1	Merge "Show all apps that requested cross profile permission" into rvc-dev am: 7fb6f35c3a am: bf7e468f0c am: 3e5e6920eb ... Change-Id: Ide25e69dc66a8c8263a4a6a1e949933941085b44	2020-03-31 14:08:59 +00:00
Kholoud Mohamed	3e5e6920eb	Merge "Show all apps that requested cross profile permission" into rvc-dev am: 7fb6f35c3a am: bf7e468f0c ... Change-Id: I1fcaa7e6bd6616a5df7187c36575bc6f9abdf1f7	2020-03-31 13:52:36 +00:00
Kholoud Mohamed	0329f2fcbe	Merge "Show all apps that requested cross profile permission" into rvc-dev am: 7fb6f35c3a am: bf7e468f0c am: 14d05685a1 ... Change-Id: Ic8267c53e159a2a6b6d10435d12b8dff68ae4d7f	2020-03-31 13:52:23 +00:00
Kholoud Mohamed	14d05685a1	Merge "Show all apps that requested cross profile permission" into rvc-dev am: 7fb6f35c3a am: bf7e468f0c ... Change-Id: I7e9a11c33a7fecdeaa52ac0a6f5363ddb7971862	2020-03-31 13:38:47 +00:00
Kholoud Mohamed	bf7e468f0c	Merge "Show all apps that requested cross profile permission" into rvc-dev am: 7fb6f35c3a ... Change-Id: I7310a64ae95e0fdaf191b979cacefb8ad645d53a	2020-03-31 13:26:09 +00:00
Kholoud Mohamed	7fb6f35c3a	Merge "Show all apps that requested cross profile permission" into rvc-dev	2020-03-31 13:09:31 +00:00
Robert Luo	ef548f8629	Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06 am: c13ecfad98 am: f2dbeb1542 am: b6e34349de ... Change-Id: I1f2c9eeb61e509a27a52907f399b88a41f75cdea	2020-03-31 10:00:49 +00:00
Bonian Chen	f35562af9a	Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6 am: 949ec8a1f0 am: 155c698d4f am: a170198f0b ... Change-Id: Ifdb5aa5bb04191ce3d00b3d9f885ef6fd2664971	2020-03-31 09:59:51 +00:00
TreeHugger Robot	5ef48cf252	Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba am: 46cc33c9a6 am: 7fea1bf993 am: faff3e2276 ... Change-Id: Ia5e0c4df1c191dc7c5018b6e34be63471e66e999	2020-03-31 09:58:17 +00:00
TreeHugger Robot	3087ed5a7f	Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev am: 477c4fef48 am: 2093f0dee4 am: 52162fde91 am: 545c95317c ... Change-Id: Ib17d078be14398df69d55a430602434a4c6b8877	2020-03-31 09:54:13 +00:00
tim peng	0c9505da84	Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6 am: 4a82a5abb5 am: 1106c19951 am: 774620f543 ... Change-Id: Iaf2f09df206b561dc4478d8f730e27b9944236e7	2020-03-31 09:27:37 +00:00
Arc Wang	a76669656f	[Wi-Fi] Wi-Fi picker scrolls to top after a user clicked to connect ... After a connect success callback, Wi-Fi picker scrolls to the connected Wi-Fi network after it's added in. Bug: 152576795 Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettings2 manual Click a Wi-Fi network or it's context menu 'Connect' button to connect and see if UI scroll to the top. Change-Id: Ia96af86c9ed552324089f97db104975e28f6c1c7	2020-03-31 17:24:54 +08:00
Arc Wang	3bb3808043	[Wi-Fi] Fix Wi-Fi picker context menu 'Connect' button ... 1. Display the Wi-Fi dialog with MODE_CONNECT. 2. Connect with the WifiConfiguration from WifiConfigController2#getConfig() if it's available. Bug: 152826354 Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettings2 Change-Id: Ifbe2ac30b1c37c8eab3227ac0561fdd2de5cb706	2020-03-31 17:01:22 +08:00
Robert Luo	b6e34349de	Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06 am: c13ecfad98 am: f2dbeb1542 ... Change-Id: Ie893d9a5c9858c743f18434f093aba1f03d24d33	2020-03-31 08:34:19 +00:00
Robert Luo	6271d783df	Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06 am: c13ecfad98 am: 9fc4bfdcb5 ... Change-Id: I205f7b781f7c2a2ce955d99e82915c25fc6e5b66	2020-03-31 08:34:19 +00:00
Robert Luo	f2dbeb1542	Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06 am: c13ecfad98 ... Change-Id: I265d9fdf691f443319417d4cf24b91b0223824d3	2020-03-31 08:19:39 +00:00
Robert Luo	9fc4bfdcb5	Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06 am: c13ecfad98 ... Change-Id: I82be8b4c9c8a2929aac7570c198a2fed2c0eafc1	2020-03-31 08:19:18 +00:00
Robert Luo	c13ecfad98	Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06 ... Change-Id: Ibf6f65fc9659992bb7da934f2f39572b3f108ac2	2020-03-31 08:01:50 +00:00
Robert Luo	c3535eab06	Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev	2020-03-31 07:42:24 +00:00
Bonian Chen	3c4dffc470	Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6 am: 949ec8a1f0 am: 9e9597f7d8 ... Change-Id: Ibb3fe8013b6de42c2aa2526b6a2e40e3ec3e1a95	2020-03-31 07:15:48 +00:00
Bonian Chen	a170198f0b	Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6 am: 949ec8a1f0 am: 155c698d4f ... Change-Id: I35c153ff8ecf7b9505e87ac4fd9e2ffa7fa7a491	2020-03-31 07:15:23 +00:00
Bonian Chen	155c698d4f	Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6 am: 949ec8a1f0 ... Change-Id: Ie800cbe35040ed63a8488e7cac8e1bfdfdadb8a4	2020-03-31 07:00:57 +00:00
Bonian Chen	9e9597f7d8	Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6 am: 949ec8a1f0 ... Change-Id: I3fbf2b0e9a69d08c5926ce05d2bef76d36e6f84f	2020-03-31 07:00:18 +00:00
Bonian Chen	7520adccee	[Settings] Apply WifiCallingQueryImsState ... Apply design of WifiCallingQueryImsState to source code which accessing WifiCalling. Bug: 140542283 Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSettingsForSubTest Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingPreferenceControllerTest Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSettingsTest Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSliceHelperTest Change-Id: I0db966742d63cfe9a1ef4e1b06f6b5c81f681927	2020-03-31 14:40:18 +08:00
Bonian Chen	949ec8a1f0	Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6 ... Change-Id: Ib23864723f76e376338604b65171a058cc0df611	2020-03-31 06:39:12 +00:00
Bonian Chen	268bdc12c6	Merge "[Settings] Code Refactor" into rvc-dev	2020-03-31 06:24:15 +00:00
TreeHugger Robot	faff3e2276	Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba am: 46cc33c9a6 am: 7fea1bf993 ... Change-Id: I12ec3f1aeddac3cda3ba300057094cf3aa64105b	2020-03-31 05:16:00 +00:00
TreeHugger Robot	bebee5c18e	Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba am: 46cc33c9a6 am: 210c260ce6 ... Change-Id: Ib374cc0970383c55e61a76fe941a8fbfa8963dc1	2020-03-31 05:15:32 +00:00