OSDN Git Service
Bill Yi [Thu, 22 Aug 2019 15:40:37 +0000 (08:40 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
e6c59cd920 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib440f82e3fe673be9aaa79557166119689d7446e
Bill Yi [Thu, 22 Aug 2019 09:42:58 +0000 (02:42 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I2995bfc89e4a39074ec7f05d1425054dfb39c8f6
Xin Li [Thu, 15 Aug 2019 07:40:41 +0000 (00:40 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" am:
1e53efc4c4 -s ours
am:
b03fdd4dcf -s ours
am skip reason: subject contains skip directive
Change-Id: I8b48996bdb25fda1adb55fcb63a3956dddbb8710
Xin Li [Thu, 15 Aug 2019 07:25:54 +0000 (00:25 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master"
am:
1e53efc4c4 -s ours
am skip reason: subject contains skip directive
Change-Id: I1898ca933b111068bd8b7eafbe5421096c313d9e
Xin Li [Thu, 15 Aug 2019 06:52:30 +0000 (23:52 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master am:
c3ef16882d -s ours
am:
f8c25b6ac4 -s ours
am skip reason: subject contains skip directive
Change-Id: Ieeffd5db1009f7dda5b595f3a6790ec1f2ce6db8
Xin Li [Thu, 15 Aug 2019 06:32:21 +0000 (23:32 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master
am:
c3ef16882d -s ours
am skip reason: subject contains skip directive
Change-Id: I1d1b46e30a9ec5b4e01f351342fe45ac64994d47
Treehugger Robot [Thu, 15 Aug 2019 06:13:48 +0000 (06:13 +0000)]
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master"
Xin Li [Wed, 14 Aug 2019 20:32:06 +0000 (13:32 -0700)]
[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (
5713463) in stage-aosp-master
am:
9821df1b1f -s ours
am skip reason: subject contains skip directive
Change-Id: If1da8066529d53cf10298533987f7d7f7c57d405
Xin Li [Wed, 14 Aug 2019 18:35:21 +0000 (11:35 -0700)]
DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (
5713463) in stage-aosp-master
Bug:
134405016
Change-Id: I80e9ac9e5e6a21ebd94543865b8f75c20020360d
Jordan Liu [Wed, 14 Aug 2019 01:48:49 +0000 (18:48 -0700)]
Merge "Allow radio info on phones with no subscription" am:
19d1f890a0
am:
b377a593b7
Change-Id: Ibe68e60583fdf2bd08d6d8f62b5c942878dd160e
Jordan Liu [Wed, 14 Aug 2019 01:37:15 +0000 (18:37 -0700)]
Merge "Allow radio info on phones with no subscription"
am:
19d1f890a0
Change-Id: Ia63778cf83212b2670413e2567c068bf92f6ff05
Jordan Liu [Wed, 14 Aug 2019 00:22:42 +0000 (00:22 +0000)]
Merge "Allow radio info on phones with no subscription"
Xin Li [Tue, 13 Aug 2019 23:36:39 +0000 (16:36 -0700)]
DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master
Bug:
139369544
Change-Id: I483962d870c69d1c454d5bc04c76d9f7d7a12520
android-build-team Robot [Tue, 13 Aug 2019 16:25:08 +0000 (16:25 +0000)]
Snap for
5674421 from
4a949c0640373471f5699c7a5cf490731394c574 to pi-platform-release
Change-Id: Idb0d7d08f9581908c2f5e2881a73b1c806f1ddb9
Jordan Liu [Wed, 7 Aug 2019 23:51:36 +0000 (16:51 -0700)]
Allow radio info on phones with no subscription
Some info is still helpful for debugging in these cases.
Bug:
139074613
Test: manual
Change-Id: Idbde691c60b53e0ab755df229a3a9dc77406934d
Merged-In: Idbde691c60b53e0ab755df229a3a9dc77406934d
Bill Yi [Tue, 30 Jul 2019 18:34:43 +0000 (11:34 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
9af3e6a625 -s ours
am skip reason: subject contains skip directive
Change-Id: I30d1996db7f73e5e38515fad56ea9bc9d8f44450
Bill Yi [Mon, 29 Jul 2019 23:46:49 +0000 (16:46 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Idbe888a8bb4d386d7d8e883cc530561c1a5806ad
Kevin Chyn [Sat, 27 Jul 2019 00:48:44 +0000 (17:48 -0700)]
Do not request cancel authentication unless currently authenticating
am:
49c7d07650
Change-Id: Id38d3648f75a79a3492677416c79fff960317a69
Kevin Chyn [Fri, 26 Jul 2019 18:20:10 +0000 (11:20 -0700)]
Do not request cancel authentication unless currently authenticating
Currently we always send cancel() if ConfirmDeviceCredentialActivity
goes into the background. However, if the biometric state is no longer
authenticating, requesting cancel() in this state will result in an
inconsistent state between BiometricService/client and
ConfirmDeviceCredentials.
BiometricService/client will receive the ERROR_CANCELED message incorrectly,
while ConfirmDeviceCredential is showing / pending user password. When
the password is entered, its result is ignored.
The correct behavior is for ConfirmDeviceCredentialActivity to invoke
cancel() only if it's still authenticating. Otherwise BiometricService
and its client will receive ERROR_CANCELED, instead of the actual password
auth result.
Bug:
138279856
Test: BiometricPromptDemo, enable device credential fallback, get into
lockout state, successfully enter password. API result is
success instead of "canceled" now.
Change-Id: I6521e896d0402fe856dc85476f51149c9b3084a8
Merged-In: I6521e896d0402fe856dc85476f51149c9b3084a8
Peiyong Lin [Wed, 24 Jul 2019 23:59:33 +0000 (16:59 -0700)]
Remove prerelease driver option from Settings UI.
am:
c2dfba01ca
Change-Id: Id48683555b1bdfc3dbc3a238c987f114ff029cc5
Lucas Lin [Wed, 24 Jul 2019 03:56:43 +0000 (20:56 -0700)]
Merge "Create a string for private DNS "On"" am:
a64f8d9521
am:
903e8dac6c
Change-Id: Id364ce04a54afe3abe8e9b240a6a6ed9864d5681
Lucas Lin [Wed, 24 Jul 2019 03:45:49 +0000 (20:45 -0700)]
Merge "Create a string for private DNS "On""
am:
a64f8d9521
Change-Id: I154269dc91acbefdce3cb6f76513d6b4f08f568b
Lucas Lin [Wed, 24 Jul 2019 03:15:01 +0000 (03:15 +0000)]
Merge "Create a string for private DNS "On""
Peiyong Lin [Tue, 23 Jul 2019 17:27:47 +0000 (10:27 -0700)]
Remove prerelease driver option from Settings UI.
BUG:
134881329
Test: Verified with Settings UI.
Change-Id: Id610cbaec9b9a5a8be201e7952cb7715d2fe2eb4
Yanting Yang [Tue, 23 Jul 2019 16:37:45 +0000 (09:37 -0700)]
Merge "Support new regulatory label for location" into qt-dev
am:
28736bee5d
Change-Id: I2a2fb86c5062f38b52ac38366c619aa8e0bb2f00
TreeHugger Robot [Tue, 23 Jul 2019 16:12:52 +0000 (16:12 +0000)]
Merge "Support new regulatory label for location" into qt-dev
lucaslin [Tue, 23 Jul 2019 11:40:09 +0000 (19:40 +0800)]
Create a string for private DNS "On"
The last private DNS settings screen landed in P after string
freeze, which led us to reuse R.string.switch_on_text for the
"on" text when private DNS is active. That string comes from
notifications. Private DNS should have its own string for this
instead.
Bug:
79122154
Test: 1. Build pass
2. make -j44 RunSettingsRoboTests \
ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest
Change-Id: Ie013a858c8bc41e00a1b940d02efa2b605991685
Bill Yi [Mon, 22 Jul 2019 19:51:28 +0000 (12:51 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
7d966975ad -s ours
am skip reason: subject contains skip directive
Change-Id: Ie9d71673049fc02897d6ce5c9c16b8e7cee8b0e6
Bill Yi [Mon, 22 Jul 2019 17:59:39 +0000 (10:59 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I0369197f24082cadfbb6b3ac72d33243231090ac
Yanting Yang [Thu, 18 Jul 2019 17:46:36 +0000 (01:46 +0800)]
Support new regulatory label for location
Fixes:
137348817
Test: visual, robotests
Change-Id: I165b1e859891c7897e837d82702582458cecbb0d
Bill Yi [Thu, 18 Jul 2019 21:24:36 +0000 (14:24 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
e73e59c562 -s ours
am skip reason: subject contains skip directive
Change-Id: I52627f2e7b30beb857a5e7c8ca955671ceefef28
Bill Yi [Thu, 18 Jul 2019 18:28:21 +0000 (11:28 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Idb389ab591b291cae86749badc8d7cef2052e388
Bill Yi [Mon, 15 Jul 2019 08:21:16 +0000 (01:21 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
8d229d7090 -s ours
am skip reason: subject contains skip directive
Change-Id: Ied4eb2aed709ef90008edf7c49509522e96eb512
Bill Yi [Mon, 15 Jul 2019 05:26:37 +0000 (22:26 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I9ecaff62cfd0370a1ff7e5f6eb36a871c8486dee
Andrew Sapperstein [Fri, 12 Jul 2019 03:51:33 +0000 (20:51 -0700)]
Merge "Fix erasing of eSIMs for some devices" into qt-dev
am:
1f942d9857
Change-Id: I04bc60ed040546a64ea157840b76d815169d32a3
Andrew Sapperstein [Fri, 12 Jul 2019 03:13:39 +0000 (03:13 +0000)]
Merge "Fix erasing of eSIMs for some devices" into qt-dev
Antony Sargent [Thu, 11 Jul 2019 18:04:09 +0000 (11:04 -0700)]
Fix erasing of eSIMs for some devices
Doing a factory data reset used to always erase eSIMs. Then a few months
ago we added a default-on checkbox to let users opt out of erasing the
eSIM during this process, but only had it show for some devices (ones
which support the "fastboot oem esim_erase" command) by adding a system
property named masterclear.allow_retain_esim_profiles_after_fdr.
When recently updating the strings shown in the factory data reset
screen and the confirmation dialog, we changed the code so that if that
the checkbox is hidden we'll pass false for the ERASE_ESIMS_EXTRA
parameter sent to the factory data reset confirmation dialog. This had
the unintended side effect of making devices that don't specify true for
masterclear.allow_retain_esim_profiles_after_fdr skip erasing the eSIM.
This CL fixes that by removing the "is the checkbox hidden" check, going
back to the previous behavior of just using the checkbox value, which is
on by default even if hidden.
Fixes:
135284765
Test: make RunSettingsRoboTests
Change-Id: Ia9f335920e4e3c4a90f0a6a49d1722a0c19ea83d
Bill Yi [Thu, 11 Jul 2019 10:10:27 +0000 (03:10 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
433e625341 -s ours
am skip reason: subject contains skip directive
Change-Id: I22d56ba044543ee2389402ca28ae5ecf49b4a9cc
TreeHugger Robot [Thu, 11 Jul 2019 09:54:20 +0000 (09:54 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
tmfang [Thu, 11 Jul 2019 07:54:14 +0000 (00:54 -0700)]
Improve Settings launch performance
am:
496d3f6f9c
Change-Id: I5256fa0c04af07108b76cf21e9558b03d499e883
tmfang [Wed, 3 Jul 2019 12:44:42 +0000 (20:44 +0800)]
Improve Settings launch performance
From traces analysis, we found getFreeBytes
was taking a long time to return.
getFreeBytes was used when storage controller
tried to get storage information.
In order to prevent this case, we put the action
which takes too much time in background thread.
Test: I can't reproduce it locally. From code view,
this is a reasonable root cause.
Fixes:
136268875
Change-Id: I78e42cde88553c003f198cffb5747b352055f59a
(cherry picked from commit
0c37f019f61f37b67e2297e99d96e8396d962f40)
Bill Yi [Thu, 11 Jul 2019 02:31:11 +0000 (19:31 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I09ed37fffcf0bbcf61cdfa0b1f8cf22f5828d23b
Xin Li [Thu, 11 Jul 2019 02:02:51 +0000 (19:02 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Skip pie-platform-release (PPRL.190705.004) in master" am:
0c7e805902 -s ours
am:
ba73db3e92 -s ours
am skip reason: subject contains skip directive
Change-Id: I8c1e220708b6ac50415a0c4f7b68784ab6fdf167
Xin Li [Thu, 11 Jul 2019 01:44:45 +0000 (18:44 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Skip pie-platform-release (PPRL.190705.004) in master"
am:
0c7e805902 -s ours
am skip reason: subject contains skip directive
Change-Id: I724db7670844b89aaae1e9bc856c16c95209b14e
Treehugger Robot [Thu, 11 Jul 2019 00:56:33 +0000 (00:56 +0000)]
Merge "DO NOT MERGE - Skip pie-platform-release (PPRL.190705.004) in master"
Bill Yi [Wed, 10 Jul 2019 00:17:49 +0000 (17:17 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
13d6e13166 -s ours
am skip reason: subject contains skip directive
Change-Id: I3d8655c2b647674d28d223f5deb9b6d21b42d106
Xin Li [Tue, 9 Jul 2019 22:31:44 +0000 (15:31 -0700)]
DO NOT MERGE - Skip pie-platform-release (PPRL.190705.004) in master
Bug:
136196576
Change-Id: I660faf68e8a703ac26d79313ead245949f587e59
Bill Yi [Tue, 9 Jul 2019 18:46:23 +0000 (11:46 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I1c15e397059f357be547ce32fcdbae885bff5925
android-build-team Robot [Mon, 8 Jul 2019 23:29:58 +0000 (23:29 +0000)]
Snap for
5622519 from
fd365ae91ebe924197c5f443c889928eb07bd02c to pi-platform-release
Change-Id: I4b218750d55b6dbb691814f72ed880fc5d1677fb
Bill Yi [Sat, 6 Jul 2019 02:04:54 +0000 (19:04 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
292e7ad110 -s ours
am skip reason: subject contains skip directive
Change-Id: I10718d202f97e6fb1d6c7855c50ae5e15d4e5278
Bill Yi [Fri, 5 Jul 2019 21:38:28 +0000 (14:38 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I9307e8b79d695e33e0b76b36de1fefc21a0b835e
Bill Yi [Wed, 3 Jul 2019 23:19:58 +0000 (16:19 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
a0fb9000bb -s ours
am skip reason: subject contains skip directive
Change-Id: I53bbafb3bcf25c01d4b1bc45edb66398ca900e91
Bill Yi [Wed, 3 Jul 2019 06:30:20 +0000 (23:30 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I6863ccbf2304c8bb2d7ee93b41386bff36e33a41
Neil Fuller [Tue, 2 Jul 2019 22:32:40 +0000 (15:32 -0700)]
Merge "Add tobiast@ to the OWNERS file" am:
a931693721
am:
46e53e770c
Change-Id: I9229928c7e9895003869752df1602ed26b42b90e
Neil Fuller [Tue, 2 Jul 2019 17:13:36 +0000 (10:13 -0700)]
Merge "Add tobiast@ to the OWNERS file"
am:
a931693721
Change-Id: Id52f2dcd3755f4fbbd6f6918e993063aebc582ac
Xin Li [Tue, 2 Jul 2019 17:04:54 +0000 (10:04 -0700)]
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (
5699924) into stage-aosp-master
am:
0a68e9bfe7 -s ours
am skip reason: subject contains skip directive
Change-Id: I075c4d89765d09a570e0150e486e85dc78772afc
Neil Fuller [Tue, 2 Jul 2019 14:27:55 +0000 (14:27 +0000)]
Merge "Add tobiast@ to the OWNERS file"
Neil Fuller [Tue, 2 Jul 2019 09:55:24 +0000 (10:55 +0100)]
Add tobiast@ to the OWNERS file
Add tobiast@ to the OWNERS file as libcore TL.
Remove pszczepaniak@ as he hasn't been on libcore
for a while.
Test: None
Change-Id: I714d3448ed60006cb58a0f49e95b7b834a6aac36
Xin Li [Mon, 1 Jul 2019 21:00:04 +0000 (21:00 +0000)]
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (
5699924) into stage-aosp-master
Bug:
134405016
Change-Id: I298dd1232c7e304b5d2cd9fda59006d08026698a
Bill Yi [Mon, 1 Jul 2019 09:42:17 +0000 (02:42 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
26a2694bd3 -s ours
am skip reason: subject contains skip directive
Change-Id: I4c83a096d556894ace12a767de72ba62f6f3f587
Bill Yi [Sun, 30 Jun 2019 21:58:27 +0000 (14:58 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I047beafb83c4c8df261fb5ac7c49dd81cb4470e0
Andrew Sapperstein [Fri, 28 Jun 2019 17:28:07 +0000 (10:28 -0700)]
Merge "Add UI for mainline modules licenses." into qt-dev
am:
72aded338a
Change-Id: I4a2b655f0a325194ec5aa242edaaf51095748bd7
Andrew Sapperstein [Fri, 28 Jun 2019 16:56:04 +0000 (16:56 +0000)]
Merge "Add UI for mainline modules licenses." into qt-dev
Winson Chung [Thu, 27 Jun 2019 23:24:53 +0000 (16:24 -0700)]
Merge "Adding unique task affinity for FallbackHome activity" into qt-dev
am:
9591c3f963
Change-Id: Ie07033339ce3ed1ee57d5ab68e56b9a51135ac77
Winson Chung [Thu, 27 Jun 2019 22:47:14 +0000 (22:47 +0000)]
Merge "Adding unique task affinity for FallbackHome activity" into qt-dev
Louis Chang [Thu, 27 Jun 2019 01:57:54 +0000 (09:57 +0800)]
Adding unique task affinity for FallbackHome activity
Settings activities were launched and resided on home task
which was originally started by FallbackHome. Adding a
unique task affinity for FallbackHome activity in order to
prevent the task being reused by other Settings activities.
Bug:
135696366
Test: starting Settings activity before FallbackHome finishes
Change-Id: I3fe41dd3b77e37236b11006dbf08727783b6a2ec
Sunny Shao [Wed, 26 Jun 2019 11:35:26 +0000 (04:35 -0700)]
Merge "Fixed the IllegalStateException on removing account" into qt-dev
am:
5a69fac694
Change-Id: I6d87742bd0925237cb73171561118e4bdd363b8a
TreeHugger Robot [Wed, 26 Jun 2019 11:15:35 +0000 (11:15 +0000)]
Merge "Fixed the IllegalStateException on removing account" into qt-dev
Antony Sargent [Wed, 26 Jun 2019 06:02:14 +0000 (23:02 -0700)]
Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev
am:
3288037bd2
Change-Id: I0edcbba1f4c19052daeb2e69c2dc36e839641d9f
TreeHugger Robot [Wed, 26 Jun 2019 05:35:29 +0000 (05:35 +0000)]
Merge "Check isWfcProvisionedOnDevice in WifiCallingSettings" into qt-dev
Andrew Sapperstein [Tue, 18 Jun 2019 16:44:18 +0000 (09:44 -0700)]
Add UI for mainline modules licenses.
Added a module licenses option that lives in Legal information settings.
Clicking that option opens module licenses page, which displays every
module by name, filtered to exclude modules without license files.
Clicking a module in the list opens HTMLViewer.
Created ModuleLicensesProvider, a new ContentProvider that serves as a
redirect for the Uris sent to HTMLViewer so that they open asset files.
In order to provide the redirect, the provider will write the license file
to a file in Settings' cache directory when the license does not exist
in the cache or is outdated. The provider then opens that cached file.
Fixes:
135183006
Test: robotests
Change-Id: I7d69da34780c8c4efb150d0c0411078c12bc80d8
Antony Sargent [Tue, 25 Jun 2019 21:01:36 +0000 (14:01 -0700)]
Check isWfcProvisionedOnDevice in WifiCallingSettings
On the SIM details page, the preference leading to a page for
configuring wifi calling will appear based on the results of the
MobileNetworkUtils#isWifiCallingEnabled helper function. That helper
uses the ImsManager to check several conditions, among them both
isWfcEnabledByPlatform and isWfcProvisionedOnDevice.
The page for configuring wifi calling has a tabbed UX, with one tab for
each active subscription that supports it. The WifiCallingSettings class
gets a list of the active subscriptions to determine which tabs to show,
and removes any that don't support wifi calling, but was only using the
isWfcEnabledByPlatform test to do so. This is a problem because the code
for showing the contents inside the tab, in WifiCallingSettingsForSub,
includes a sanity check of isWfcProvisionedOnDevice and calls finish()
if that returns false.
What this meant in practice is that if you happened to have 2
subscriptions where one returns true for both isWfcEnabledByPlatform and
isWfcProvisionedOnDevice, but the other only returned true for
isWfcEnabledByPlatform, then you'd never be able to succesfully use the
wifi calling page at all because the tab for the subscription you
*aren't* trying to configure would always call finish() early.
The right long term solution to this problem is probably to remove the
tabbed UX entirely from this page, since we probably don't need it given
the overall new multi-SIM UX. But there may still be legacy uses and
that is likely a bigger change than we want to make right now.
As a stopgap, this CL just adds a check of isWfcProvisionedOnDevice to
the code for filtering out ineligible subscriptions from the tabbed
interface, which we should have always had anyway.
Fixes:
135591718
Test: make RunSettingsRoboTests
Change-Id: I656c3d3fb30cb6fabcb86685eae38c5f0cd0c6f2
Antony Sargent [Tue, 25 Jun 2019 18:40:48 +0000 (11:40 -0700)]
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev
am:
87fadeeb4a
Change-Id: I59e0e265a5e91bed12d7e786d4fdd3043c068fed
TreeHugger Robot [Tue, 25 Jun 2019 17:54:54 +0000 (17:54 +0000)]
Merge "Add a listener for subscription changes to SimDialogFragment" into qt-dev
Bill Yi [Tue, 25 Jun 2019 15:57:36 +0000 (08:57 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
279050c8d6 -s ours
am skip reason: subject contains skip directive
Change-Id: Ibef4696cf7a55802d4a3edf66d0fb222b9089c1a
TreeHugger Robot [Tue, 25 Jun 2019 14:46:00 +0000 (14:46 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
Bill Yi [Tue, 25 Jun 2019 11:07:28 +0000 (04:07 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I275c2124cebaca1f069837b138a01b9e11f77c55
Mehdi Alizadeh [Tue, 25 Jun 2019 00:36:26 +0000 (17:36 -0700)]
Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev
am:
32d16291de
Change-Id: I96cbfd9d4e7b3b96f6977958861ae913dfa5e8ec
Mehdi Alizadeh [Tue, 25 Jun 2019 00:09:06 +0000 (00:09 +0000)]
Merge "Adds metrics categories for gesture navigation dialogs" into qt-dev
Hai Zhang [Mon, 24 Jun 2019 21:28:54 +0000 (14:28 -0700)]
Merge "Revert "Add special apps access settings page for financial app."" into qt-dev
am:
b39810f5ab
Change-Id: I8ab0452cd656d25afe164dec49553512decfdcec
TreeHugger Robot [Mon, 24 Jun 2019 21:19:17 +0000 (21:19 +0000)]
Merge "Revert "Add special apps access settings page for financial app."" into qt-dev
Hai Zhang [Fri, 21 Jun 2019 20:54:29 +0000 (20:54 +0000)]
Revert "Add special apps access settings page for financial app."
This reverts commit
43374eabb8669b79c734da49177b9ed1a7651237.
Reason for revert: No longer needed because we are using whitelist for
SMS permission
Fixes:
135213238
Test: presubmit
Change-Id: I182be4a1136521f325866e70e875439c17816ef2
Mehdi Alizadeh [Fri, 21 Jun 2019 01:12:11 +0000 (18:12 -0700)]
Adds metrics categories for gesture navigation dialogs
Bug:
135211145
Test: Builds
Change-Id: I9231778072bb222142fca09275cd84b87a263fa6
Fabian Kozynski [Mon, 24 Jun 2019 19:49:38 +0000 (12:49 -0700)]
Merge "Fix Dark theme case" into qt-dev
am:
5bfb9f3240
Change-Id: I3970a16198bb1d023fdd62840e7078883d4726c5
Fabian Kozynski [Mon, 24 Jun 2019 19:03:16 +0000 (19:03 +0000)]
Merge "Fix Dark theme case" into qt-dev
Antony Sargent [Wed, 19 Jun 2019 18:30:33 +0000 (11:30 -0700)]
Add a listener for subscription changes to SimDialogFragment
For some kinds of telephony changes that might happen while we're
already showing one of these dialogs, we already get sent a new intent
for the dialog which we internally convert into a refresh of the dialog
contents instead of stacking a new copy on top of the old one.
But it turns out there are some other cases where the telephony stack
doesn't send a new intent for the dialog but *does* send a change event
through the SubscriptionManager, and we want to respond to those as
well. This CL adds a listener for those events.
Fixes:
135276696
Test: make RunSettingsRoboTests
Change-Id: Ifb93ae95f45fda5831e112306dd9361ccaa5119c
(cherry picked from commit
6a1d7e60ac3593ce46c12dab0066a10149ca4aac)
Fabian Kozynski [Mon, 24 Jun 2019 14:07:17 +0000 (10:07 -0400)]
Fix Dark theme case
Test: manual
Fixes:
135711083
Change-Id: I91941466b98bbb08d17897784d90a4f467b4de5f
Julia Reynolds [Fri, 21 Jun 2019 17:15:12 +0000 (10:15 -0700)]
Remove dead code
am:
ab63fd3c25
Change-Id: Ie0ff97b0db868f4f5aff19c4d8da2a8fc2a5717d
Julia Reynolds [Thu, 20 Jun 2019 12:51:11 +0000 (08:51 -0400)]
Remove dead code
Test: try to search 'gentle'
Fixes:
135640138
Change-Id: If03703e59f77206da08fc80e88bb986f821c18fe
Ivan Podogov [Thu, 20 Jun 2019 22:34:39 +0000 (15:34 -0700)]
Fix Settings crash when trying to show work policy info
am:
242ff568d1
Change-Id: I2a048e75934dda54d4b495908f07016e9c00b674
Ivan Podogov [Thu, 20 Jun 2019 15:01:29 +0000 (16:01 +0100)]
Fix Settings crash when trying to show work policy info
This fixes an exception in startActivity() call:
"android.util.AndroidRuntimeException: Calling startActivity() from outside of
an Activity context requires the FLAG_ACTIVITY_NEW_TASK flag. Is this really
what you want?"
Bug:
132904820
Test: manual
Change-Id: I0c687ea76068778554b072b6cc8274352de6fa28
Raff Tsai [Thu, 20 Jun 2019 05:57:25 +0000 (22:57 -0700)]
Merge "Cannot switch between multiple TTS engines" into qt-dev
am:
753215fff9
Change-Id: I5d399c7f653caf53041f1136948f4a8de457d7c5
TreeHugger Robot [Thu, 20 Jun 2019 04:42:23 +0000 (04:42 +0000)]
Merge "Cannot switch between multiple TTS engines" into qt-dev
Arc Wang [Thu, 20 Jun 2019 02:38:57 +0000 (19:38 -0700)]
Merge "[Wi-Fi DPP] Wi-Fi QR code scanner is not working after a connection fail" into qt-dev
am:
d64b6c8846
Change-Id: Icfa3b21e383182a127a1e633a671013c371ab105
Arc Wang [Thu, 20 Jun 2019 01:34:09 +0000 (01:34 +0000)]
Merge "[Wi-Fi DPP] Wi-Fi QR code scanner is not working after a connection fail" into qt-dev
Arc Wang [Wed, 19 Jun 2019 17:14:55 +0000 (10:14 -0700)]
Merge "[Wi-Fi DPP] Support WPA2/WPA3 transition mode" into qt-dev
am:
d8916ef151
Change-Id: I360ff827ae8544d76c4411410172ace81bbcef56
TreeHugger Robot [Wed, 19 Jun 2019 16:54:35 +0000 (16:54 +0000)]
Merge "[Wi-Fi DPP] Support WPA2/WPA3 transition mode" into qt-dev
Raff Tsai [Wed, 19 Jun 2019 08:21:20 +0000 (16:21 +0800)]
Cannot switch between multiple TTS engines
That is caused by layout xml changes. The radio button was clickable
in old xml resource. But it is not clickable in new xml resource.
Therefore we can't receive click callback. Fixed by changing
Radio button state when preference is clicked.
Fixes:
135285101
Test: manual, make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.tts"
Change-Id: Idd7bf37d9ccbc1b56d41978d19dc05c8a81cc49a
Malcolm Chen [Wed, 19 Jun 2019 03:29:39 +0000 (20:29 -0700)]
Merge "Replace isSubscriptionEnabled with isActiveSubId." into qt-dev
am:
0304f4d1ce
Change-Id: I3a78fe154d3861c779365d1e611ac8c559861a10
Matthew Fritze [Wed, 19 Jun 2019 03:23:30 +0000 (20:23 -0700)]
Merge "MobileData slice should be null if not-actionable" into qt-dev
am:
e2ab7540a3
Change-Id: If562aec8635ab4d56ff5016eea5d19d2a96e2383