OSDN Git Service
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
(cherry picked from commit
66ecad49ba283aef5389876f1be6ffd52fb74030)
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)
android-build-team Robot [Tue, 24 Oct 2017 06:12:34 +0000 (06:12 +0000)]
Merge cherrypicks of [
3116469,
3116470,
3116074,
3116075,
3116498,
3116499,
3117095,
3115988,
3116845,
3116471,
3116500,
3116573,
3115989,
3116501,
3116076,
3116472] into oc-mr1-release
Change-Id: I174cd31296e511ffd4498e7e6184821cee8099b8
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
(cherry picked from commit
dd8e66fa202f9b351c7be174c81df63adb1767e2)
android-build-team Robot [Thu, 19 Oct 2017 06:09:20 +0000 (06:09 +0000)]
Snap for
4404534 from
6b56423651aa2a7b9b23d24f4a5e5af22cd1a6e8 to oc-mr1-release
Change-Id: Idec735861dd609c32030f09f830d9f5aed344844
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: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: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
android-build-team Robot [Wed, 18 Oct 2017 07:24:12 +0000 (07:24 +0000)]
Snap for
4402249 from
40e187b3641ac3084c706b10d2213b91a53da5d1 to oc-mr1-release
Change-Id: Ie785ded923a7ec0c32d2737a34a8a1fbcf27ca6c
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
android-build-team Robot [Sun, 15 Oct 2017 07:22:51 +0000 (07:22 +0000)]
Snap for
4396223 from
893bdba206d23e453019b66ee465350621382308 to oc-mr1-release
Change-Id: I75aac59e6d31ad15647b34849e13312196820a51
Doris Ling [Fri, 13 Oct 2017 18:45:30 +0000 (11:45 -0700)]
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
android-build-team Robot [Fri, 13 Oct 2017 07:21:12 +0000 (07:21 +0000)]
Snap for
4393674 from
85f59ff42da3336fd300a7508cc1f4fe31d8e9bf to oc-mr1-release
Change-Id: I8dada9b3c2ed464ada4a5633aff5a2198610fbcb
TreeHugger Robot [Thu, 12 Oct 2017 18:54:43 +0000 (18:54 +0000)]
Merge "Allow 64 char HEX string PSKs in WifiSettingsUi" into oc-mr1-dev
android-build-team Robot [Thu, 12 Oct 2017 07:25:21 +0000 (07:25 +0000)]
Snap for
4391495 from
1c4d686b0c50caf025661780196e2816f871f5ec to oc-mr1-release
Change-Id: I811e190fec4d199fdd244003f847f00db0e153fd
Jeff Sharkey [Wed, 11 Oct 2017 23:03:25 +0000 (23:03 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am:
5ef2cfac97 -s ours
Change-Id: I5b16d712ea2e7b7c98ccef5fc74fa47527e588e0
Jeff Sharkey [Wed, 11 Oct 2017 22:19:18 +0000 (22:19 +0000)]
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
Change-Id: I42b7d928abb3e1ae71f6e23ddceba969a821f639
Jeff Sharkey [Wed, 11 Oct 2017 22:17:49 +0000 (22:17 +0000)]
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
Change-Id: Iaad4be44e1410eac3b0b63d33953bf643d2b3503
TreeHugger Robot [Wed, 11 Oct 2017 22:16:37 +0000 (22:16 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Jeff Sharkey [Wed, 11 Oct 2017 22:02:29 +0000 (22:02 +0000)]
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
Change-Id: I40c3ad091c63617baf047a6ce98ad5129d04e7dc
Jeff Sharkey [Wed, 11 Oct 2017 22:00:24 +0000 (22:00 +0000)]
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
Change-Id: I8ee12f143c82b42ca3d06537e1d576577c22c883
Jeff Sharkey [Wed, 11 Oct 2017 21:47:52 +0000 (21:47 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
f32a4fad5d am:
7c41707eaf am:
979efb53d0 am:
fe1daa6eda am:
efe9e7e003 -s ours am:
47bc5fba05
am:
4d61a1bd15
Change-Id: I7f3fc44f882eed0a435e75cec95c7a03219cc67a
Jeff Sharkey [Wed, 11 Oct 2017 21:46:44 +0000 (21:46 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
1cdc675d7d am:
0bcee25346 am:
46bc2bd7bd -s ours am:
b410435a21
am:
de7c312543
Change-Id: If4193b75eaccdc612b94af027a8ce6548e613aad
Jeff Sharkey [Wed, 11 Oct 2017 21:45:11 +0000 (21:45 +0000)]
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am:
9c39da39df
am:
f4e2e26064
Change-Id: I7a621bcf8afdc1a3cb80e7e57d25adf5f96a17f0
Jeff Sharkey [Wed, 11 Oct 2017 21:42:57 +0000 (21:42 +0000)]
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
Change-Id: If486735b63d2f652bd8d99a01a18f4d5fd8a88bc
Jeff Sharkey [Wed, 11 Oct 2017 21:42:14 +0000 (21:42 +0000)]
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
Change-Id: I03181b1d378a0f299871cb34551b83aa0fe16dd6
Jeff Sharkey [Wed, 11 Oct 2017 21:34:11 +0000 (21:34 +0000)]
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
Change-Id: I3e2938793111b4b547d4a70ebbf57b8e8f57fd37
Jeff Sharkey [Wed, 11 Oct 2017 21:33:01 +0000 (21:33 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
019f31b499 am:
556688abdb am:
45926efd0f -s ours am:
89791cb5c3 am:
b3d4bc8239 am:
53a69985b3
am:
3aa36a6afb
Change-Id: I8f5d74a40d179512466a3d2e77416b5222da01e7
Jeff Sharkey [Wed, 11 Oct 2017 21:24:25 +0000 (21:24 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
f32a4fad5d am:
7c41707eaf am:
979efb53d0 am:
fe1daa6eda am:
efe9e7e003 -s ours
am:
47bc5fba05
Change-Id: Icf6b9c17a843608befc1250a9fdcf8a10dfa8848
Jeff Sharkey [Wed, 11 Oct 2017 21:21:40 +0000 (21:21 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188 am:
e38a7f42ab am:
95bbef26d7 am:
ba66bb8a43 -s ours am:
004f90f35e am:
86cc9a681d
am:
d721694b79
Change-Id: Ie3b5bc22af9ddbf47c6236d40a21d8bc051599be
Jeff Sharkey [Wed, 11 Oct 2017 21:20:09 +0000 (21:20 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
019f31b499 am:
556688abdb am:
45926efd0f -s ours am:
89791cb5c3 am:
b3d4bc8239
am:
53a69985b3
Change-Id: Icadeebe688c38f4e4d0b190ed07acd7d5396aef3
Jeff Sharkey [Wed, 11 Oct 2017 21:12:41 +0000 (21:12 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
f32a4fad5d am:
7c41707eaf am:
979efb53d0 am:
fe1daa6eda
am:
efe9e7e003 -s ours
Change-Id: If71fe96139c86fce8be3d1866342a050df3c9f6f
Jeff Sharkey [Wed, 11 Oct 2017 21:10:10 +0000 (21:10 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
1cdc675d7d am:
0bcee25346 am:
46bc2bd7bd -s ours
am:
b410435a21
Change-Id: I91421c6629af2131e7aaeadac048c92da9653212
Jeff Sharkey [Wed, 11 Oct 2017 21:09:20 +0000 (21:09 +0000)]
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev
am:
9c39da39df
Change-Id: Ic7566b0972c30c9e7b5a183888238eca44709d47
Jeff Sharkey [Wed, 11 Oct 2017 21:01:29 +0000 (21:01 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188 am:
e38a7f42ab am:
95bbef26d7 am:
ba66bb8a43 -s ours am:
004f90f35e
am:
86cc9a681d
Change-Id: I30d07aff1d361734e7a962dd89d1935137ed64dd
Jeff Sharkey [Wed, 11 Oct 2017 21:00:27 +0000 (21:00 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
019f31b499 am:
556688abdb am:
45926efd0f -s ours am:
89791cb5c3
am:
b3d4bc8239
Change-Id: I02141baa2a53d2982856052a923be6ddd076c55f
Jeff Sharkey [Wed, 11 Oct 2017 20:57:51 +0000 (20:57 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
f32a4fad5d am:
7c41707eaf am:
979efb53d0
am:
fe1daa6eda
Change-Id: I943b70a1dfc085ff0a4e4e46afb29aec1aa6c965
Jeff Sharkey [Wed, 11 Oct 2017 20:46:28 +0000 (20:46 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188 am:
e38a7f42ab am:
95bbef26d7 am:
ba66bb8a43 -s ours
am:
004f90f35e
Change-Id: I2665557fb25ced0978a90fed4edff989011e01ed
Jeff Sharkey [Wed, 11 Oct 2017 20:45:04 +0000 (20:45 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
019f31b499 am:
556688abdb am:
45926efd0f -s ours
am:
89791cb5c3
Change-Id: Ie179a077b08e79040603c467e0a912731636e2f2
Jeff Sharkey [Wed, 11 Oct 2017 20:44:53 +0000 (20:44 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
f32a4fad5d am:
7c41707eaf
am:
979efb53d0
Change-Id: Iad023fb1a0ff8fded7963b5e7087457803fe213c
Jeff Sharkey [Wed, 11 Oct 2017 20:39:07 +0000 (20:39 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
1cdc675d7d am:
0bcee25346
am:
46bc2bd7bd -s ours
Change-Id: I55b5048ea4ecb689a7d483afeb174a153cc54fdc
Jeff Sharkey [Wed, 11 Oct 2017 20:35:37 +0000 (20:35 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
8441943bfa -s ours am:
70387afef9
am:
9173362f4e
Change-Id: I8eb3e136b4edb5858a681fb69c0f90d216255e55
Jeff Sharkey [Wed, 11 Oct 2017 20:35:23 +0000 (20:35 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188 am:
e38a7f42ab am:
95bbef26d7
am:
ba66bb8a43 -s ours
Change-Id: I3431178e94b81aa61b7f829217a40fdee4eac141
Jeff Sharkey [Wed, 11 Oct 2017 20:34:40 +0000 (20:34 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
019f31b499 am:
556688abdb
am:
45926efd0f -s ours
Change-Id: Ieeea7848f879564074e1fb32d4c5c834d21e63cc
TreeHugger Robot [Wed, 11 Oct 2017 20:32:55 +0000 (20:32 +0000)]
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev
Jeff Sharkey [Wed, 11 Oct 2017 20:32:38 +0000 (20:32 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188 am:
e38a7f42ab
am:
95bbef26d7
Change-Id: I32314303ab0926d93ae035166e323bcce847b7bd
Jeff Sharkey [Wed, 11 Oct 2017 20:31:41 +0000 (20:31 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
019f31b499
am:
556688abdb
Change-Id: Ia7daf15c3d9fc81ae8fdef25f79cc13558639e98
Jeff Sharkey [Wed, 11 Oct 2017 20:29:25 +0000 (20:29 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
f32a4fad5d
am:
7c41707eaf
Change-Id: Ifc8c25371b0d2062e4c51ee6fcbf75e275331b30
Jeff Sharkey [Wed, 11 Oct 2017 20:28:13 +0000 (20:28 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
94e678c188
am:
e38a7f42ab
Change-Id: I9fffe94faecb7d36ac68ebfc388af01e4871031e
Jeff Sharkey [Wed, 11 Oct 2017 20:28:11 +0000 (20:28 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
1cdc675d7d
am:
0bcee25346
Change-Id: I22114cc686a52c94234fbbc659998ab183c1747d
Jeff Sharkey [Wed, 11 Oct 2017 20:27:42 +0000 (20:27 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
8441943bfa -s ours
am:
70387afef9
Change-Id: Id60f3d902a5a2710310613ea0d12796ea46af931
Jeff Sharkey [Wed, 11 Oct 2017 20:26:40 +0000 (20:26 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am:
019f31b499
Change-Id: I755c046ad6392a7582d5afc32bd1e4693bcae33e
Jeff Sharkey [Wed, 11 Oct 2017 20:25:11 +0000 (20:25 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am:
f32a4fad5d
Change-Id: I54e65289ff205196bd4fba9f0d40dc1f9f116e2b
Jeff Sharkey [Wed, 11 Oct 2017 20:24:31 +0000 (20:24 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am:
94e678c188
Change-Id: Iffc23a1e80389d1afe9b10a7e992d9d19a33fe11
Jeff Sharkey [Wed, 11 Oct 2017 20:24:16 +0000 (20:24 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am:
1cdc675d7d
Change-Id: I117d8a1f9ab46f375277511da8f59df2db771cb7
Jeff Sharkey [Wed, 11 Oct 2017 20:24:05 +0000 (20:24 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am:
8441943bfa -s ours
Change-Id: I5c1980e7fb722d4d00194f3c953c91304137eea3
Bill Yi [Wed, 11 Oct 2017 18:28:21 +0000 (11:28 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I3b96a50ff43d0d3611d3a59d12c265ca3fff5712
android-build-team Robot [Wed, 11 Oct 2017 07:27:02 +0000 (07:27 +0000)]
Snap for
4388906 from
e7f51073031da244b290fb844f0a381a461cd4e1 to oc-mr1-release
Change-Id: Ib203c0c19cee62325afb7487952e31ebcc98f03b
Ajay Nadathur [Tue, 10 Oct 2017 19:19:30 +0000 (12:19 -0700)]
Hero suggestion is announced as disabled by talkback
- Removed calls to disable view. No ripple effect seen even after that
bug:
65851388
NOTE: cherry picked from master.
Merged-In: I876696a3e7351d586e6d045c8b2d07676f96ea9d
Test: manually tested
Change-Id: Iae377e763ed62b9448221843ed77b4605ad81379
Glen Kuhne [Mon, 9 Oct 2017 22:40:46 +0000 (15:40 -0700)]
Allow 64 char HEX string PSKs in WifiSettingsUi
A check for valid PSKs in the settings UI didnt capture the 64 character
HEX string case. Added a check for it.
Test: tests/app/src/com/android/settings/wifi/WifiSettingsUiTest.java
Test: manual verification
Bug:
67492639
Change-Id: Ide738c4a67f23b613883b4a69f8264a0ffb8a0bc
android-build-team Robot [Mon, 9 Oct 2017 07:22:05 +0000 (07:22 +0000)]
Snap for
4384465 from
6ed9a789224f850da76587c0a00aacba8acb62c8 to oc-mr1-release
Change-Id: I79c36cbd5451f067640c924cf6a97cd5eb3e7250
android-build-team Robot [Sun, 8 Oct 2017 07:24:32 +0000 (07:24 +0000)]
Snap for
4383937 from
8bd54d4592a6289442d8b4175f4515730fcce6e1 to oc-mr1-release
Change-Id: I34062a839a5fb307eff417bf1bb304f33824f8ec
TreeHugger Robot [Sun, 8 Oct 2017 06:57:28 +0000 (06:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sun, 8 Oct 2017 02:13:23 +0000 (19:13 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I8e31d776f5036724722d7578be51651b5199e419
TreeHugger Robot [Sat, 7 Oct 2017 17:03:32 +0000 (17:03 +0000)]
Merge "Update wakeup anomaly to exclude blacklisted wakeups." into oc-mr1-dev
Andrew Sapperstein [Fri, 6 Oct 2017 01:19:32 +0000 (18:19 -0700)]
Update wakeup anomaly to exclude blacklisted wakeups.
Also disables all anomalies out of the box.
Provides the ability to ignore certain wakeups if blacklisted in
AnomalyDetectionPolicy. Compares each wakeup to the blacklist and
if it exists, does not include it in the count used to compare against
the threshold.
Change-Id: I038ca966aed5a030853b4786bc201397bf4f9b70
Merged-In: I4ef548bd0952be5f0d4e36df5698f287839d0704
Fixes:
67000019
Test: robotests
TreeHugger Robot [Fri, 6 Oct 2017 19:10:57 +0000 (19:10 +0000)]
Merge "Fix "Add Network" button on SavedAccessPoints page." into oc-mr1-dev
android-build-team Robot [Thu, 5 Oct 2017 07:29:02 +0000 (07:29 +0000)]
Snap for
4378450 from
9cb867d6e352d08102973611dfd552e1b5b78d63 to oc-mr1-release
Change-Id: I05c7811d0eb458a142602399c590bf330d266cf8
Doris Ling [Wed, 4 Oct 2017 23:59:28 +0000 (16:59 -0700)]
Add space around the data usage warning spinner.
Use a custom item layout for the data usage warning unit selection
spinner to make the touch target bigger.
Change-Id: I2d73dc3ab4c99cea8f8c791c8c1346240456d6aa
Fixes:
66414539
Test: visual
TreeHugger Robot [Wed, 4 Oct 2017 20:38:58 +0000 (20:38 +0000)]
Merge "Use new no overlay flag instead app ops" into oc-mr1-dev
TreeHugger Robot [Wed, 4 Oct 2017 18:35:32 +0000 (18:35 +0000)]
Merge "Update support to not need dialog fragment" into oc-mr1-dev
android-build-team Robot [Wed, 4 Oct 2017 07:22:12 +0000 (07:22 +0000)]
Snap for
4376088 from
0193e695970eb292c8166cc81ba1d94d4ec24286 to oc-mr1-release
Change-Id: Iadce2c92def646b2552e794fd9a4d55b395bacb0
Jeff Sharkey [Mon, 12 Jun 2017 23:33:58 +0000 (17:33 -0600)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug:
32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit
3f218e8431cb5648bcb46131551c133ba53ef870)
Jeff Sharkey [Mon, 12 Jun 2017 23:33:58 +0000 (17:33 -0600)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug:
32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit
3f218e8431cb5648bcb46131551c133ba53ef870)
Jeff Sharkey [Mon, 12 Jun 2017 23:33:58 +0000 (17:33 -0600)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug:
32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit
3f218e8431cb5648bcb46131551c133ba53ef870)
Jeff Sharkey [Mon, 12 Jun 2017 23:33:58 +0000 (17:33 -0600)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug:
32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit
3f218e8431cb5648bcb46131551c133ba53ef870)
Jeff Sharkey [Mon, 12 Jun 2017 23:33:58 +0000 (17:33 -0600)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug:
32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit
3f218e8431cb5648bcb46131551c133ba53ef870)
Jeff Sharkey [Mon, 12 Jun 2017 23:33:58 +0000 (17:33 -0600)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug:
32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit
3f218e8431cb5648bcb46131551c133ba53ef870)
Jeff Sharkey [Mon, 12 Jun 2017 23:33:58 +0000 (17:33 -0600)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug:
32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit
3f218e8431cb5648bcb46131551c133ba53ef870)
OSDN Git Service
