OSDN Git Service
Hall Liu [Thu, 12 Oct 2017 01:58:25 +0000 (01:58 +0000)]
Merge "Fix URI unparceling and clarify an error condition" am:
5f123e6ad6 am:
1c36619f5b am:
e95023f55a
am:
0a2c71668e
Change-Id: I3291adc53e8b102b3b0a464c19fe0783047279ee
Hall Liu [Thu, 12 Oct 2017 01:50:39 +0000 (01:50 +0000)]
Merge "Fix URI unparceling and clarify an error condition" into oc-mr1-dev am:
adaae4cb91
am:
9822017b0f
Change-Id: I60e9bd9c0124a7844fb626747911ce8c9abb25d0
Jeff Sharkey [Thu, 12 Oct 2017 01:44:39 +0000 (01:44 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours am:
ba1f2d2571 am:
300e6ffafb am:
f1f2a61fb7 am:
92d80b72aa am:
d6e3d358d4 -s ours am:
bbcb8e4976 am:
753a9ab308 am:
065dc70c5a" into oc-mr1-dev-plus-aosp
am:
1bfc9ff526 -s ours
Change-Id: Ibb00ad9497ee1e07bba6085253257cde28e38b7b
Jeff Sharkey [Thu, 12 Oct 2017 01:41:08 +0000 (01:41 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours am:
ba1f2d2571 am:
300e6ffafb am:
f1f2a61fb7 am:
92d80b72aa am:
d6e3d358d4 -s ours am:
bbcb8e4976 am:
753a9ab308 am:
f718585bf4" into oc-mr1-dev-plus-aosp
am:
609a6cf129 -s ours
Change-Id: I0d1ee4c0cb2c10b68eaf9587bc02c89a915fa8a4
Jeff Sharkey [Thu, 12 Oct 2017 01:37:51 +0000 (01:37 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours am:
e9d2113af7 am:
8860624853 am:
7512875224 am:
44adace6c6 am:
af93051ac4 -s ours am:
620c5cfda0 am:
e286f08000 am:
1b1ea965ee
am:
4c8e31db5d -s ours
Change-Id: I60f833f404e3ca2aeea5d8ea0cb91eb3137cc694
Hall Liu [Thu, 12 Oct 2017 01:31:26 +0000 (01:31 +0000)]
Merge "Fix URI unparceling and clarify an error condition" am:
5f123e6ad6 am:
1c36619f5b
am:
e95023f55a
Change-Id: Id9bbd691b1c3c5e79b06814762ac8c66fae05f4a
TreeHugger Robot [Thu, 12 Oct 2017 01:28:11 +0000 (01:28 +0000)]
Merge "Fix Catalan and Polish hyphenation."
Hall Liu [Thu, 12 Oct 2017 00:12:54 +0000 (00:12 +0000)]
Merge "Fix URI unparceling and clarify an error condition" into oc-mr1-dev
am:
adaae4cb91
Change-Id: I835ccb152a32c593d25bd06d64b53b51b5717c55
TreeHugger Robot [Wed, 11 Oct 2017 23:55:33 +0000 (23:55 +0000)]
Merge "Improve shortcut backup & restore."
Android Build Merger (Role) [Wed, 11 Oct 2017 23:54:39 +0000 (23:54 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours am:
ba1f2d2571 am:
300e6ffafb am:
f1f2a61fb7 am:
92d80b72aa am:
d6e3d358d4 -s ours am:
bbcb8e4976 am:
753a9ab308 am:
065dc70c5a" into oc-mr1-dev-plus-aosp
Hall Liu [Wed, 11 Oct 2017 23:53:11 +0000 (23:53 +0000)]
Merge "Fix URI unparceling and clarify an error condition" into oc-mr1-dev
Jeff Sharkey [Wed, 11 Oct 2017 23:52:44 +0000 (23:52 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours am:
ba1f2d2571 am:
300e6ffafb am:
f1f2a61fb7 am:
92d80b72aa am:
d6e3d358d4 -s ours am:
bbcb8e4976 am:
753a9ab308
am:
065dc70c5a
Change-Id: I7b1310f3b2329d91d347e814a7770c5b57702f5b
Jeff Sharkey [Wed, 11 Oct 2017 23:46:52 +0000 (23:46 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours am:
e9d2113af7 am:
8860624853 am:
7512875224 am:
44adace6c6 am:
af93051ac4 -s ours am:
620c5cfda0 am:
e286f08000 am:
e68565b630
am:
d10a908242 -s ours
Change-Id: I538192067abbc5daed3bec9849c6b3140b29db8a
Android Build Merger (Role) [Wed, 11 Oct 2017 23:43:44 +0000 (23:43 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours am:
ba1f2d2571 am:
300e6ffafb am:
f1f2a61fb7 am:
92d80b72aa am:
d6e3d358d4 -s ours am:
bbcb8e4976 am:
753a9ab308 am:
f718585bf4" into oc-mr1-dev-plus-aosp
Brad Ebinger [Wed, 11 Oct 2017 23:43:09 +0000 (23:43 +0000)]
Merge "Add new Download Error Codes" am:
e9bd5449b5 am:
946ff79971 am:
014d73e287
am:
bb38194a55
Change-Id: I3f1c18c3a9017c48aeba29e7344c27ba24d1a037
Hall Liu [Wed, 11 Oct 2017 23:41:30 +0000 (23:41 +0000)]
Merge "Fix URI unparceling and clarify an error condition" am:
5f123e6ad6
am:
1c36619f5b
Change-Id: Ibdc1ed0f0d432d0b47082195229001ca7174f3ef
Jeff Sharkey [Wed, 11 Oct 2017 23:41:20 +0000 (23:41 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours am:
ba1f2d2571 am:
300e6ffafb am:
f1f2a61fb7 am:
92d80b72aa am:
d6e3d358d4 -s ours am:
bbcb8e4976 am:
753a9ab308
am:
f718585bf4
Change-Id: Id4eea6983de3598693065db4ffb1d51e6d4f06da
Jeff Sharkey [Wed, 11 Oct 2017 23:40:05 +0000 (23:40 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours am:
e9d2113af7 am:
8860624853 am:
7512875224 am:
44adace6c6 am:
af93051ac4 -s ours am:
620c5cfda0 am:
e286f08000
am:
1b1ea965ee
Change-Id: I607857175a10332617ffbe1a8b258c495cd7de84
Hall Liu [Wed, 11 Oct 2017 23:28:42 +0000 (23:28 +0000)]
Merge "Fix URI unparceling and clarify an error condition"
am:
5f123e6ad6
Change-Id: Ib8023d966e01fd2acefc464d8d25ed5030cfd85b
Jeff Sharkey [Wed, 11 Oct 2017 23:28:24 +0000 (23:28 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours am:
e9d2113af7 am:
8860624853 am:
7512875224 am:
44adace6c6 am:
af93051ac4 -s ours am:
620c5cfda0 am:
e286f08000
am:
e68565b630
Change-Id: I5bb8f3b3bd5200b88a17fa4f090ee432c7ab5b52
Seigo Nonaka [Wed, 11 Oct 2017 18:27:50 +0000 (11:27 -0700)]
Fix Catalan and Polish hyphenation.
After I7e2ece979181d12ac1adbede14995ec9b7b87d21, the special hyphenation
logic for Catalan and Policy was not working.
Bug:
65024629
Bug:
67702053
Test: N/A
Change-Id: I985253e24cf0ce4e537c01074e75054381a7816a
Jeff Sharkey [Wed, 11 Oct 2017 23:15:40 +0000 (23:15 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours am:
ba1f2d2571 am:
300e6ffafb am:
f1f2a61fb7 am:
92d80b72aa am:
d6e3d358d4 -s ours am:
bbcb8e4976
am:
753a9ab308
Change-Id: I73681573fc302c587490df16c214ee05049be7c6
Jeff Sharkey [Wed, 11 Oct 2017 23:08:02 +0000 (23:08 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours am:
ba1f2d2571 am:
300e6ffafb am:
f1f2a61fb7 am:
92d80b72aa am:
d6e3d358d4 -s ours am:
bbcb8e4976
am:
753a9ab308
Change-Id: I32ca3f3a6ede37fdc2bd3ed1f03374b45cdb2697
Jeff Sharkey [Wed, 11 Oct 2017 23:06:17 +0000 (23:06 +0000)]
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am:
254369967a am:
4a60106aa0 am:
72df97053c am:
da3d10591a am:
97f6a0da40 -s ours am:
3b47256ccf am:
a7f0504849" into oc-dr1-dev-plus-aosp am:
6ef8866b04
am:
6530612cee -s ours
Change-Id: I4f9d6946e30f63200b66c0c04744feccc03f267a
Hall Liu [Wed, 11 Oct 2017 23:04:58 +0000 (23:04 +0000)]
Merge "Fix URI unparceling and clarify an error condition"
Jeff Sharkey [Wed, 11 Oct 2017 23:01:06 +0000 (23:01 +0000)]
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am:
254369967a am:
4a60106aa0 am:
72df97053c am:
da3d10591a am:
97f6a0da40 -s ours am:
3b47256ccf am:
a7f0504849 am:
5712d1fb47" into oc-mr1-dev-plus-aosp
am:
da968fb57f -s ours
Change-Id: Iec09725428ddb1ae2cea3936395b9ce9c84ecc84
Jeff Sharkey [Wed, 11 Oct 2017 23:00:01 +0000 (23:00 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours am:
e9d2113af7 am:
8860624853 am:
7512875224 am:
44adace6c6 am:
af93051ac4 -s ours am:
620c5cfda0
am:
e286f08000
Change-Id: Ia728bbde02794482c1878089955179b4719e9bd9
Brad Ebinger [Wed, 11 Oct 2017 22:56:47 +0000 (22:56 +0000)]
Merge "Add new Download Error Codes" am:
e9bd5449b5 am:
946ff79971
am:
014d73e287
Change-Id: I7c7dc265bf5ba27b61794d114937c2c4c0816470
Dan Albert [Wed, 11 Oct 2017 22:56:45 +0000 (22:56 +0000)]
Merge "Add missing includes." am:
4be4bb3db7 am:
41c08f49b4 am:
e9aaf3c546
am:
caebafaf94
Change-Id: I5ec663813ede4bb794691ecb5e9afc0140accb84
Jeff Sharkey [Wed, 11 Oct 2017 22:51:51 +0000 (22:51 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours am:
e9d2113af7 am:
8860624853 am:
7512875224 am:
44adace6c6 am:
af93051ac4 -s ours am:
620c5cfda0
am:
e286f08000
Change-Id: Iefbf0c8df06d6cea71d7ccdcd65ff4156a156419
Jeff Sharkey [Wed, 11 Oct 2017 22:51:13 +0000 (22:51 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours am:
ba1f2d2571 am:
300e6ffafb am:
f1f2a61fb7 am:
92d80b72aa am:
d6e3d358d4 -s ours
am:
bbcb8e4976
Change-Id: I924de4599fbf76a83d06cc6e0982bd73067c033a
Jeff Sharkey [Wed, 11 Oct 2017 22:48:29 +0000 (22:48 +0000)]
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am:
9d3706046c am:
b4d23d55c2 am:
e1ae848970 -s ours am:
7f108b81b3 am:
4a71a2daf6 am:
e2a1e9f7d8" into oc-mr1-dev-plus-aosp
am:
54bfe3acdd -s ours
Change-Id: I75c61202b938d1cdf61755877d1ecbfb9191ddea
Jeff Sharkey [Wed, 11 Oct 2017 22:42:20 +0000 (22:42 +0000)]
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am:
254369967a am:
4a60106aa0 am:
72df97053c am:
da3d10591a am:
97f6a0da40 -s ours am:
3b47256ccf am:
a7f0504849" into oc-dr1-dev-plus-aosp
am:
6ef8866b04
Change-Id: Ic989ee531576564282dbc4ab065f4dd6b99a6c4c
Brad Ebinger [Wed, 11 Oct 2017 22:39:14 +0000 (22:39 +0000)]
Merge "Add new Download Error Codes" am:
e9bd5449b5
am:
946ff79971
Change-Id: I756df5c78a96a59468f54ac35e9668d66cf64901
Jeff Sharkey [Wed, 11 Oct 2017 22:37:44 +0000 (22:37 +0000)]
Merge "Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am:
31c5adc279 am:
3f671b3194" into oc-mr1-dev am:
383ab095f5" into oc-mr1-dev-plus-aosp
am:
289b4d8c53 -s ours
Change-Id: Id4fe5d06de655a44e1b0a40aed44acc32df3b30e
Jeff Sharkey [Wed, 11 Oct 2017 22:35:46 +0000 (22:35 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours am:
e9d2113af7 am:
8860624853 am:
7512875224 am:
44adace6c6 am:
af93051ac4 -s ours
am:
620c5cfda0
Change-Id: I07805d81dbcf65993d5dcb695d9877ad4a914bac
Jeff Sharkey [Wed, 11 Oct 2017 22:35:01 +0000 (22:35 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours am:
ba1f2d2571 am:
300e6ffafb am:
f1f2a61fb7 am:
92d80b72aa
am:
d6e3d358d4 -s ours
Change-Id: Iece9faf3d2cbef432450c053d6440d94053bbb00
Jeff Sharkey [Wed, 11 Oct 2017 22:33:05 +0000 (22:33 +0000)]
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am:
9d3706046c am:
b4d23d55c2 am:
e1ae848970 -s ours am:
7f108b81b3 am:
4a71a2daf6 am:
0de1d85a01" into oc-mr1-dev-plus-aosp
am:
a04a837f95 -s ours
Change-Id: I6ea442a00fe0ca7a6af767ae427a0d2b8256b42c
Jean-Michel Trivi [Wed, 11 Oct 2017 22:28:57 +0000 (22:28 +0000)]
Merge "Merge "Fix alarm preview volume" into oc-mr1-dev am:
b9629cd432" into oc-mr1-dev-plus-aosp
am:
fd77afd548
Change-Id: I9ed6b346f9f81a338169628d9e2c955421560744
Android Build Merger (Role) [Wed, 11 Oct 2017 22:28:09 +0000 (22:28 +0000)]
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am:
254369967a am:
4a60106aa0 am:
72df97053c am:
da3d10591a am:
97f6a0da40 -s ours am:
3b47256ccf am:
a7f0504849 am:
5712d1fb47" into oc-mr1-dev-plus-aosp
Jeff Sharkey [Wed, 11 Oct 2017 22:27:31 +0000 (22:27 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours am:
ba1f2d2571 am:
300e6ffafb am:
f1f2a61fb7
am:
92d80b72aa
Change-Id: I872a35e35cf8a997108daad39447bbad36ccfcaf
Jeff Sharkey [Wed, 11 Oct 2017 22:26:38 +0000 (22:26 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am:
254369967a am:
4a60106aa0 am:
72df97053c am:
da3d10591a am:
97f6a0da40 -s ours am:
3b47256ccf am:
a7f0504849
am:
5712d1fb47
Change-Id: Id5d6dd68924837f09d6f2b1178ce41c2d1e81219
Brad Ebinger [Wed, 11 Oct 2017 22:24:58 +0000 (22:24 +0000)]
Merge "Add new Download Error Codes"
am:
e9bd5449b5
Change-Id: I8fa3c3dcc5104a5326a680ae186c9285a7e47358
Jeff Sharkey [Wed, 11 Oct 2017 22:23:16 +0000 (22:23 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours am:
e9d2113af7 am:
8860624853 am:
7512875224 am:
44adace6c6
am:
af93051ac4 -s ours
Change-Id: I93ce23ee4d45491a79346d11aed2cdb0fed0ef9f
Dan Albert [Wed, 11 Oct 2017 22:22:04 +0000 (22:22 +0000)]
Merge "Add missing includes." am:
4be4bb3db7 am:
41c08f49b4
am:
e9aaf3c546
Change-Id: I41e4375d053ad5aa64bd4ca3a78b23644b2c725b
Android Build Merger (Role) [Wed, 11 Oct 2017 22:16:07 +0000 (22:16 +0000)]
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am:
9d3706046c am:
b4d23d55c2 am:
e1ae848970 -s ours am:
7f108b81b3 am:
4a71a2daf6 am:
e2a1e9f7d8" into oc-mr1-dev-plus-aosp
Jeff Sharkey [Wed, 11 Oct 2017 22:15:44 +0000 (22:15 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am:
31c5adc279 am:
3f671b3194 am:
8bfef31ce0
am:
c4649e252d -s ours
Change-Id: I874d8afcbd14d28bf7ade224fc7cb72093482e1d
Android Build Merger (Role) [Wed, 11 Oct 2017 22:14:32 +0000 (22:14 +0000)]
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am:
254369967a am:
4a60106aa0 am:
72df97053c am:
da3d10591a am:
97f6a0da40 -s ours am:
3b47256ccf am:
a7f0504849" into oc-dr1-dev-plus-aosp
Jeff Sharkey [Wed, 11 Oct 2017 22:13:37 +0000 (22:13 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am:
9d3706046c am:
b4d23d55c2 am:
e1ae848970 -s ours am:
7f108b81b3 am:
4a71a2daf6
am:
e2a1e9f7d8
Change-Id: I7a72aa1793c5e45434f50c4d810164fbbfd70ef9
Jeff Sharkey [Wed, 11 Oct 2017 22:12:39 +0000 (22:12 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours am:
e9d2113af7 am:
8860624853 am:
7512875224
am:
44adace6c6
Change-Id: I3d0c489f0a6b3522f93b6d3b4db7892d081dc11c
Brad Ebinger [Wed, 11 Oct 2017 22:12:26 +0000 (22:12 +0000)]
Merge "Add new Download Error Codes"
Jeff Sharkey [Wed, 11 Oct 2017 22:11:57 +0000 (22:11 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours am:
ba1f2d2571 am:
300e6ffafb
am:
f1f2a61fb7
Change-Id: Ib999a03b6b52d8ca7446b1db6450578bab50d5d9
Jeff Sharkey [Wed, 11 Oct 2017 22:11:51 +0000 (22:11 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am:
254369967a am:
4a60106aa0 am:
72df97053c am:
da3d10591a am:
97f6a0da40 -s ours am:
3b47256ccf
am:
a7f0504849
Change-Id: Ib17c9471d7f3bdde18e3de4ad693fd9ef5312059
Jeff Sharkey [Wed, 11 Oct 2017 22:11:49 +0000 (22:11 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am:
254369967a am:
4a60106aa0 am:
72df97053c am:
da3d10591a am:
97f6a0da40 -s ours am:
3b47256ccf
am:
a7f0504849
Change-Id: I08b0a31acd8044b1fb1676052f853bbc1b1201a1
Dan Albert [Wed, 11 Oct 2017 22:07:46 +0000 (22:07 +0000)]
Merge "Add missing includes." am:
4be4bb3db7
am:
41c08f49b4
Change-Id: I67b30cd624fe42521097c20cc45ee6db19c0d43e
Android Build Merger (Role) [Wed, 11 Oct 2017 22:06:40 +0000 (22:06 +0000)]
Merge "Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am:
31c5adc279 am:
3f671b3194" into oc-mr1-dev am:
383ab095f5" into oc-mr1-dev-plus-aosp
Jeff Sharkey [Wed, 11 Oct 2017 22:02:35 +0000 (22:02 +0000)]
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am:
31c5adc279 am:
3f671b3194" into oc-mr1-dev
am:
383ab095f5
Change-Id: Ic1d6542b99aa8e559c17826a32ed128610c964b0
Jeff Sharkey [Wed, 11 Oct 2017 22:00:35 +0000 (22:00 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours am:
e9d2113af7 am:
8860624853
am:
7512875224
Change-Id: I55e255c4089089403a327cb0e24f750b5b9975ec
Android Build Merger (Role) [Wed, 11 Oct 2017 21:59:03 +0000 (21:59 +0000)]
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am:
9d3706046c am:
b4d23d55c2 am:
e1ae848970 -s ours am:
7f108b81b3 am:
4a71a2daf6 am:
0de1d85a01" into oc-mr1-dev-plus-aosp
Jeff Sharkey [Wed, 11 Oct 2017 21:56:49 +0000 (21:56 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am:
9d3706046c am:
b4d23d55c2 am:
e1ae848970 -s ours am:
7f108b81b3 am:
4a71a2daf6
am:
0de1d85a01
Change-Id: I61273206efb364da1317666b199fda6a0ecb5c12
Dan Albert [Wed, 11 Oct 2017 21:52:41 +0000 (21:52 +0000)]
Merge "Add missing includes."
am:
4be4bb3db7
Change-Id: Icdae2b63df8e5d61e6acabb6fb85efa28026d535
Jeff Sharkey [Wed, 11 Oct 2017 21:52:08 +0000 (21:52 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am:
254369967a am:
4a60106aa0 am:
72df97053c am:
da3d10591a am:
97f6a0da40 -s ours
am:
3b47256ccf
Change-Id: Ie321b5922ec83367ec93e528993fb205ebcad1ac
Jeff Sharkey [Wed, 11 Oct 2017 21:51:37 +0000 (21:51 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours am:
ba1f2d2571
am:
300e6ffafb
Change-Id: Iaef9ffa2cdfd6cf424fa22e554df3a0ea4d3e41f
Android Build Merger (Role) [Wed, 11 Oct 2017 21:50:42 +0000 (21:50 +0000)]
Merge "Merge "Fix alarm preview volume" into oc-mr1-dev am:
b9629cd432" into oc-mr1-dev-plus-aosp
Makoto Onuki [Thu, 5 Oct 2017 17:37:55 +0000 (10:37 -0700)]
Improve shortcut backup & restore.
From http://go/p-shortcut-restore :
Currently on pre-P builds, there are 6 cases where shortcuts won't be restored.
Launcher issue:
A: Launcher is downgraded
B: Launcher has allowBackup="false"
C: Launcher's signature changed.
A-C would result in not restoring any shortcuts from any apps.
App issue:
D: App is downgraded
E: App has allowBackup="false"
F: App's signature changed.
D-F would result in not restoring any shortcuts from individual apps.
In P, we'll restore all pinned shortcuts anyway except in case B and C.
The new behavior would be:
A: We'll restore all pinned shortcuts anyway even if the launcher is downgraded.
B: If the launcher doesn't support backup&restore, we still don't restore shortcuts.
C: If the launcher has a different signature, we still don't restore shortcuts.
D, E, F: All pinned shortcuts will be restored, but are disabled.
In case of D, E, F, shortcuts would be:
1. ShortcutInfo.isEnabled() will return false. They are not launchable.
2. If it's case D (downgrade), shortcuts will be re-enabled once a publisher app
is updated to the original version or higher.
3. getDisabledMessage() will return a special, canned message explaining why
they're disabled.
4. A new API getDisabledReason() will return one of the following values:
- DISABLED_REASON_NOT_DISABLED (for non-disabled shortcuts)
- DISABLED_REASON_BY_APP (for shortcuts disabled by apps)
- DISABLED_REASON_APP_CHANGED (for shortcuts disabled when a manifest shortcut is gone.)
- DISABLED_REASON_VERSION_LOWER (case D)
- DISABLED_REASON_BACKUP_NOT_SUPPORTED (case E)
- DISABLED_REASON_SIGNATURE_MISMATCH (case F)
- (DISABLE_REASON_OTHER_RESTORE_ISSUE for future use)
Launcher can opt to use this API to show a custom error message, rather than
using the canned system message from getDisabledMessage().
5. This spec change is completely transparent to publisher apps.
In case D,E,F, the disabled shortcuts will only be visible to the launcher,
and from the publisher app's point of view, they still don't exist.
APIs such as getPinnedShortcuts() will not return them, and updateShortcuts()
will not affect them. The enableShortcut() will not enable them either.
Bug
62451035
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest10 -w com.android.frameworks.servicestests
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsShortcutManagerTestCases
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsShortcutHostTestCases
Change-Id: Ib4d73aa44a0395f5e37c8ad0c9cd041a9038fb66
Jeff Sharkey [Wed, 11 Oct 2017 21:48:19 +0000 (21:48 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am:
31c5adc279 am:
3f671b3194
am:
8bfef31ce0
Change-Id: I79106ed066b76f9597d74e56498fa3a9c6258f7f
Jean-Michel Trivi [Wed, 11 Oct 2017 21:48:00 +0000 (21:48 +0000)]
Merge "Fix alarm preview volume" into oc-mr1-dev
am:
b9629cd432
Change-Id: If5bc5bbdb5239609db61e4706c6b2395b0231f83
Jeff Sharkey [Wed, 11 Oct 2017 21:43:30 +0000 (21:43 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am:
09984216e6 -s ours am:
5f17a285f9 am:
98371ee7c9 am:
e0e1c8ae4c
am:
b49d357915 -s ours
Change-Id: Ib8d2efccb01873827335ca6eece42ca738b67e0c
Jeff Sharkey [Wed, 11 Oct 2017 21:41:50 +0000 (21:41 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours am:
e9d2113af7
am:
8860624853
Change-Id: Iea7736cd9e60673296bd39377393fa785bd58b17
Android Build Merger (Role) [Wed, 11 Oct 2017 21:38:31 +0000 (21:38 +0000)]
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am:
09984216e6 -s ours am:
5f17a285f9 am:
98371ee7c9 am:
e6f60d0fcb am:
4a69ee914c -s ours"
Jeff Sharkey [Wed, 11 Oct 2017 21:38:30 +0000 (21:38 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am:
9d3706046c am:
b4d23d55c2 am:
e1ae848970 -s ours am:
7f108b81b3
am:
4a71a2daf6
Change-Id: Id8a401121d8bff24b5695f0ad0d4c923da93995c
Treehugger Robot [Wed, 11 Oct 2017 21:37:28 +0000 (21:37 +0000)]
Merge "Add missing includes."
Jeff Sharkey [Wed, 11 Oct 2017 21:36:45 +0000 (21:36 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am:
9d3706046c am:
b4d23d55c2 am:
e1ae848970 -s ours am:
7f108b81b3
am:
4a71a2daf6
Change-Id: I0fef13605c0a2da1b787bc11ac4ec06926665ba2
Jeff Sharkey [Wed, 11 Oct 2017 21:35:48 +0000 (21:35 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am:
09984216e6 -s ours am:
5f17a285f9 am:
98371ee7c9 am:
e6f60d0fcb
am:
4a69ee914c -s ours
Change-Id: Id50190ce08ae0d0f1e417db0f7290b3c7ea5c2fe
Jeff Sharkey [Wed, 11 Oct 2017 21:34:52 +0000 (21:34 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63 am:
8916c30c54 -s ours
am:
ba1f2d2571
Change-Id: Ie72b8e52cd8717ac87d90627c1f53cbe2261c5e5
Jeff Sharkey [Wed, 11 Oct 2017 21:34:24 +0000 (21:34 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am:
254369967a am:
4a60106aa0 am:
72df97053c am:
da3d10591a
am:
97f6a0da40 -s ours
Change-Id: Icd0d048be2d037fa19befb94ccd8d6fda26bee74
Jeff Sharkey [Wed, 11 Oct 2017 21:32:36 +0000 (21:32 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am:
09984216e6 -s ours am:
5f17a285f9 am:
98371ee7c9
am:
e0e1c8ae4c
Change-Id: I4ace250ae2b4998e7c77f361dddd47f815b9ad27
Bryce Lee [Wed, 11 Oct 2017 21:29:56 +0000 (21:29 +0000)]
Merge "Initial tests for launch bounds."
TreeHugger Robot [Wed, 11 Oct 2017 21:27:05 +0000 (21:27 +0000)]
Merge "Removed remaining use of static stack ids."
Android Build Merger (Role) [Wed, 11 Oct 2017 21:26:04 +0000 (21:26 +0000)]
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am:
31c5adc279 am:
3f671b3194" into oc-mr1-dev
Jeff Sharkey [Wed, 11 Oct 2017 21:24:41 +0000 (21:24 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am:
254369967a am:
4a60106aa0 am:
72df97053c
am:
da3d10591a
Change-Id: I22ddd0fb81ca1acdb070a5872b4c0a31e197e15b
Hall Liu [Wed, 11 Oct 2017 02:08:24 +0000 (19:08 -0700)]
Fix URI unparceling and clarify an error condition
Use the proper unparceling method for lists, add a more verbose
exception for when the app fails to declare a critical piece of
metadata.
Change-Id: I29d5291d7b88476496334d268be94f7f8c08255c
Fixes:
67640653
Test: manual, with testapp
Jeff Sharkey [Wed, 11 Oct 2017 21:24:00 +0000 (21:24 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee am:
e62d479921 -s ours
am:
e9d2113af7
Change-Id: Id1d09fd582e8a213f49e215af708291dfc76bb78
Android Build Merger (Role) [Wed, 11 Oct 2017 21:23:45 +0000 (21:23 +0000)]
Merge "Merge "Check target api version before crashing apps." into oc-mr1-dev am:
4e733f3074 am:
c1bcf2ff95"
Jeff Sharkey [Wed, 11 Oct 2017 21:23:11 +0000 (21:23 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am:
09984216e6 -s ours am:
5f17a285f9 am:
98371ee7c9
am:
e6f60d0fcb
Change-Id: Ia9d41c8a74dd6862e27c9712ff404efa75caeda4
Jeff Sharkey [Wed, 11 Oct 2017 21:21:51 +0000 (21:21 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am:
31c5adc279
am:
3f671b3194
Change-Id: I16c9f75cf0181b834cbfa1a7e716aaced2768c5e
Julia Reynolds [Wed, 11 Oct 2017 21:20:55 +0000 (21:20 +0000)]
Merge "Check target api version before crashing apps." into oc-mr1-dev am:
4e733f3074
am:
c1bcf2ff95
Change-Id: I3d8003a0a4f1c2917af1aae93575672fcbf10e74
Jeff Sharkey [Wed, 11 Oct 2017 21:20:52 +0000 (21:20 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c am:
5d60a49d63
am:
8916c30c54 -s ours
Change-Id: Ia94b157d80bec5c24616af67c19bbceb0c384c36
TreeHugger Robot [Wed, 11 Oct 2017 21:20:17 +0000 (21:20 +0000)]
Merge "Don't proguard FrameworksServicesTests"
TreeHugger Robot [Wed, 11 Oct 2017 21:19:54 +0000 (21:19 +0000)]
Merge "Fix alarm preview volume" into oc-mr1-dev
Jeff Sharkey [Wed, 11 Oct 2017 21:19:01 +0000 (21:19 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am:
31c5adc279
am:
3f671b3194
Change-Id: I9abdd6f2df64398385a98686d66c4c043939adc6
Jeff Sharkey [Wed, 11 Oct 2017 21:18:21 +0000 (21:18 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am:
9d3706046c am:
b4d23d55c2 am:
e1ae848970 -s ours
am:
7f108b81b3
Change-Id: I87e6ae95c5a4be28cd268bac73548de83cf61ed6
Jeff Sharkey [Wed, 11 Oct 2017 21:12:09 +0000 (21:12 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am:
254369967a am:
4a60106aa0
am:
72df97053c
Change-Id: I62e502ebc6ac642cac7165ce1ce0982675362ab3
Jeff Sharkey [Wed, 11 Oct 2017 21:04:06 +0000 (21:04 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am:
09984216e6 -s ours am:
5f17a285f9
am:
98371ee7c9
Change-Id: I02c6f8314289abbc0639c634c478f293ecd1d679
Jeff Sharkey [Wed, 11 Oct 2017 21:03:59 +0000 (21:03 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am:
09984216e6 -s ours am:
5f17a285f9
am:
98371ee7c9
Change-Id: Ib74482b52dcd5e3ac21b4b61e6a56f3293cddbd5
Jeff Sharkey [Wed, 11 Oct 2017 21:00:20 +0000 (21:00 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am:
9d3706046c am:
b4d23d55c2
am:
e1ae848970 -s ours
Change-Id: Ic511d47f88b86fa999beae0363da07ee4fc1a3be
Jeff Sharkey [Wed, 11 Oct 2017 20:59:51 +0000 (20:59 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9 am:
d20cad62ee
am:
e62d479921 -s ours
Change-Id: I1bc814da2ad8f108189d7f2293bf373b04434257
Jeff Sharkey [Wed, 11 Oct 2017 20:58:32 +0000 (20:58 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
d87d2746a9 am:
7555eb508c
am:
5d60a49d63
Change-Id: I1b0f66ccf915436637a804ff0517c431b2813ec8
Jeff Sharkey [Wed, 11 Oct 2017 20:57:08 +0000 (20:57 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev
am:
31c5adc279
Change-Id: Id9a5a0216f1f26e059df45cc866582fe04cdf47d
Julia Reynolds [Wed, 11 Oct 2017 20:54:39 +0000 (20:54 +0000)]
Merge "Check target api version before crashing apps." into oc-mr1-dev
am:
4e733f3074
Change-Id: I41d02093b1a471123e4dffd90da8cacffa23e769
OSDN Git Service
