OSDN Git Service
xiyuan.wang [Mon, 30 Oct 2017 18:17:47 +0000 (18:17 +0000)]
Merge "Fix app crash while adding new user" am:
1e5cd4c3df
am:
5cf3dcd11c
Change-Id: I328ca5045b1fabf9f6756cc0265458bda531fccf
xiyuan.wang [Mon, 30 Oct 2017 18:03:09 +0000 (18:03 +0000)]
Merge "Fix app crash while adding new user"
am:
1e5cd4c3df
Change-Id: I0cb1c3a228b85edb6303d4f6c33037e4f787f550
Treehugger Robot [Mon, 30 Oct 2017 17:43:46 +0000 (17:43 +0000)]
Merge "Fix app crash while adding new user"
xiyuan.wang [Fri, 20 Oct 2017 09:59:58 +0000 (17:59 +0800)]
Fix app crash while adding new user
Settings app crashes when tapping Home key while adding new user because
UserSettings#showDialog() is called after onSaveInstanceState().
To fix this issue, a dialog should not be shown after onPause().
Fixes:
68485787
Test: manual - tap Home key while adding new user
Change-Id: I2ddd119b6558927798a52c7977e6fd8137734c93
Bill Yi [Mon, 30 Oct 2017 07:35:56 +0000 (07:35 +0000)]
Import translations. DO NOT MERGE
am:
198f1320b7 -s ours
Change-Id: I7e6935fcc3adbe7bdf62bf60ca6635e3fb49b0de
Bill Yi [Sun, 29 Oct 2017 06:21:49 +0000 (23:21 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I17237599107b5576cfc9261b866614c1a69fb531
Qi Ding [Fri, 27 Oct 2017 18:52:47 +0000 (18:52 +0000)]
Merge "Fix current tab is changed when rotating device" am:
3d8b442e8d
am:
35a3260b91
Change-Id: I1ae5051dfb35d75c99d0d44ce2689b6e81d47a81
Qi Ding [Fri, 27 Oct 2017 18:47:40 +0000 (18:47 +0000)]
Merge "Fix current tab is changed when rotating device"
am:
3d8b442e8d
Change-Id: I4f8499492b7fbe26e40da649e38ab0a65667e55d
Treehugger Robot [Fri, 27 Oct 2017 18:38:37 +0000 (18:38 +0000)]
Merge "Fix current tab is changed when rotating device"
Bill Yi [Fri, 27 Oct 2017 08:00:14 +0000 (08:00 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
fef593ca43 -s ours
Change-Id: I69b5120d889d669598215e276588500e340d4e26
TreeHugger Robot [Fri, 27 Oct 2017 07:55:00 +0000 (07:55 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Fri, 27 Oct 2017 07:48:14 +0000 (07:48 +0000)]
Import translations. DO NOT MERGE am:
09bd03ba04 -s ours
am:
1919e72747 -s ours
Change-Id: Ic4e18896e1855f115a03a99a87118e422e2edce0
Bill Yi [Fri, 27 Oct 2017 07:41:44 +0000 (07:41 +0000)]
Import translations. DO NOT MERGE
am:
09bd03ba04 -s ours
Change-Id: I6ff0a464ed719315f276e794f0851541b200691c
Bill Yi [Fri, 27 Oct 2017 04:16:36 +0000 (21:16 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ida971c59c2e7f9af5cf288628676f959521ddc98
Bill Yi [Fri, 27 Oct 2017 04:10:31 +0000 (21:10 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I35ac0b6a330fb71bc2aa0020ae8417664345e213
Christine Franks [Fri, 27 Oct 2017 03:59:08 +0000 (03:59 +0000)]
Move color mode to DisplayTransformManager am:
3d1d4a6628 -s ours
am:
755f07519a -s ours
Change-Id: I48234909c67c04a2ed81bef314faab08a82cbfe7
Christine Franks [Fri, 27 Oct 2017 03:23:14 +0000 (03:23 +0000)]
Move color mode to DisplayTransformManager
am:
3d1d4a6628 -s ours
Change-Id: I7064dbf657bf93f80f863b6b0e963cb793752194
Fan Zhang [Fri, 27 Oct 2017 00:24:44 +0000 (00:24 +0000)]
Add strings to support multi-state vivid color management am:
a12b3d318d
am:
beef67ec74
Change-Id: I7493933bd61172b37104a63bb620bc5e2f48398c
Bill Yi [Fri, 27 Oct 2017 00:24:23 +0000 (00:24 +0000)]
Import translations. DO NOT MERGE am:
68d7f87f78 -s ours
am:
ac8f283a8a -s ours
Change-Id: Idba1414c734145617f9b0897250865e70db94ad4
Romain Guy [Fri, 27 Oct 2017 00:24:11 +0000 (00:24 +0000)]
Add new color mode setting am:
9143fb26b4 -s ours
am:
298adb9b54 -s ours
Change-Id: Ib51b8ca62951543de531080295f8a32ab18e793a
Fan Zhang [Fri, 27 Oct 2017 00:08:51 +0000 (00:08 +0000)]
Add strings to support multi-state vivid color management
am:
a12b3d318d
Change-Id: I8d47a1c0982d6159cbeb7f7ee74241b4134e6f5a
Bill Yi [Fri, 27 Oct 2017 00:08:39 +0000 (00:08 +0000)]
Import translations. DO NOT MERGE
am:
68d7f87f78 -s ours
Change-Id: I408c19b81f14324b9d445f1a90a087b413583b7d
Romain Guy [Fri, 27 Oct 2017 00:08:33 +0000 (00:08 +0000)]
Add new color mode setting
am:
9143fb26b4 -s ours
Change-Id: I0ba85e94b8cbc85868949f1ed9f7d68242e1eb0b
Christine Franks [Wed, 25 Oct 2017 15:55:52 +0000 (08:55 -0700)]
Move color mode to DisplayTransformManager
Bug:
68159303
Test: make -j100 && make RunSettingsRoboTests -j100
Merged-In: I6cb3287ab4a8043e41765d55da24914f1744dcfa
Change-Id: I6cb3287ab4a8043e41765d55da24914f1744dcfa
Fan Zhang [Mon, 23 Oct 2017 23:30:12 +0000 (16:30 -0700)]
Add strings to support multi-state vivid color management
Bug:
68159303
Test: rebuild
Test: Rerun existing robotests
Change-Id: I893278b7b42df82f58d8c9834e7147692e36670f
(cherry picked from commit
e1543a3895a3b0b3af1ac1580b2d5a893ac119a7)
Bill Yi [Tue, 24 Oct 2017 17:24:03 +0000 (10:24 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
68159303
Test: build
Change-Id: Ia8f0496b1f43d4072ad97b97d8ff7efa1fb19170
Romain Guy [Tue, 24 Oct 2017 20:59:40 +0000 (21:59 +0100)]
Add new color mode setting
Replace the "vivid" mode setting with a new 3 choice screen:
- Natural (sRGB)
- Boosted (sRGB + 10% saturation)
- Saturated (unmanaged, colors are assigned the native color space)
The "Colors" setting that replaces "Vivid" only appears on devices
that support wide gamut rendering and color management. Changing
the color mode has an immediate effect and triggers a configuration
change in running application so that applications that request
wide color gamut rendering can react properly (since they lose
that ability).
Bug:
68159303
Test: make RunSettingsRoboTests
Merged-In: I7009723e11ee164c93719f0e42fed9d1b3cf6e01
Change-Id: I7009723e11ee164c93719f0e42fed9d1b3cf6e01
(cherry picked from commit
05fa18f8474cd5fed798e7ee7ef099682c4a4475)
Qi Ding [Tue, 21 Jun 2016 11:16:57 +0000 (19:16 +0800)]
Fix current tab is changed when rotating device
Even if SIM slot 2 is selected in SIM card lock settings,
the current tab is changed to SIM slot 1 when rotating the device.
To fix this issue, the current tab should be restored
after rotating the device.
Fixes:
63690125
Test: manual - go to Settings > Security > SIM card lock
and rotate device
Change-Id: I874d4d06019e21dd7b65951a3aefb75ff5ea298b
Christine Franks [Wed, 25 Oct 2017 20:23:06 +0000 (20:23 +0000)]
DO NOT MERGE - Move color mode to DisplayTransformManager
am:
cd2b7aea5f
Change-Id: I1ebad738c64493b1929b2eb299b41c1bb365f6fe
Christine Franks [Wed, 25 Oct 2017 15:55:52 +0000 (08:55 -0700)]
DO NOT MERGE - Move color mode to DisplayTransformManager
Bug:
68159303
Test: make -j100 && make RunSettingsRoboTests -j100
Change-Id: I6cb3287ab4a8043e41765d55da24914f1744dcfa
Chia-I Wu [Wed, 25 Oct 2017 04:38:57 +0000 (04:38 +0000)]
Merge "Add new color mode setting" into oc-mr1-dev
am:
94aa05059d
Change-Id: I31d9b51c1299564546a61a708f2058a815dd2974
Chia-I Wu [Wed, 25 Oct 2017 04:28:59 +0000 (04:28 +0000)]
Merge "Add new color mode setting" into oc-mr1-dev
Romain Guy [Tue, 24 Oct 2017 20:59:40 +0000 (21:59 +0100)]
Add new color mode setting
Replace the "vivid" mode setting with a new 3 choice screen:
- Natural (sRGB)
- Boosted (sRGB + 10% saturation)
- Saturated (unmanaged, colors are assigned the native color space)
The "Colors" setting that replaces "Vivid" only appears on devices
that support wide gamut rendering and color management. Changing
the color mode has an immediate effect and triggers a configuration
change in running application so that applications that request
wide color gamut rendering can react properly (since they lose
that ability).
Bug:
68159303
Test: make RunSettingsRoboTests
Change-Id: I7009723e11ee164c93719f0e42fed9d1b3cf6e01
Bill Yi [Tue, 24 Oct 2017 20:42:12 +0000 (20:42 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am:
aa8a972ea3
am:
2ef76cb0d2
Change-Id: I906612380c00db46a4d71e8aeceb822af857f744
Fan Zhang [Tue, 24 Oct 2017 20:41:16 +0000 (20:41 +0000)]
Merge "Fix wrong position of cursor in OwnerInfoSettings" am:
2bcbc35b29
am:
e373209b97
Change-Id: I67452d72f814fc0a1f11fd7699a1134f03a00a6f
Bill Yi [Tue, 24 Oct 2017 20:33:44 +0000 (20:33 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am:
aa8a972ea3
Change-Id: I778b023dfa65b0e4a8ab681c77a6a98c48184e93
Fan Zhang [Tue, 24 Oct 2017 20:33:03 +0000 (20:33 +0000)]
Merge "Fix wrong position of cursor in OwnerInfoSettings"
am:
2bcbc35b29
Change-Id: I37d5d73c9dc2dc64c6437c8e1a2786df616ee2f6
Bill Yi [Tue, 24 Oct 2017 20:03:09 +0000 (20:03 +0000)]
Import translations. DO NOT MERGE
am:
66ecad49ba -s ours
Change-Id: I46bc589e7ad984e910b5ebfc118614d0d1b0bee0
Bill Yi [Tue, 24 Oct 2017 18:32:26 +0000 (11:32 -0700)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Fan Zhang [Tue, 24 Oct 2017 18:13:25 +0000 (18:13 +0000)]
Merge "Fix wrong position of cursor in OwnerInfoSettings"
Bill Yi [Tue, 24 Oct 2017 17:24:03 +0000 (10:24 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
68159303
Change-Id: Ia8f0496b1f43d4072ad97b97d8ff7efa1fb19170
tiansiming [Tue, 24 Oct 2017 09:19:27 +0000 (17:19 +0800)]
Fix wrong position of cursor in OwnerInfoSettings
Bug:N/A
Test:Settings -> Security -> right settings icon of Screen lock
-> Lock screen message.
The cursor shows at the forefront of this EditText.
Change-Id: I86fe1bdbe78f700053e38b0cba4a5c8365af946e
Signed-off-by: tiansiming <tiansiming@xiaomi.com>
Rajeev Kumar [Tue, 24 Oct 2017 05:01:49 +0000 (05:01 +0000)]
Remove SearchIndexProvider from DataPlanUsageSummary fragment.
am:
dd8e66fa20
Change-Id: I0b27a9c68a17f87876d477bad0d10b270aecd550
Rajeev Kumar [Fri, 20 Oct 2017 19:44:17 +0000 (12:44 -0700)]
Remove SearchIndexProvider from DataPlanUsageSummary fragment.
This change will prevent showing Data plan usage in the settings search.
Data plan usage feature has been punted to next release and we do not
want to show this to user in current release.
Bug:
68022715
Test: make RunSettingsRoboTests -j40
Change-Id: I56b71796e3c426122434ca9e86c1a2db691849cf
DO NOT MERGE
Fan Zhang [Tue, 24 Oct 2017 00:27:02 +0000 (00:27 +0000)]
Add strings to support multi-state vivid color management
am:
e1543a3895
Change-Id: Icc99c1e3348425d70fea3235a4d4c63385c3d38f
Fan Zhang [Mon, 23 Oct 2017 23:30:12 +0000 (16:30 -0700)]
Add strings to support multi-state vivid color management
Bug:
68159303
Test: rebuild
Test: Rerun existing robotests
Change-Id: I893278b7b42df82f58d8c9834e7147692e36670f
Jack Yu [Fri, 20 Oct 2017 19:52:40 +0000 (19:52 +0000)]
Merge "Refactored area update info support" am:
60d6ffbc6c am:
3966912efa
am:
d4ef8eca27
Change-Id: I969c83a120ab14b5b3aed1c8ef26c9b1970b510d
Jack Yu [Fri, 20 Oct 2017 19:41:05 +0000 (19:41 +0000)]
Merge "Refactored area update info support" am:
60d6ffbc6c
am:
3966912efa
Change-Id: Id337bec84de9d6725974cca94945ba20ebe0e63d
Jack Yu [Fri, 20 Oct 2017 19:30:29 +0000 (19:30 +0000)]
Merge "Refactored area update info support"
am:
60d6ffbc6c
Change-Id: I955c44c5d2c07dee0be7ae9990c0234eb989538f
Treehugger Robot [Fri, 20 Oct 2017 19:19:09 +0000 (19:19 +0000)]
Merge "Refactored area update info support"
Bill Yi [Fri, 20 Oct 2017 17:15:14 +0000 (17:15 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
a5d652c89f -s ours
am:
8313368b32 -s ours
Change-Id: Id8ca07902a1ec999a3924f4f77d1318da68a6cef
Bill Yi [Fri, 20 Oct 2017 16:47:03 +0000 (16:47 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
a5d652c89f -s ours
Change-Id: I10da6389cb21f6c4ddcc4b6047feed58c48bd665
Ben Schwartz [Fri, 20 Oct 2017 15:33:50 +0000 (15:33 +0000)]
Merge "Add a developer option for controlling DNS over TLS" am:
c8207de343 am:
ed97eaeb4a
am:
1fd46833ef
Change-Id: I30f6c28acc3825ff51190d1d54494cac5d774497
TreeHugger Robot [Fri, 20 Oct 2017 15:28:33 +0000 (15:28 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Ben Schwartz [Fri, 20 Oct 2017 15:15:14 +0000 (15:15 +0000)]
Merge "Add a developer option for controlling DNS over TLS" am:
c8207de343
am:
ed97eaeb4a
Change-Id: Iafc1e11d79f163d57e1d5e8bb3524c3d44f1b240
Ben Schwartz [Fri, 20 Oct 2017 15:06:10 +0000 (15:06 +0000)]
Merge "Add a developer option for controlling DNS over TLS"
am:
c8207de343
Change-Id: I688d2131294c2b4995d7f8f79e7819feb89573c3
Treehugger Robot [Fri, 20 Oct 2017 14:58:39 +0000 (14:58 +0000)]
Merge "Add a developer option for controlling DNS over TLS"
Bill Yi [Fri, 20 Oct 2017 10:21:50 +0000 (03:21 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
68003463
Change-Id: Id09f849aa6cdf8d983697e7a6a7f182c5f76e623
Jack Yu [Thu, 22 Jun 2017 00:43:43 +0000 (17:43 -0700)]
Refactored area update info support
1. Refactored area update information support so it
is not limited to channel 50 and Brazil.
2. Added channel 60 for India.
Test: Manual
bug:
37746109
Change-Id: I470cc470f880aadd4f63815e21cdd4a71436a89d
(cherry picked from commit
c3cab8ecb84051abac144aaa0f94ee9276c89aab)
tiansiming [Thu, 19 Oct 2017 19:24:53 +0000 (19:24 +0000)]
Merge "Fix wrong position of cursor in IccLockSettings" am:
3a3044eeef am:
92e77cbd43
am:
ecf2bdb46f
Change-Id: I643bffc3f0eaf326b79dd7cebce2fff287396e1e
tiansiming [Thu, 19 Oct 2017 19:22:16 +0000 (19:22 +0000)]
Merge "Fix wrong position of cursor in IccLockSettings" am:
3a3044eeef
am:
92e77cbd43
Change-Id: Icfa12295c4111766f4c189443b9a6997a1cc0031
tiansiming [Thu, 19 Oct 2017 19:20:09 +0000 (19:20 +0000)]
Merge "Fix wrong position of cursor in IccLockSettings"
am:
3a3044eeef
Change-Id: I26f1c35505538768a7816f038c44437fe9a08f67
Treehugger Robot [Thu, 19 Oct 2017 19:14:49 +0000 (19:14 +0000)]
Merge "Fix wrong position of cursor in IccLockSettings"
tiansiming [Mon, 16 Oct 2017 13:32:20 +0000 (21:32 +0800)]
Fix wrong position of cursor in IccLockSettings
Position of cursor goes to the front when submit
an error pin.
Bug:https://issuetracker.google.com/issues/
67839176
Test:
1) Insert a sim card
2) Go to Settings -> Security -> Set up SIM card lock
3) press Lock SIM card checkbox
4) enter 123 and press OK button
Change-Id: I90655f3fa4cb3e4bda251cd0fc62e66300a4b66f
Signed-off-by: tiansiming <tiansiming@xiaomi.com>
Jeff Sharkey [Wed, 18 Oct 2017 22:55:51 +0000 (22:55 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6 am:
629553fb49 am:
397a3555b5 am:
a637e31547 -s ours am:
a00521b3a0 am:
16776b64c8
am:
1dcb8522fa
Change-Id: Ife1efc0fe5b721886961327dc72b6fcf2cf1ade9
Jeff Sharkey [Wed, 18 Oct 2017 22:54:01 +0000 (22:54 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd am:
85cb0b43da am:
8f2a69fad3 am:
2a2d92eee8 -s ours am:
a829548c12 am:
3de9e565c8
am:
1e23fc8814
Change-Id: Id4d0641a44fb537a5606e8c118ffdbc93aaf0ae2
Jeff Sharkey [Wed, 18 Oct 2017 22:27:47 +0000 (22:27 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6 am:
629553fb49 am:
397a3555b5 am:
a637e31547 -s ours am:
a00521b3a0 am:
16776b64c8
am:
6b56423651
Change-Id: I18058b80f7f7439f875213d5f6e59b2680cc3dc5
Jeff Sharkey [Wed, 18 Oct 2017 22:26:30 +0000 (22:26 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd am:
85cb0b43da am:
8f2a69fad3 am:
2a2d92eee8 -s ours am:
a829548c12 am:
3de9e565c8
am:
e39f0c21f9
Change-Id: Ib7da524b1e6c64ded9706fedfe487aa99d43e22a
Jeff Sharkey [Wed, 18 Oct 2017 21:52:46 +0000 (21:52 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6 am:
629553fb49 am:
397a3555b5 am:
a637e31547 -s ours am:
a00521b3a0
am:
16776b64c8
Change-Id: I96d84487e79ac34428c1b784228745074499cbd9
Jeff Sharkey [Wed, 18 Oct 2017 21:52:01 +0000 (21:52 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6 am:
629553fb49 am:
397a3555b5 am:
a637e31547 -s ours am:
a00521b3a0
am:
16776b64c8
Change-Id: I83e412e91bdc14523b26ac11fc0918a21b74a26f
Jeff Sharkey [Wed, 18 Oct 2017 21:51:30 +0000 (21:51 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd am:
85cb0b43da am:
8f2a69fad3 am:
2a2d92eee8 -s ours am:
a829548c12
am:
3de9e565c8
Change-Id: I965ee6c01f5394f390900002295b3d695790d00d
Jeff Sharkey [Wed, 18 Oct 2017 21:50:29 +0000 (21:50 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd am:
85cb0b43da am:
8f2a69fad3 am:
2a2d92eee8 -s ours am:
a829548c12
am:
3de9e565c8
Change-Id: Id3c4eafd2628d04b94e33e057b228ed77c9c32c8
Jeff Sharkey [Wed, 18 Oct 2017 21:32:46 +0000 (21:32 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6 am:
629553fb49 am:
397a3555b5 am:
a637e31547 -s ours
am:
a00521b3a0
Change-Id: Idd7111058107886b24ed208ad09d3b13e945de8d
Jeff Sharkey [Wed, 18 Oct 2017 21:31:42 +0000 (21:31 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd am:
85cb0b43da am:
8f2a69fad3 am:
2a2d92eee8 -s ours
am:
a829548c12
Change-Id: Id3b794c734d743757bc5d70f3386fed1c8640c69
Jeff Sharkey [Wed, 18 Oct 2017 21:01:38 +0000 (21:01 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6 am:
629553fb49 am:
397a3555b5
am:
a637e31547 -s ours
Change-Id: Ic8c595d0e4847d36ee150763606353225be5a7ff
Jeff Sharkey [Wed, 18 Oct 2017 21:00:49 +0000 (21:00 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd am:
85cb0b43da am:
8f2a69fad3
am:
2a2d92eee8 -s ours
Change-Id: I3ab5a63962eee76a5f199f4be8243829dc943710
Jeff Sharkey [Wed, 18 Oct 2017 20:40:16 +0000 (20:40 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6 am:
629553fb49
am:
397a3555b5
Change-Id: I1cd5d59bfbb91806e18f9d33f1ccd897f99c745e
Jeff Sharkey [Wed, 18 Oct 2017 20:39:11 +0000 (20:39 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd am:
85cb0b43da
am:
8f2a69fad3
Change-Id: If4e97b0c8efd7223323f36954e2eb80aabeb881c
Jeff Sharkey [Wed, 18 Oct 2017 20:26:31 +0000 (20:26 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6
am:
629553fb49
Change-Id: I075b5225e91a419fbe5d5f6ecdbbf82ba5f1c550
Jeff Sharkey [Wed, 18 Oct 2017 20:25:25 +0000 (20:25 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd
am:
85cb0b43da
Change-Id: Ic41907e9ca799e53b7796b25c5cfc818636988aa
Jeff Sharkey [Wed, 18 Oct 2017 20:06:55 +0000 (20:06 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed
am:
d88820f3f6
Change-Id: If92103e13bdefcaeda54adfc6acf96352b57cd89
Jeff Sharkey [Wed, 18 Oct 2017 20:06:00 +0000 (20:06 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3
am:
e341fe95bd
Change-Id: Ifc18f5afec1707d19224428ac88399d7463adf9c
Jeff Sharkey [Wed, 18 Oct 2017 19:40:12 +0000 (19:40 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours
am:
07c4c8efed
Change-Id: I7b2baeb9b01b6b9a3f2ab6ed7444601b703e001f
Jeff Sharkey [Wed, 18 Oct 2017 19:39:10 +0000 (19:39 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours
am:
416ecb20a3
Change-Id: I152a5dc22a05e3952f3b0bd162f2826580a26db2
Jeff Sharkey [Wed, 18 Oct 2017 19:27:49 +0000 (19:27 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716
am:
91b1cb4b23 -s ours
Change-Id: I5d27e57aed8586fd203bc6dacca480e97ab9ca25
Jeff Sharkey [Wed, 18 Oct 2017 19:27:11 +0000 (19:27 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0
am:
fad1e6a315 -s ours
Change-Id: I46e94b20903455f26c62922aa735276434dc1fd0
Jeff Sharkey [Wed, 18 Oct 2017 19:21:53 +0000 (19:21 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c
am:
a954c8c716
Change-Id: I7ae7ab6c40fdcce484c39bdd3314dd4c831b3545
Jeff Sharkey [Wed, 18 Oct 2017 19:20:50 +0000 (19:20 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9
am:
c1ebc09ff0
Change-Id: I8f4e5fbc1952b6c7014fbc8c7abac5fcf54af520
Jeff Sharkey [Wed, 18 Oct 2017 18:57:57 +0000 (18:57 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39
am:
2bf724509c
Change-Id: Ia037ac67d83799f104cd30b6caaaad8485ae0326
Jeff Sharkey [Wed, 18 Oct 2017 18:57:03 +0000 (18:57 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787
am:
9ba609cef9
Change-Id: I9148b6352ab44e21e3a81a4d1bc783c867d614e8
Jeff Sharkey [Wed, 18 Oct 2017 18:40:10 +0000 (18:40 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours
am:
19fa568b39
Change-Id: Id8d333be6d14dac643447f1310629a1adc0fc2cc
Jeff Sharkey [Wed, 18 Oct 2017 18:39:25 +0000 (18:39 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours
am:
5b2a431787
Change-Id: Ie5d9d4c5e7f0d9829ad807e7a43edd2d81001aaf
Jeff Sharkey [Wed, 18 Oct 2017 18:29:15 +0000 (18:29 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours
am:
45fc104958 -s ours
Change-Id: Ibdd0283a40c9d8994b902f31ed2a80ff894384eb
Jeff Sharkey [Wed, 18 Oct 2017 18:28:28 +0000 (18:28 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am:
4cfc684346 -s ours
Change-Id: I16f3a2141ed4773b043e9d5553c7eb44e296b428
Pavel Grafov [Tue, 17 Oct 2017 17:33:23 +0000 (17:33 +0000)]
Preserve old password when handling SET_NEW_PASSWORD.
am:
40e187b364
Change-Id: I45a464c244b6de3a4ea491d28db620425733b5a8
Pavel Grafov [Wed, 11 Oct 2017 21:57:09 +0000 (22:57 +0100)]
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
Cai, Min1 [Mon, 16 Oct 2017 19:59:50 +0000 (19:59 +0000)]
Merge "Refresh payment preference while resume" am:
05650bb3da am:
088baf348b
am:
f523ca10aa
Change-Id: I25dea8b9ddb1740c907d4ef79c74fe8b201352a2
Cai, Min1 [Mon, 16 Oct 2017 19:41:44 +0000 (19:41 +0000)]
Merge "Refresh payment preference while resume" am:
05650bb3da
am:
088baf348b
Change-Id: I146f0925e1b9c68e2cd04d76897a59fe87ac741d
Cai, Min1 [Mon, 16 Oct 2017 19:29:33 +0000 (19:29 +0000)]
Merge "Refresh payment preference while resume"
am:
05650bb3da
Change-Id: Ib4876e7d4f17b99699f3b7f328cd1b1eafb19eba
Maurice Lam [Mon, 16 Oct 2017 19:25:57 +0000 (19:25 +0000)]
resolve merge conflicts of
f36b25c2df to stage-aosp-master am:
d4621f6302
am:
0e1c486e74
Change-Id: I9b94c26c4df2329e388eeb925350a2446ef9148e