OSDN Git Service
Kevin Chyn [Fri, 26 Jul 2019 19:35:33 +0000 (12:35 -0700)]
Merge "Do not request cancel authentication unless currently authenticating" into qt-r1-dev
am:
ba4fad160d
Change-Id: Iea3b2552097a1decd9dc106e3a31d71d772ab1d6
Kevin Chyn [Fri, 26 Jul 2019 19:15:50 +0000 (19:15 +0000)]
Merge "Do not request cancel authentication unless currently authenticating" into qt-r1-dev
Bill Yi [Fri, 26 Jul 2019 18:22:31 +0000 (11:22 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am:
8b9c85f0cd -s ours
am skip reason: subject contains skip directive
Change-Id: I764355107924ecc67919bfbd1b134017aa07d5ca
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
TreeHugger Robot [Fri, 26 Jul 2019 17:39:58 +0000 (17:39 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
Bill Yi [Fri, 26 Jul 2019 01:34:18 +0000 (18:34 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I84fe706da2873676a567287114abc4e6a27c158c
Peiyong Lin [Thu, 25 Jul 2019 00:26:08 +0000 (17:26 -0700)]
Remove prerelease driver option from Settings UI. am:
c2dfba01ca
am:
546b4220c5
Change-Id: I74a7f4cbea9d0ea015cc6b69b8dfa304ed82e6db
Peiyong Lin [Thu, 25 Jul 2019 00:25:16 +0000 (17:25 -0700)]
Remove prerelease driver option from Settings UI. am:
c2dfba01ca
am:
7c5bb0ecda
Change-Id: I17a752824ea403089efdf971aec87361aaacad39
Peiyong Lin [Wed, 24 Jul 2019 23:59:33 +0000 (16:59 -0700)]
Remove prerelease driver option from Settings UI.
am:
c2dfba01ca
Change-Id: Ia0f23e48d9ed4ad10d01bebe23d4b8cdd62458c3
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
Raff Tsai [Wed, 24 Jul 2019 12:20:42 +0000 (05:20 -0700)]
Fix crash after uninstalling app
am:
637d419157
Change-Id: I48bf6ceb772fb5ebd1f6ebf8cff12ea664f963c5
Raff Tsai [Fri, 28 Jun 2019 10:17:14 +0000 (18:17 +0800)]
Fix crash after uninstalling app
updateState was invoked in loader callback. But the
package was uninstalled at the callback time caused
null pointer exception. Add null check to prevent
null pointer access.
Fixes:
136170218
Fixes:
133771724
Test: make RunSettingsRoboTests, manual
Change-Id: I2715e77f6e32af42a4bce70c9f409b0311eb36c4
(cherry picked from commit
790a822526251236af196c3ae17f1990c75fb133)
Joshua Mccloskey [Wed, 24 Jul 2019 04:13:01 +0000 (21:13 -0700)]
Merge "Add extra check for accessibility flow." into qt-r1-dev
am:
c563fbb979
Change-Id: Ib0edf21c01d3e2086f61b80079e9efe5c2b231aa
Lucas Lin [Wed, 24 Jul 2019 04:10:21 +0000 (21:10 -0700)]
Merge "Create a string for private DNS "On"" am:
a64f8d9521 am:
903e8dac6c
am:
c30cdecfba
Change-Id: I0384e4169df9a0efa423a0f2bae783ee5212e5b8
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""
Joshua Mccloskey [Tue, 23 Jul 2019 23:54:38 +0000 (23:54 +0000)]
Merge "Add extra check for accessibility flow." into qt-r1-dev
Bill Yi [Tue, 23 Jul 2019 22:17:31 +0000 (15:17 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
fe36dd6834 -s ours
am skip reason: subject contains skip directive
Change-Id: I21a0fe6886a4232bcb526dc8ade1dde41a7d0b72
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
Bill Yi [Tue, 23 Jul 2019 20:19:18 +0000 (13:19 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I81487d87626426a7b7a969314691a6ce1177df4b
joshmccloskey [Tue, 23 Jul 2019 00:10:55 +0000 (17:10 -0700)]
Add extra check for accessibility flow.
Bug:
138197084
Test: Verified other accessibility features like Live Transcribe does
not bring the user to the accessibility flow.
Test: Verified that the Sound Amplifier does not bring the user to
the accessibility flow.
Change-Id: I5131d74926c0b01c565da280c55afe0080855688
Android Build Merger (Role) [Tue, 23 Jul 2019 16:47:17 +0000 (16:47 +0000)]
Merge "Merge "Support new regulatory label for location" into qt-dev am:
28736bee5d am:
920f6109a8" into qt-r1-dev-plus-aosp
Yanting Yang [Tue, 23 Jul 2019 16:46:44 +0000 (09:46 -0700)]
Merge "Support new regulatory label for location" into qt-dev am:
28736bee5d
am:
c453af3f91
Change-Id: Iba9e810217cc4eee6c791eda6e3c100a851e9aa5
Yanting Yang [Tue, 23 Jul 2019 16:46:43 +0000 (09:46 -0700)]
Merge "Support new regulatory label for location" into qt-dev am:
28736bee5d
am:
920f6109a8
Change-Id: I22c607437953b5f87fa30d5f53715535ab2e363c
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
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: I0a966698855aa935b6acbf3829988d5004ff57e2
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
Sunny Shao [Tue, 23 Jul 2019 10:36:02 +0000 (03:36 -0700)]
Merge "Use the date format to show the system update info" into qt-r1-dev
am:
a076039803
Change-Id: I12eab14b3a406348d13436df5843727f0dccf71d
TreeHugger Robot [Tue, 23 Jul 2019 10:07:36 +0000 (10:07 +0000)]
Merge "Use the date format to show the system update info" into qt-r1-dev
Mehdi Alizadeh [Mon, 22 Jul 2019 23:52:52 +0000 (16:52 -0700)]
Merge "Removes logic to disable gesture nav when default home app changes" into qt-r1-dev
am:
66b0cabf26
Change-Id: I6ea0fe769b52345b8f148547d7950af9203c9926
Mehdi Alizadeh [Mon, 22 Jul 2019 23:17:48 +0000 (23:17 +0000)]
Merge "Removes logic to disable gesture nav when default home app changes" into qt-r1-dev
Android Build Merger (Role) [Mon, 22 Jul 2019 20:12:47 +0000 (20:12 +0000)]
Merge "[automerger skipped] Import translations. DO NOT MERGE am:
7d966975ad -s ours am:
6e57d54d35 -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
Bill Yi [Mon, 22 Jul 2019 20:12:26 +0000 (13:12 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
7d966975ad -s ours
am:
6e57d54d35 -s ours
am skip reason: subject contains skip directive
Change-Id: I7b25739458d86c2291f923e4c0521cfcaecd1744
Bill Yi [Mon, 22 Jul 2019 20:12:00 +0000 (13:12 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
7d966975ad -s ours
am:
57b150fedd -s ours
am skip reason: subject contains skip directive
Change-Id: Ibef3a3f53cd897709dd8053f54c1179481e8a91e
Bill Yi [Mon, 22 Jul 2019 19:53:25 +0000 (12:53 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
7d966975ad -s ours
am skip reason: subject contains skip directive
Change-Id: I494a50f37bc0ae4d4d7979756fc067f575057224
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 19:24:56 +0000 (12:24 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
04a6245af9 -s ours
am skip reason: subject contains skip directive
Change-Id: I59b9117b3767daeddfd91a10a490b46e4bb2b9d7
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
Bill Yi [Mon, 22 Jul 2019 17:37:18 +0000 (10:37 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: If2b98e7c7fadad3c2fb18275ed458da76e9cc7ac
Sunny Shao [Fri, 12 Jul 2019 09:19:41 +0000 (17:19 +0800)]
Use the date format to show the system update info
Use the "July 13, 2019" or similar to display if the value is a valid
date data.
Bug:
137089104
Test: visual test & robotest
Change-Id: Ie4bab2617c1cd6fd956bf6d1a22ce96e6b0b58d0
Merged-In: Ie4bab2617c1cd6fd956bf6d1a22ce96e6b0b58d0
(cherry picked from commit
162e88c262055b9e8bca20833dee1f5ebdb540a5)
Bill Yi [Fri, 19 Jul 2019 21:04:20 +0000 (14:04 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
efc7ac061c -s ours
am skip reason: subject contains skip directive
Change-Id: Id1ff8188cc1638770dffc0d2f3eabbbd5660b73a
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 [Fri, 19 Jul 2019 17:23:51 +0000 (10:23 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I9ce6d671fe6587af26ea31b711da0d4594433ee6
Antony Sargent [Fri, 19 Jul 2019 02:57:18 +0000 (19:57 -0700)]
Merge "Make MobileNetworkActivity support onNewIntent" into qt-r1-dev
am:
20ec6a4b6f
Change-Id: I72317d0d45103cbc4791e1f9d67e726d7426b758
TreeHugger Robot [Fri, 19 Jul 2019 02:26:19 +0000 (02:26 +0000)]
Merge "Make MobileNetworkActivity support onNewIntent" into qt-r1-dev
Mehdi Alizadeh [Thu, 18 Jul 2019 22:27:05 +0000 (15:27 -0700)]
Removes logic to disable gesture nav when default home app changes
Bug:
137197916
Test: Manual test with setting a 3P launcher as default
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationGestureSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=RadioButtonPreferenceWithExtraWidgetTest
Change-Id: Id397cfa1c2439222aa21a7b7fe5f69818bf1fe97
Android Build Merger (Role) [Thu, 18 Jul 2019 21:33:57 +0000 (21:33 +0000)]
Merge "[automerger skipped] Import translations. DO NOT MERGE am:
e73e59c562 -s ours am:
1f4b32a154 -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
Bill Yi [Thu, 18 Jul 2019 21:33:35 +0000 (14:33 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
e73e59c562 -s ours
am:
1f4b32a154 -s ours
am skip reason: subject contains skip directive
Change-Id: I000d7b47e58b2238e6969ae321aa09d170555d5d
Bill Yi [Thu, 18 Jul 2019 21:33:33 +0000 (14:33 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
e73e59c562 -s ours
am:
ad2542c534 -s ours
am skip reason: subject contains skip directive
Change-Id: I5738457ce2d693b01b1368dc17987ee77de9a33d
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 21:24:36 +0000 (14:24 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
56887f467c -s ours
am skip reason: subject contains skip directive
Change-Id: I0f83f2ea5a5f6fdd6659a9113b7561ea63ebf097
Bill Yi [Thu, 18 Jul 2019 21:24:35 +0000 (14:24 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
e73e59c562 -s ours
am skip reason: subject contains skip directive
Change-Id: I888c9b99282dcccfe58db799c1c02ceed4b63747
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 [Thu, 18 Jul 2019 18:07:45 +0000 (11:07 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id43eff8bedf9c1bd2d3d25a73a560705ab8da213
Kevin Chang [Thu, 18 Jul 2019 07:53:55 +0000 (00:53 -0700)]
Merge "Add footer preference into caption preferences" into qt-r1-dev
am:
5fc6db2cf7
Change-Id: I02eb493be2b958b766f06d85dde7aabcc1230a68
Kevin Chang [Thu, 18 Jul 2019 07:53:02 +0000 (00:53 -0700)]
Merge "Add new reminder in "Magnify with shortcut" page" into qt-r1-dev
am:
6bfc381173
Change-Id: Ic0b481b5306a91c58f1aeea4cb125874d6b77d2e
Kevin Chang [Thu, 18 Jul 2019 07:52:00 +0000 (00:52 -0700)]
Merge "UI change in caption preferences in Settings" into qt-r1-dev
am:
af447c17b8
Change-Id: I5b669681267875963d9b91471bdb63a57b1c84b0
Kevin Chang [Thu, 18 Jul 2019 06:59:47 +0000 (06:59 +0000)]
Merge "Add footer preference into caption preferences" into qt-r1-dev
Kevin Chang [Thu, 18 Jul 2019 06:59:45 +0000 (06:59 +0000)]
Merge "Add new reminder in "Magnify with shortcut" page" into qt-r1-dev
Kevin Chang [Thu, 18 Jul 2019 06:59:41 +0000 (06:59 +0000)]
Merge "UI change in caption preferences in Settings" into qt-r1-dev
Kevin Chang [Mon, 1 Jul 2019 06:51:36 +0000 (14:51 +0800)]
Add footer preference into caption preferences
Add footer preference into caption preferences to tell users
that the setting doesn't support all apps.
Reference link of screenshot:
https://drive.google.com/file/d/1VzpWa4M-4HjlfjDNNqrEIKwo3v0y_f51/view?usp=sharing
Bug:
135888603
Test: Visual
Change-Id: I95e0aa301eba7343fbc798cc406c0242f4f4eb7e
Merged-In: I95e0aa301eba7343fbc798cc406c0242f4f4eb7e
(cherry picked from commit
8f4b8b9a744ff139bcc4ff1763c9fb5c8337280a)
Kevin Chang [Tue, 18 Jun 2019 07:18:23 +0000 (15:18 +0800)]
Add new reminder in "Magnify with shortcut" page
Add new reminder string in "Magnify with shortcut" page when
it's under gesture navigation mode.
Reference link of screenshot:
https://drive.google.com/file/d/1uo31FZebhXKcCR8QY_WrgEPiInzARmIl/view?usp=sharing
Bug:
134645913
Test: Visual
Change-Id: Ibbaa162d4acf0fdeed8c98b2aa1d83953880e6a6
Merged-In: Ibbaa162d4acf0fdeed8c98b2aa1d83953880e6a6
Kevin Chang [Thu, 23 May 2019 06:30:23 +0000 (14:30 +0800)]
UI change in caption preferences in Settings
Move the switch after the caption preview and change the oreder of the
settings inside in caption preferences in Accessibility settings.
Reference link for screenshot:
https://drive.google.com/file/d/1EQLpfQFnJTwU1F8vLAOSHPYqSXKWL_ap/view?usp=sharing
Bug:
130755332
Test: Visual
Change-Id: Icb4dabdef71be165a21d1bde474872ee0bb35bfa
Merged-In: Icb4dabdef71be165a21d1bde474872ee0bb35bfa
(cherry picked from commit
fd1f1c0f82f046a1f250e96ce221aa29b4984c5a)
Antony Sargent [Tue, 16 Jul 2019 00:11:19 +0000 (17:11 -0700)]
Make MobileNetworkActivity support onNewIntent
The launchMode for MobileNetworkActivity specified in the android
manifest is "singleTask", which means that when an intent to it is
launched, if there is an existing instance we will reuse that instead of
creating a new one. But to handle this properly we need to know when it
happens by implementing onNewIntent, which we weren't doing.
Implementing this fixes a bug we noticed that if you have multiple SIMs
and recently visit the details page for SIM 1 but then click on a SIM
selection notification that should bring you to the details for SIM 2,
we'd just bring up the details page for SIM 1 again.
Fixes:
133447239
Test: make RunSettingsRoboTests
Change-Id: Ia9106b15ffde437f6dd6fd2da23336ec5b28f75e
Joshua Mccloskey [Mon, 15 Jul 2019 20:10:52 +0000 (13:10 -0700)]
Merge "Fixed Settings Crash" into qt-r1-dev
am:
800e8a485f
Change-Id: If6bba47ee6c16b035453c5f4a3fee38c0b1a0a1a
Joshua Mccloskey [Mon, 15 Jul 2019 19:40:23 +0000 (19:40 +0000)]
Merge "Fixed Settings Crash" into qt-r1-dev
Android Build Merger (Role) [Mon, 15 Jul 2019 08:28:50 +0000 (08:28 +0000)]
Merge "[automerger skipped] Import translations. DO NOT MERGE am:
8d229d7090 -s ours am:
09be23ffaa -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
Bill Yi [Mon, 15 Jul 2019 08:28:32 +0000 (01:28 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
8d229d7090 -s ours
am:
09be23ffaa -s ours
am skip reason: subject contains skip directive
Change-Id: I9d171a15cab4e4ce14376567126ccc0fd4d30d86
Bill Yi [Mon, 15 Jul 2019 08:28:12 +0000 (01:28 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
8d229d7090 -s ours
am:
7903044b2b -s ours
am skip reason: subject contains skip directive
Change-Id: Ifdcebac440af1d2a114637d9ddbc32661ef4f46a
Bill Yi [Mon, 15 Jul 2019 08:21:17 +0000 (01:21 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
8d229d7090 -s ours
am skip reason: subject contains skip directive
Change-Id: I4989ac93f690299f130945cc4b2ae4984974345f
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
Bill Yi [Mon, 15 Jul 2019 04:40:54 +0000 (21:40 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
941e94d689 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib4ce2d83d5967669ab5ecf18eca8af89bc63b2b1
Bill Yi [Sun, 14 Jul 2019 05:19:58 +0000 (22:19 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id33f437d9b802519be1544de7616b3a5b0528680
joshmccloskey [Fri, 12 Jul 2019 20:17:37 +0000 (13:17 -0700)]
Fixed Settings Crash
Fixes:
137319680
Test: Manual
Change-Id: I0e22bd561787b1a141bf2e3060b23fe70a6d96ce
Android Build Merger (Role) [Fri, 12 Jul 2019 04:11:01 +0000 (04:11 +0000)]
Merge "Merge "Fix erasing of eSIMs for some devices" into qt-dev am:
1f942d9857 am:
8c6b2bafb0" into qt-r1-dev-plus-aosp
Andrew Sapperstein [Fri, 12 Jul 2019 04:10:41 +0000 (21:10 -0700)]
Merge "Fix erasing of eSIMs for some devices" into qt-dev am:
1f942d9857
am:
44f731c1c7
Change-Id: I34bb2383b9f14e624ab93caa0108d2a2510f4439
Andrew Sapperstein [Fri, 12 Jul 2019 04:10:39 +0000 (21:10 -0700)]
Merge "Fix erasing of eSIMs for some devices" into qt-dev am:
1f942d9857
am:
8c6b2bafb0
Change-Id: I07c20368230159ea28af24c95087e74a3e830ab5
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:51:32 +0000 (20:51 -0700)]
Merge "Fix erasing of eSIMs for some devices" into qt-dev
am:
1f942d9857
Change-Id: I44e11b7a63c329883b01dc03f820e807c15953cf
Andrew Sapperstein [Fri, 12 Jul 2019 03:13:39 +0000 (03:13 +0000)]
Merge "Fix erasing of eSIMs for some devices" into qt-dev
joshmccloskey [Thu, 11 Jul 2019 21:56:10 +0000 (14:56 -0700)]
Ensure feature is supported and enabled.
am:
a96a84e256
Change-Id: I5a1870ed55326fb9e8a5616ffa279bccc42b04ff
joshmccloskey [Thu, 11 Jul 2019 20:08:02 +0000 (13:08 -0700)]
Ensure feature is supported and enabled.
Fixes:
137285390
Test: Verified that SecuritySettings no longer crashes.
Test: Verified that this PrefenceController no longer shows up
if the device does not support it.
Test: Verified that this PreferenceController no longer
shows up when the work profile is disabled.
Change-Id: I10f015e18491b203db6f942f07034d55f620cfe5
joshmccloskey [Thu, 11 Jul 2019 21:08:02 +0000 (14:08 -0700)]
Update FaceSlice to use correct pref & FaceManager
am:
365beaebdb
Change-Id: I3762f68d4f16ad529ad7a1cc56891812daad7016
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
joshmccloskey [Tue, 9 Jul 2019 22:34:55 +0000 (15:34 -0700)]
Update FaceSlice to use correct pref & FaceManager
Fixes:
137137134
Test: Manual.
Change-Id: Idc707a7d2009975f81902867e4c37a8ee5775700
Android Build Merger (Role) [Thu, 11 Jul 2019 10:16:49 +0000 (10:16 +0000)]
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am:
433e625341 -s ours am:
3e9da03d0c -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
Bill Yi [Thu, 11 Jul 2019 10:16:28 +0000 (03:16 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am:
433e625341 -s ours
am:
3e9da03d0c -s ours
am skip reason: subject contains skip directive
Change-Id: I59f8af945535b6aae8ab1a286816fdff2b0addbf
Bill Yi [Thu, 11 Jul 2019 10:16:27 +0000 (03:16 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am:
433e625341 -s ours
am:
1da3bf10bf -s ours
am skip reason: subject contains skip directive
Change-Id: I1550a0d712b5b8853292e5f05ffda2b4d4a90bff
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: Ic5c4e1030a1f9907e3274be1a14c49d30783d839
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
Android Build Merger (Role) [Thu, 11 Jul 2019 08:12:38 +0000 (08:12 +0000)]
Merge "Improve Settings launch performance am:
496d3f6f9c am:
edd86364f5" into qt-r1-dev-plus-aosp
tmfang [Thu, 11 Jul 2019 08:12:18 +0000 (01:12 -0700)]
Improve Settings launch performance am:
496d3f6f9c
am:
49d575b91c
Change-Id: I544556c17a56dd1e36efded7ae565fa7d97fa8ba
tmfang [Thu, 11 Jul 2019 08:12:16 +0000 (01:12 -0700)]
Improve Settings launch performance am:
496d3f6f9c
am:
edd86364f5
Change-Id: I1a90c8c49d6f226997e59b9af4518b93b7194e93
tmfang [Thu, 11 Jul 2019 07:54:14 +0000 (00:54 -0700)]
Improve Settings launch performance
am:
496d3f6f9c
Change-Id: I16eb11d8850cbd75dd3571d16fce5758e5280bfd
tmfang [Thu, 11 Jul 2019 07:54:14 +0000 (00:54 -0700)]
Improve Settings launch performance
am:
496d3f6f9c
Change-Id: I5256fa0c04af07108b76cf21e9558b03d499e883
Bill Yi [Thu, 11 Jul 2019 07:04:07 +0000 (00:04 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
fa674d85ae -s ours
am skip reason: subject contains skip directive
Change-Id: I60b58f9eb359488be6f3881f8e927131da2caf0e
OSDN Git Service
