OSDN Git Service
Bill Yi [Fri, 1 Jul 2016 05:18:54 +0000 (05:18 +0000)]
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am:
689366fe33 -s ours am:
2c7f1130e4 -s ours
am:
488281e336 -s ours
Change-Id: I51d140d0c294e8602a66927136f01e35048b6c6e
Bill Yi [Fri, 1 Jul 2016 05:18:52 +0000 (05:18 +0000)]
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am:
9d3c51d66f -s ours am:
cee545ed44 -s ours
am:
4076e502e7 -s ours
Change-Id: Ie95845dfb267a2a641be793a5ded082f29a01ff0
Bill Yi [Fri, 1 Jul 2016 05:18:50 +0000 (05:18 +0000)]
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am:
baedc65a8b -s ours am:
273eac9b75 -s ours
am:
717a49250e -s ours
Change-Id: I48763748c92fcb61b110a8492ec7e2abe01597da
Bill Yi [Fri, 1 Jul 2016 05:18:47 +0000 (05:18 +0000)]
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am:
914376787b -s ours am:
324990b5e3 -s ours
am:
a56683cda2 -s ours
Change-Id: Ie4a4ebc8d1ad17d5a500c88b9e6b28202415d567
Bill Yi [Fri, 1 Jul 2016 05:18:44 +0000 (05:18 +0000)]
Import translations. DO NOT MERGE am:
9a2f574fce -s ours am:
50cdecd821 -s ours
am:
33eb0e2d33 -s ours
Change-Id: I327afa019aad078d98fce53b4f213a0989fb32ac
Bill Yi [Fri, 1 Jul 2016 05:11:04 +0000 (05:11 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am:
689366fe33 -s ours
am:
2c7f1130e4 -s ours
Change-Id: I887b1a63787c871651ffa1cd420bcb99941e291a
Bill Yi [Fri, 1 Jul 2016 05:11:02 +0000 (05:11 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am:
9d3c51d66f -s ours
am:
cee545ed44 -s ours
Change-Id: Id25b2ed05738007f3ba990b9deb527ccaf15448c
Bill Yi [Fri, 1 Jul 2016 05:11:00 +0000 (05:11 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am:
baedc65a8b -s ours
am:
273eac9b75 -s ours
Change-Id: I8dd4427627c41546e1fdb36cbfff2db7798766c7
Bill Yi [Fri, 1 Jul 2016 05:10:58 +0000 (05:10 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am:
914376787b -s ours
am:
324990b5e3 -s ours
Change-Id: Icc0fb526666ab153a18521d6d376914c61636328
Bill Yi [Fri, 1 Jul 2016 05:10:56 +0000 (05:10 +0000)]
Import translations. DO NOT MERGE am:
9a2f574fce -s ours
am:
50cdecd821 -s ours
Change-Id: Icabaee09ce2958f4aa9594468c02edae1882738c
Bill Yi [Fri, 1 Jul 2016 05:04:26 +0000 (05:04 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am:
689366fe33 -s ours
Change-Id: I6127c59df61f68ba301224d8cf08cba8093fe19f
Bill Yi [Fri, 1 Jul 2016 05:04:08 +0000 (05:04 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am:
9d3c51d66f -s ours
Change-Id: Ic0c5b7a3a8cd712208857abe3fb9605e899475c5
Bill Yi [Fri, 1 Jul 2016 05:04:01 +0000 (05:04 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am:
baedc65a8b -s ours
Change-Id: I99e147e68c8caa5c5dcacaaf4e0a9697f5409790
Bill Yi [Fri, 1 Jul 2016 05:03:55 +0000 (05:03 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am:
914376787b -s ours
Change-Id: Ieef4f72f12ba13dbc1d0a13bdfae94729f4c87d8
Bill Yi [Fri, 1 Jul 2016 05:03:49 +0000 (05:03 +0000)]
Import translations. DO NOT MERGE
am:
9a2f574fce -s ours
Change-Id: I272624435bf8a0bb07be7eb883f85f073623d85f
TreeHugger Robot [Fri, 1 Jul 2016 04:52:19 +0000 (04:52 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 1 Jul 2016 04:52:04 +0000 (04:52 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 1 Jul 2016 04:51:49 +0000 (04:51 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 1 Jul 2016 04:49:40 +0000 (04:49 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 1 Jul 2016 03:52:47 +0000 (03:52 +0000)]
Merge "Move GestureListener to own file."
Bill Yi [Fri, 1 Jul 2016 02:59:37 +0000 (19:59 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
29390361
Change-Id: Iac4bc0fff7337c0971222e59b1f01e4a7ff3a1c5
Bill Yi [Fri, 1 Jul 2016 02:53:56 +0000 (19:53 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
29390361
Change-Id: I75df6be0cf865770568238976172e093082dca3d
Jaewan Kim [Fri, 1 Jul 2016 02:35:51 +0000 (02:35 +0000)]
Merge "Add more comment for MediaSession.setMetadata"
Steve McKay [Thu, 30 Jun 2016 19:09:34 +0000 (12:09 -0700)]
Move GestureListener to own file.
And:
- make MotionInputEvent AutoCloseable (and update obtainers accordingly).
- remove unused constructor args and overloading from MultiSelectManager.
Change-Id: I335a95c3d05ab10bdcbfebab8dc69f0b2f681e3a
TreeHugger Robot [Fri, 1 Jul 2016 02:13:15 +0000 (02:13 +0000)]
Merge "UiBench: bump tools ang gradle versions to newer ones"
Bill Yi [Fri, 1 Jul 2016 01:41:48 +0000 (18:41 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
29390361
Change-Id: Ie154b48d77d2bc34ae1e71e1c3813c3ed2959eeb
Bill Yi [Fri, 1 Jul 2016 01:39:36 +0000 (18:39 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
29390361
Change-Id: Ia84a48847f77b72112f827ed67332fb1e293eea8
Bill Yi [Fri, 1 Jul 2016 01:37:21 +0000 (18:37 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
29390361
Change-Id: I8a6fa77b6a2227f5a33435fcd940909f52a84db3
Suprabh Shukla [Fri, 1 Jul 2016 01:36:55 +0000 (01:36 +0000)]
Merge \\"Disabling account modification on demo users\\" into nyc-mr1-dev am:
c7b1d74ae8
am:
7468a23eca
Change-Id: Ic67fa3b042b5a72f11ce9b37a1c12babfbbe77bb
Yohei Yukawa [Fri, 1 Jul 2016 01:28:47 +0000 (01:28 +0000)]
Merge \\"Automatically grant URI permission as needed.\\" into nyc-mr1-dev am:
d2e046a720
am:
1a932852d4
Change-Id: I1b54d8e32c4813d641df66075f3845f94858c63b
Suprabh Shukla [Fri, 1 Jul 2016 01:28:44 +0000 (01:28 +0000)]
Merge \"Disabling account modification on demo users\" into nyc-mr1-dev
am:
c7b1d74ae8
Change-Id: I16ce1564faa68f6c05e1dc37d0488063df3d3045
Yohei Yukawa [Fri, 1 Jul 2016 01:23:27 +0000 (01:23 +0000)]
Merge \"Automatically grant URI permission as needed.\" into nyc-mr1-dev
am:
d2e046a720
Change-Id: I376fdeddb57a923fd3a71086ef6f8e6021347cbb
TreeHugger Robot [Fri, 1 Jul 2016 01:17:32 +0000 (01:17 +0000)]
Merge "Disabling account modification on demo users" into nyc-mr1-dev
Yohei Yukawa [Fri, 1 Jul 2016 01:09:54 +0000 (01:09 +0000)]
Merge "Automatically grant URI permission as needed." into nyc-mr1-dev
Android Build Merger (Role) [Fri, 1 Jul 2016 00:42:02 +0000 (00:42 +0000)]
Merge "Merge \"Make sure SELinux labels are correct after move-to operations am:
fa7d97fa15 am:
9ecf5010d3\" into nyc-mr1-dev-plus-aosp am:
1b24ab8d20"
Android Build Merger (Role) [Fri, 1 Jul 2016 00:41:53 +0000 (00:41 +0000)]
Merge "Make sure SELinux labels are correct after move-to operations am:
fa7d97fa15 am:
4b96358fcb am:
cb9705d833"
TreeHugger Robot [Fri, 1 Jul 2016 00:41:34 +0000 (00:41 +0000)]
Merge "Fix UiBench MainActivity fragment"
Christopher Tate [Fri, 1 Jul 2016 00:41:29 +0000 (00:41 +0000)]
Merge \"Make sure SELinux labels are correct after move-to operations am:
fa7d97fa15 am:
9ecf5010d3\" into nyc-mr1-dev-plus-aosp
am:
1b24ab8d20
Change-Id: I7ab7dee45e3c4747376bcf62f3032298e544e258
Christopher Tate [Fri, 1 Jul 2016 00:41:23 +0000 (00:41 +0000)]
Make sure SELinux labels are correct after move-to operations am:
fa7d97fa15 am:
4b96358fcb
am:
cb9705d833
Change-Id: Id12b564eab7dc5faad090e7fa076f0ab3d15d480
Android Build Merger (Role) [Fri, 1 Jul 2016 00:37:10 +0000 (00:37 +0000)]
Merge "Make sure SELinux labels are correct after move-to operations am:
fa7d97fa15 am:
9ecf5010d3" into nyc-mr1-dev-plus-aosp
Christopher Tate [Fri, 1 Jul 2016 00:36:32 +0000 (00:36 +0000)]
Make sure SELinux labels are correct after move-to operations am:
fa7d97fa15
am:
9ecf5010d3
Change-Id: Ie23d5d9dbc75ddbbe50033dcdc71e6802086c8df
Christopher Tate [Fri, 1 Jul 2016 00:36:30 +0000 (00:36 +0000)]
Make sure SELinux labels are correct after move-to operations am:
fa7d97fa15
am:
4b96358fcb
Change-Id: I45bb5260b1b1fbfa1393d57cf9f0761e0df608ce
Adam Lesinski [Fri, 1 Jul 2016 00:36:06 +0000 (00:36 +0000)]
Merge "Build SystemUI and Keyguard with AAPT2"
Christopher Tate [Fri, 1 Jul 2016 00:29:33 +0000 (00:29 +0000)]
Make sure SELinux labels are correct after move-to operations
am:
fa7d97fa15
Change-Id: I913e54c6269f75b10b51030d0b2921007107281d
Christopher Tate [Fri, 1 Jul 2016 00:29:22 +0000 (00:29 +0000)]
Make sure SELinux labels are correct after move-to operations
am:
fa7d97fa15
Change-Id: Ib4f969a5a2ed7ffbcf6dd0f3cfbb0e5f576585a2
Christopher Tate [Thu, 30 Jun 2016 19:21:57 +0000 (12:21 -0700)]
Make sure SELinux labels are correct after move-to operations
In some circumstances wallpaper-related files are moved into position,
and must then take proper effect. Make sure that they have the
correct SELinux labels afterwards to avoid preventing some valid
accesses.
Bug
29469965
Change-Id: I6d7c86be63d568fa0ad8841d109a7ff2149fdd54
TreeHugger Robot [Fri, 1 Jul 2016 00:03:57 +0000 (00:03 +0000)]
Merge "Refactor WordIterator to avoid copying to internal buffers"
fionaxu [Thu, 30 Jun 2016 23:58:34 +0000 (23:58 +0000)]
Merge \"DO NOT MERGE revert public api loadSafeLabel am:
f44c73abb2 am:
a0263a9909 am:
a3b851d352 -s ours am:
f52501d2d4 -s ours am:
cbb7b8c7a4 am:
c666ebef33 am:
1e1974705b -s ours am:
c7824b3de3 am:
0b2c2b2a8c am:
b281795c12 am:
17414d65fa -s ours am:
4ce343881c am:
8aa4a84bc8\" into nyc-mr1-dev-plus-aosp
am:
7258aac39a -s ours
Change-Id: I42d2cf249f501b3444aa63e6a0aa4288fb07da67
Fyodor Kupolov [Thu, 30 Jun 2016 23:58:31 +0000 (23:58 +0000)]
Merge \"Merge \\"Performance optimizations in generatePackageInfo\\" into nyc-mr1-dev am:
4d9af67fe2\" into nyc-mr1-dev-plus-aosp
am:
d6340b4226
Change-Id: Id0f1d008b69e2cf7ef3029a724f767a74139c4de
fionaxu [Thu, 30 Jun 2016 23:58:26 +0000 (23:58 +0000)]
DO NOT MERGE revert public api loadSafeLabel am:
f44c73abb2 am:
a0263a9909 am:
a3b851d352 -s ours am:
f52501d2d4 -s ours am:
cbb7b8c7a4 am:
c666ebef33 am:
1e1974705b -s ours am:
c7824b3de3 am:
0b2c2b2a8c am:
b281795c12 am:
17414d65fa -s ours am:
4ce343881c am:
34f01b83d8
am:
e04822dbd3 -s ours
Change-Id: I3f1e30bf2a2629725822536326d8e99296e093bd
Android Build Merger (Role) [Thu, 30 Jun 2016 23:54:39 +0000 (23:54 +0000)]
Merge "DO NOT MERGE revert public api loadSafeLabel am:
f44c73abb2 am:
a0263a9909 am:
a3b851d352 -s ours am:
f52501d2d4 -s ours am:
cbb7b8c7a4 am:
c666ebef33 am:
1e1974705b -s ours am:
c7824b3de3 am:
0b2c2b2a8c am:
b281795c12 am:
17414d65fa -s ours am:
4ce343881c am:
8aa4a84bc8" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 30 Jun 2016 23:54:24 +0000 (23:54 +0000)]
Merge "Merge \"Performance optimizations in generatePackageInfo\" into nyc-mr1-dev am:
4d9af67fe2" into nyc-mr1-dev-plus-aosp
fionaxu [Thu, 30 Jun 2016 23:53:43 +0000 (23:53 +0000)]
DO NOT MERGE revert public api loadSafeLabel am:
f44c73abb2 am:
a0263a9909 am:
a3b851d352 -s ours am:
f52501d2d4 -s ours am:
cbb7b8c7a4 am:
c666ebef33 am:
1e1974705b -s ours am:
c7824b3de3 am:
0b2c2b2a8c am:
b281795c12 am:
17414d65fa -s ours am:
4ce343881c
am:
8aa4a84bc8
Change-Id: I7c769f0b1c33b3abd88ae7f465774d9268d76627
Fyodor Kupolov [Thu, 30 Jun 2016 23:53:33 +0000 (23:53 +0000)]
Merge \"Performance optimizations in generatePackageInfo\" into nyc-mr1-dev
am:
4d9af67fe2
Change-Id: I55dc84ea787cb886f4f54d7e2af00a8d578b160a
Svetoslav Ganov [Thu, 30 Jun 2016 23:51:21 +0000 (23:51 +0000)]
Merge \"Merge \\\"Removed warning when objects are added on wrong order.\\\" into nyc-dev am:
a98e4512df am:
7524b13642\" into nyc-mr1-dev-plus-aosp
am:
ca2f00f818
Change-Id: Ief58244e3252f38599701e7d990a855909b6b306
Tenghui Zhu [Thu, 30 Jun 2016 23:51:18 +0000 (23:51 +0000)]
Merge \"Merge \\\"Mutate the drawable if a valid state change happen\\\" into nyc-dev am:
486c76b5ef am:
f509358169\" into nyc-mr1-dev-plus-aosp
am:
e6a9d4c78d
Change-Id: Id3f4ec526f9a60086c5f984e26f3d1f7e3167d0d
Steve McKay [Thu, 30 Jun 2016 23:51:16 +0000 (23:51 +0000)]
Merge \"Merge \\"Allow quick view package to be set via setprop.\\" into nyc-mr1-dev am:
24cea93b4a\" into nyc-mr1-dev-plus-aosp
am:
35c77908f0
Change-Id: Ib4b46c435e38caf362f91c9674766621146ac770
fionaxu [Thu, 30 Jun 2016 23:51:14 +0000 (23:51 +0000)]
DO NOT MERGE revert public api loadSafeLabel am:
f44c73abb2 am:
a0263a9909 am:
a3b851d352 -s ours am:
f52501d2d4 -s ours am:
cbb7b8c7a4 am:
c666ebef33 am:
1e1974705b -s ours am:
c7824b3de3 am:
0b2c2b2a8c am:
b281795c12 am:
17414d65fa -s ours am:
4ce343881c
am:
34f01b83d8
Change-Id: I3d2b82f772580e74403dd745b0b3f744be3dc30a
Felipe Leme [Thu, 30 Jun 2016 23:51:12 +0000 (23:51 +0000)]
Merge \\\"Removed warning when objects are added on wrong order.\\\" into nyc-dev am:
a98e4512df am:
620936768f
am:
a22f5a3fb4
Change-Id: I744e2febd16c65c58b7313e704d26d03adc6be9c
Android Build Merger (Role) [Thu, 30 Jun 2016 23:45:40 +0000 (23:45 +0000)]
Merge "Merge \\"Removed warning when objects are added on wrong order.\\" into nyc-dev am:
a98e4512df am:
7524b13642" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 30 Jun 2016 23:45:29 +0000 (23:45 +0000)]
Merge "Merge \\"Mutate the drawable if a valid state change happen\\" into nyc-dev am:
486c76b5ef am:
f509358169" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 30 Jun 2016 23:45:20 +0000 (23:45 +0000)]
Merge "Merge \"Allow quick view package to be set via setprop.\" into nyc-mr1-dev am:
24cea93b4a" into nyc-mr1-dev-plus-aosp
fionaxu [Thu, 30 Jun 2016 23:45:11 +0000 (23:45 +0000)]
DO NOT MERGE revert public api loadSafeLabel am:
f44c73abb2 am:
a0263a9909 am:
a3b851d352 -s ours am:
f52501d2d4 -s ours am:
cbb7b8c7a4 am:
c666ebef33 am:
1e1974705b -s ours am:
c7824b3de3 am:
0b2c2b2a8c am:
b281795c12 am:
17414d65fa -s ours
am:
4ce343881c
Change-Id: Ied3d2def63639500d7f795ffd57ba52fc4a01795
fionaxu [Thu, 30 Jun 2016 23:45:10 +0000 (23:45 +0000)]
DO NOT MERGE revert public api loadSafeLabel am:
f44c73abb2 am:
a0263a9909 am:
a3b851d352 -s ours am:
f52501d2d4 -s ours am:
cbb7b8c7a4 am:
c666ebef33 am:
1e1974705b -s ours am:
c7824b3de3 am:
0b2c2b2a8c am:
b281795c12 am:
17414d65fa -s ours
am:
4ce343881c
Change-Id: Iead6e156fdf407e2cadc992bffd8c2df2322f25f
Svetoslav Ganov [Thu, 30 Jun 2016 23:44:47 +0000 (23:44 +0000)]
Merge \\"Removed warning when objects are added on wrong order.\\" into nyc-dev am:
a98e4512df
am:
7524b13642
Change-Id: Ied3eaa444419fcb6b429a2101d960ba0dcba449f
Svetoslav Ganov [Thu, 30 Jun 2016 23:44:34 +0000 (23:44 +0000)]
Merge \\"Removed warning when objects are added on wrong order.\\" into nyc-dev am:
a98e4512df
am:
620936768f
Change-Id: I6986568b24bb4122452314d412b0f3d6422c61b4
Tenghui Zhu [Thu, 30 Jun 2016 23:44:34 +0000 (23:44 +0000)]
Merge \\"Mutate the drawable if a valid state change happen\\" into nyc-dev am:
486c76b5ef
am:
f509358169
Change-Id: Ib0639990f512be221afff3c305862e8cc80287f9
Steve McKay [Thu, 30 Jun 2016 23:44:23 +0000 (23:44 +0000)]
Merge \"Allow quick view package to be set via setprop.\" into nyc-mr1-dev
am:
24cea93b4a
Change-Id: I6b95a25e1b038d8b3ffcbce1019688be3a3980db
Teng-Hui Zhu [Thu, 30 Jun 2016 23:41:51 +0000 (23:41 +0000)]
Merge \\\"Mutate the drawable if a valid state change happen\\\" into nyc-dev am:
486c76b5ef am:
526dba474a
am:
3f7b0c1d85
Change-Id: I258763b90eb635b31c58976cd3e4b969659903e7
Philip Cuadra [Thu, 30 Jun 2016 23:41:48 +0000 (23:41 +0000)]
Merge \\"Pinner Service - Pin Camera app on unlock if requested by the config\\" into nyc-mr1-dev am:
e260ba666f
am:
015a075d7b
Change-Id: I45ffe91a3f80953d54b97e2cabe84a05fc12ce8c
TreeHugger Robot [Thu, 30 Jun 2016 23:38:57 +0000 (23:38 +0000)]
Merge "Performance optimizations in generatePackageInfo" into nyc-mr1-dev
Suprabh Shukla [Thu, 30 Jun 2016 23:32:20 +0000 (16:32 -0700)]
Disabling account modification on demo users
Added user restriction DISALLOW_MODIFY_ACCOUNTS on demo users
Bug:
29910166
Change-Id: I21c9534a3ae66dc3ab650e2d1a45a65cc8ffbd2a
Felipe Leme [Thu, 30 Jun 2016 23:37:24 +0000 (23:37 +0000)]
Merge \"Removed warning when objects are added on wrong order.\" into nyc-dev
am:
a98e4512df
Change-Id: Ic93707d6cda6dbdeed851f216eedbd4333d483ae
Felipe Leme [Thu, 30 Jun 2016 23:37:13 +0000 (23:37 +0000)]
Merge \"Removed warning when objects are added on wrong order.\" into nyc-dev
am:
a98e4512df
Change-Id: Ibfa5a20731caae48c7961ab0452a72d7bff34cf0
TreeHugger Robot [Thu, 30 Jun 2016 23:36:38 +0000 (23:36 +0000)]
Merge "Improvements on 'list packages' command:"
fionaxu [Thu, 30 Jun 2016 23:34:08 +0000 (23:34 +0000)]
DO NOT MERGE revert public api loadSafeLabel am:
f44c73abb2 am:
a0263a9909 am:
a3b851d352 -s ours am:
f52501d2d4 -s ours am:
cbb7b8c7a4 am:
c666ebef33 am:
1e1974705b -s ours am:
c7824b3de3 am:
0b2c2b2a8c am:
b281795c12
am:
17414d65fa -s ours
Change-Id: Ib23d4fd1ac69446544e866a2f0fdc4c28076d148
Tenghui Zhu [Thu, 30 Jun 2016 23:34:07 +0000 (23:34 +0000)]
Merge \\"Mutate the drawable if a valid state change happen\\" into nyc-dev am:
486c76b5ef
am:
526dba474a
Change-Id: I202a1bc736c7599c0f9421bcc348a4d5d201a06f
Svetoslav Ganov [Thu, 30 Jun 2016 23:28:58 +0000 (23:28 +0000)]
Merge "Removed warning when objects are added on wrong order." into nyc-dev
Sergey Vasilinets [Thu, 30 Jun 2016 23:28:20 +0000 (16:28 -0700)]
UiBench: bump tools ang gradle versions to newer ones
Change-Id: I6416e1a739afd1769ef223aa898e0e03771f078f
Yohei Yukawa [Thu, 30 Jun 2016 23:27:46 +0000 (16:27 -0700)]
Automatically grant URI permission as needed.
With this CL, the system automatically grants a temporary URI permission
to the target application when the IME calls
InputConnection#commitContent() with
InputConnection#INPUT_CONTENT_GRANT_READ_URI_PERMISSION. The temporary
permission will be revoked by any of the following events:
- InputContentInfo#releasePermission() is explicitly called by the
target application.
- The target application returned false in
InputConnection#commitContent().
- All the InputContentInfo instances copied from the original one are
GC-ed.
If we do not do this and there is an application that forgot to call
that method then there is no way for IME developers to prevent
permission denial from happening in the application except for relaxing
the default permission of the ContentProvider just because of such an
application.
Although application developers are still expected to explicitly call
InputContentInfo#{request,release}Permission(), forgetting to call
InputContentInfo#requestPermission() does not hurt the user anymore.
With this CL, calling InputContentInfo#requestPermission() after calling
InputContentInfo#releasePermission() is also allowed.
Bug:
29892936
Change-Id: Id955435dd2e72549ee7134f46b3c6951581694ad
Teng-Hui Zhu [Thu, 30 Jun 2016 23:27:21 +0000 (23:27 +0000)]
Merge \"Mutate the drawable if a valid state change happen\" into nyc-dev
am:
486c76b5ef
Change-Id: I9c42777b96376ce009a22171911acd29aac15b85
Philip Cuadra [Thu, 30 Jun 2016 23:27:00 +0000 (23:27 +0000)]
Merge \"Pinner Service - Pin Camera app on unlock if requested by the config\" into nyc-mr1-dev
am:
e260ba666f
Change-Id: I460e52ac73c0836c72a313cb890971e8a0767ef8
fionaxu [Thu, 30 Jun 2016 23:26:56 +0000 (23:26 +0000)]
DO NOT MERGE revert public api loadSafeLabel am:
f44c73abb2 am:
a0263a9909 am:
a3b851d352 -s ours am:
f52501d2d4 -s ours am:
cbb7b8c7a4 am:
c666ebef33 am:
1e1974705b -s ours am:
c7824b3de3 am:
0b2c2b2a8c
am:
b281795c12
Change-Id: I666bfd00c747b43ef07f90b8ef61b8fe79470312
Teng-Hui Zhu [Thu, 30 Jun 2016 23:25:56 +0000 (23:25 +0000)]
Merge \"Mutate the drawable if a valid state change happen\" into nyc-dev
am:
486c76b5ef
Change-Id: I9f09c87cd4f738066c55d28fa7849fafdc33b7f9
Adrian Roos [Thu, 30 Jun 2016 23:23:26 +0000 (23:23 +0000)]
Merge \"Merge \\\"Fix missing header text in notification groups\\\" into nyc-dev am:
a275ec269f am:
78f525b674\" into nyc-mr1-dev-plus-aosp
am:
37eae74dc0
Change-Id: I2eef54784caa27ff1e49033866e239484ed6b7e6
Adrian Roos [Thu, 30 Jun 2016 23:23:23 +0000 (23:23 +0000)]
Merge \\\"Fix missing header text in notification groups\\\" into nyc-dev am:
a275ec269f am:
1b7dbd9253
am:
fa42bb3fa5
Change-Id: Ie9da99d8a593dad326cb3b90e989113c66f5ceba
TreeHugger Robot [Thu, 30 Jun 2016 23:22:31 +0000 (23:22 +0000)]
Merge "Allow quick view package to be set via setprop." into nyc-mr1-dev
fionaxu [Thu, 30 Jun 2016 23:19:16 +0000 (23:19 +0000)]
DO NOT MERGE revert public api loadSafeLabel am:
f44c73abb2 am:
a0263a9909 am:
a3b851d352 -s ours am:
f52501d2d4 -s ours am:
cbb7b8c7a4 am:
c666ebef33 am:
1e1974705b -s ours am:
c7824b3de3
am:
0b2c2b2a8c
Change-Id: I49b57d13076a736f674434403ac2470680fe398a
Felipe Leme [Thu, 30 Jun 2016 23:09:13 +0000 (16:09 -0700)]
Removed warning when objects are added on wrong order.
append() is used to optimized insertions in the array, but it must
preserve the order of the hashcode array; when it doesn't, it falls back
to append(), but it should not log a warning message
In particular, PendingIntentRecords might have different hashcodes
across different processes.
Fixes:
29912192
Change-Id: I0ab566249829ddb934fd51cf21399b68cb286bd5
Android Build Merger (Role) [Thu, 30 Jun 2016 23:18:56 +0000 (23:18 +0000)]
Merge "Merge \\"Fix missing header text in notification groups\\" into nyc-dev am:
a275ec269f am:
78f525b674" into nyc-mr1-dev-plus-aosp
Adrian Roos [Thu, 30 Jun 2016 23:18:29 +0000 (23:18 +0000)]
Merge \\"Fix missing header text in notification groups\\" into nyc-dev am:
a275ec269f
am:
1b7dbd9253
Change-Id: I007196bd1e93e3a89768b58f688e9a600694174f
Adrian Roos [Thu, 30 Jun 2016 23:18:28 +0000 (23:18 +0000)]
Merge \\"Fix missing header text in notification groups\\" into nyc-dev am:
a275ec269f
am:
78f525b674
Change-Id: I85c9802acfe74e4bd333dc789d3fc8a65f303170
Philip Cuadra [Thu, 30 Jun 2016 23:15:29 +0000 (23:15 +0000)]
Merge "Pinner Service - Pin Camera app on unlock if requested by the config" into nyc-mr1-dev
Tenghui Zhu [Thu, 30 Jun 2016 23:12:37 +0000 (23:12 +0000)]
Merge "Mutate the drawable if a valid state change happen" into nyc-dev
Teng-Hui Zhu [Wed, 29 Jun 2016 23:56:40 +0000 (16:56 -0700)]
Mutate the drawable if a valid state change happen
In another word, create another cached bitmap, when the current VectorDrawable
will look differently when state changed.
Bug:
29870392
Bug:
29854240
Change-Id: I7a5ef91091e547a930368286defc7ab96aeb9471
(cherry picked from commit
4f1acfb5f507798daaff2ff0da47d2b15607ded4)
fionaxu [Thu, 30 Jun 2016 23:11:22 +0000 (23:11 +0000)]
DO NOT MERGE revert public api loadSafeLabel am:
f44c73abb2 am:
a0263a9909 am:
a3b851d352 -s ours am:
f52501d2d4 -s ours am:
cbb7b8c7a4 am:
c666ebef33 am:
1e1974705b -s ours
am:
c7824b3de3
Change-Id: I89dc27d498872a0e4ce539b293f3ffa9f74e38e9
Adarsh Fernando [Thu, 30 Jun 2016 23:10:00 +0000 (23:10 +0000)]
Merge \"Docs: Fixed NDK download links for Windows am:
a6a3ca8dac am:
7d03e2736f\" into nyc-mr1-dev-plus-aosp
am:
038e29736e
Change-Id: Id4584da4d299fc570c69c9e6c8967d7402581569
Adarsh Fernando [Thu, 30 Jun 2016 23:09:55 +0000 (23:09 +0000)]
Docs: Fixed NDK download links for Windows am:
a6a3ca8dac am:
f95b382a8b
am:
bf7d25bfed
Change-Id: I719503dcfe799caf323a6bda916830da29890eff
Adrian Roos [Thu, 30 Jun 2016 23:07:40 +0000 (23:07 +0000)]
Merge \"Fix missing header text in notification groups\" into nyc-dev
am:
a275ec269f
Change-Id: Ib2dc310b57756218d0851d7aff6a0ea183714f5d
Adrian Roos [Thu, 30 Jun 2016 23:07:39 +0000 (23:07 +0000)]
Merge \"Fix missing header text in notification groups\" into nyc-dev
am:
a275ec269f
Change-Id: Ida3c3f33c63aa904d34c864899ddc8aac0368394
OSDN Git Service
