Jeff Sharkey
19fa568b39
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours
...
am: 45fc104958
2017-10-18 18:29:15 +00:00
Jeff Sharkey
5b2a431787
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
am: 4cfc684346
2017-10-18 18:28:28 +00:00
Pavel Grafov
51f15da8e6
Preserve old password when handling SET_NEW_PASSWORD.
...
am: 40e187b364
2017-10-17 17:33:23 +00:00
Pavel Grafov
40e187b364
Preserve old password when handling SET_NEW_PASSWORD.
...
Currently the only way mUserPassword can be set is when it comes
from onActivityResult. This way when the user chooses "Continue
without Pixel Imprint", and we switch ChooseLockGeneric->InternalActivity,
mUserPassword becomes null (it is not preserved in intent extras).
And then this null is used in getLockPasswordIntent which causes the issue.
Another issues is that when the user chooses to use fingerprint,
mHasChallenge is set to true and password is not forwarded to
ChooseLock(Password|Pattern). I changed the intent builders so that both
old password and challenge can be sent at the same time, so the password
is not lost when fingerprint is set.
Bug: 67672081
Test: cd packages/apps/Settings/tests/robotests/ && mma
Test: manual, adb shell am start -a android.app.action.SET_NEW_PASSWORD,
tried setting pin/password with and without fingerprint.
Test: manual, tried to change lock via Settings -> Security&Location
Test: manual, set pin + fingerprint in Setup Wizard, FBE and FDE devices
Test: manual, set pin + added account, used pin to unlock FRP in SUW
Change-Id: I38d56d84f95c63fef24c2aa1a031d629f22756a1
2017-10-17 13:19:35 +01:00
Cai, Min1
84a60e3cf3
Merge "Refresh payment preference while resume" am: 05650bb3da am: 088baf348b
...
am: f523ca10aa
2017-10-16 19:59:50 +00:00
Cai, Min1
f523ca10aa
Merge "Refresh payment preference while resume" am: 05650bb3da
...
am: 088baf348b
2017-10-16 19:41:44 +00:00
Cai, Min1
088baf348b
Merge "Refresh payment preference while resume"
...
am: 05650bb3da
2017-10-16 19:29:33 +00:00
Maurice Lam
c03cf0092e
resolve merge conflicts of f36b25c2df to stage-aosp-master am: d4621f6302
...
am: 0e1c486e74
2017-10-16 19:25:57 +00:00
Maurice Lam
0e1c486e74
resolve merge conflicts of f36b25c2df to stage-aosp-master
...
am: d4621f6302
2017-10-16 19:22:12 +00:00
Maurice Lam
d4621f6302
resolve merge conflicts of f36b25c2df to stage-aosp-master
...
Test: Existing tests pass
Merged-In: I8f6219ab22abad98111f016d633bf100dc3222ce
Change-Id: I6e021d1156686aa30bdc051f1fefe16b5c619b80
2017-10-16 18:31:40 +00:00
Daniel Nishi
ab80b6ee9c
Merge "Fix PrivateVolumeSettings be launched repeatedly" am: 31a7b2a4c7 am: 5973d32c77
...
am: f1dc9e65f1
2017-10-15 04:30:40 +00:00
Daniel Nishi
f1dc9e65f1
Merge "Fix PrivateVolumeSettings be launched repeatedly" am: 31a7b2a4c7
...
am: 5973d32c77
2017-10-15 03:59:02 +00:00
Daniel Nishi
5973d32c77
Merge "Fix PrivateVolumeSettings be launched repeatedly"
...
am: 31a7b2a4c7
2017-10-15 03:47:13 +00:00
Doris Ling
15d06244d3
Update tile limit for Sound settings.
...
am: 893bdba206
2017-10-15 02:43:43 +00:00
Treehugger Robot
05650bb3da
Merge "Refresh payment preference while resume"
2017-10-13 23:10:13 +00:00
Treehugger Robot
f36b25c2df
Merge "There is no NEXT button in find sensor screen of fingerprint."
2017-10-13 21:45:18 +00:00
Doris Ling
893bdba206
Update tile limit for Sound settings.
...
Pull the notification and alarm ringtone out of the preference category
and update the tile limit to 1, so that only the first preference
category will be displayed initially.
Change-Id: I9ae7669fb2b688560a3fc228274ea44f225b262f
Fixes: 67750626
Test: visual
2017-10-13 11:45:30 -07:00
Daniel Nishi
31a7b2a4c7
Merge "Fix PrivateVolumeSettings be launched repeatedly"
2017-10-13 17:52:58 +00:00
Glen Kuhne
91aeed6f55
Merge "Allow 64 char HEX string PSKs in WifiSettingsUi" into oc-mr1-dev
...
am: 85f59ff42d
2017-10-12 19:02:55 +00:00
TreeHugger Robot
85f59ff42d
Merge "Allow 64 char HEX string PSKs in WifiSettingsUi" into oc-mr1-dev
2017-10-12 18:54:43 +00:00
Cai, Min1
0b97d35478
Refresh payment preference while resume
...
To show latest payment service list on Tap&pay menu.
Test: install payment service and go back to Tap&pay menu
Bug: 67718335
Change-Id: I6f421176b9c461898224b50d06f67a49645f0d18
2017-10-12 01:12:14 +00:00
Jeff Sharkey
45fc104958
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
am: 5ef2cfac97
2017-10-11 23:03:25 +00:00
Jeff Sharkey
25d86653b4
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e am: 86cc9a681d am: d721694b79 am: 2433b6dc44 am: e803004863 -s ours am: 952ae3ec34 am: 8b399b3eb7
...
am: e9aa79dd1f
2017-10-11 22:50:08 +00:00
Jeff Sharkey
dfb5966d0c
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3 am: 3aa36a6afb am: 250d5e60b0 -s ours am: 0f53a56cbd am: 9138455b41
...
am: 1ddfd32006
2017-10-11 22:48:33 +00:00
Jeff Sharkey
920ca35d48
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e am: 86cc9a681d am: d721694b79 am: 2433b6dc44 am: e803004863 -s ours am: 952ae3ec34 am: 8b399b3eb7
...
am: 1c4d686b0c
2017-10-11 22:40:15 +00:00
Jeff Sharkey
5477a61da6
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3 am: 3aa36a6afb am: 250d5e60b0 -s ours am: 0f53a56cbd am: 9138455b41
...
am: dcd1c0dde1
2017-10-11 22:38:38 +00:00
Bill Yi
448638a650
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: c43238e7f4
2017-10-11 22:37:09 +00:00
Jeff Sharkey
85a79da59e
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf am: 979efb53d0 am: fe1daa6eda am: efe9e7e003 -s ours am: 47bc5fba05 am: 4d61a1bd15
...
am: 91719dc7bd
2017-10-11 22:36:31 +00:00
Jeff Sharkey
cc83075f0e
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d am: 0bcee25346 am: 46bc2bd7bd -s ours am: b410435a21 am: de7c312543
...
am: fb1bd3b2c6
2017-10-11 22:35:01 +00:00
Jeff Sharkey
a9e21a2864
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am: 9c39da39df am: f4e2e26064
...
am: d563d23d26
2017-10-11 22:33:45 +00:00
Jeff Sharkey
e9aa79dd1f
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e am: 86cc9a681d am: d721694b79 am: 2433b6dc44 am: e803004863 -s ours am: 952ae3ec34
...
am: 8b399b3eb7
2017-10-11 22:25:38 +00:00
Jeff Sharkey
1ddfd32006
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3 am: 3aa36a6afb am: 250d5e60b0 -s ours am: 0f53a56cbd
...
am: 9138455b41
2017-10-11 22:23:51 +00:00
Jeff Sharkey
1c4d686b0c
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e am: 86cc9a681d am: d721694b79 am: 2433b6dc44 am: e803004863 -s ours am: 952ae3ec34
...
am: 8b399b3eb7
2017-10-11 22:19:18 +00:00
Jeff Sharkey
dcd1c0dde1
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3 am: 3aa36a6afb am: 250d5e60b0 -s ours am: 0f53a56cbd
...
am: 9138455b41
2017-10-11 22:17:49 +00:00
TreeHugger Robot
c43238e7f4
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-10-11 22:16:37 +00:00
Jeff Sharkey
8b399b3eb7
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e am: 86cc9a681d am: d721694b79 am: 2433b6dc44 am: e803004863 -s ours
...
am: 952ae3ec34
2017-10-11 22:02:29 +00:00
Jeff Sharkey
9138455b41
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3 am: 3aa36a6afb am: 250d5e60b0 -s ours
...
am: 0f53a56cbd
2017-10-11 22:00:24 +00:00
Jeff Sharkey
91719dc7bd
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf am: 979efb53d0 am: fe1daa6eda am: efe9e7e003 -s ours am: 47bc5fba05
...
am: 4d61a1bd15
2017-10-11 21:47:52 +00:00
Jeff Sharkey
fb1bd3b2c6
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d am: 0bcee25346 am: 46bc2bd7bd -s ours am: b410435a21
...
am: de7c312543
2017-10-11 21:46:44 +00:00
Jeff Sharkey
d563d23d26
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am: 9c39da39df
...
am: f4e2e26064
2017-10-11 21:45:11 +00:00
Jeff Sharkey
952ae3ec34
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e am: 86cc9a681d am: d721694b79 am: 2433b6dc44
...
am: e803004863
2017-10-11 21:42:57 +00:00
Jeff Sharkey
0f53a56cbd
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3 am: 3aa36a6afb
...
am: 250d5e60b0
2017-10-11 21:42:14 +00:00
Jeff Sharkey
1c91c0c801
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf am: 979efb53d0 am: fe1daa6eda am: efe9e7e003 -s ours am: 47bc5fba05 am: 4d61a1bd15
...
am: 09112f231c
2017-10-11 21:35:26 +00:00
Jeff Sharkey
e803004863
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e am: 86cc9a681d am: d721694b79
...
am: 2433b6dc44
2017-10-11 21:34:11 +00:00
Jeff Sharkey
c2198532bf
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d am: 0bcee25346 am: 46bc2bd7bd -s ours am: b410435a21 am: de7c312543
...
am: c1574a1ef8
2017-10-11 21:33:51 +00:00
Jeff Sharkey
250d5e60b0
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3
...
am: 3aa36a6afb
2017-10-11 21:33:01 +00:00
Jeff Sharkey
f70906f2da
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am: 9c39da39df am: f4e2e26064
...
am: 8bdd94e292
2017-10-11 21:32:33 +00:00
Fan Zhang
78896c40ac
Merge "Move SettingsRobolectricTestRunner to testutils." am: 16db22a9c8 -s ours am: e39bcb6bf5 -s ours
...
am: eef095d0ee
2017-10-11 21:31:35 +00:00
Jeff Sharkey
09112f231c
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf am: 979efb53d0 am: fe1daa6eda am: efe9e7e003 -s ours am: 47bc5fba05
...
am: 4d61a1bd15
2017-10-11 21:28:38 +00:00
Jeff Sharkey
c1574a1ef8
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d am: 0bcee25346 am: 46bc2bd7bd -s ours am: b410435a21
...
am: de7c312543
2017-10-11 21:27:27 +00:00
