OSDN Git Service
Bill Yi [Fri, 17 Jun 2016 21:10:57 +0000 (21:10 +0000)]
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am:
c4a5178d66 -s ours am:
1d64b70109 -s ours
am:
c4af25b743 -s ours
Change-Id: If444bfcd4e85965c3b594e555930aa3a4fb4ae96
Bill Yi [Fri, 17 Jun 2016 21:10:55 +0000 (21:10 +0000)]
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am:
b141b6399f -s ours am:
0f1467c5f1 -s ours
am:
22411c6e53 -s ours
Change-Id: Ie2c025ddecd6e1e02dc7c358853c6c882be296db
Christopher Tate [Fri, 17 Jun 2016 21:10:53 +0000 (21:10 +0000)]
DO NOT MERGE: Don\\\\\\\\\\\\\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283 am:
f615799ef2 am:
6633a4fee4 -s ours am:
41821a26a5 -s ours am:
b1e31ad140 am:
918fb5d453 am:
2149ebeadf -s ours am:
c61f35ed9a am:
34fb87b519 am:
1a450675f3 am:
790c87a05b -s ours am:
02435d2419 am:
313dec8155
am:
01a7aa1e7b -s ours
Change-Id: I4a522be72fe9cdcd0ee53863c9d2bea558fd6ffb
Christopher Tate [Fri, 17 Jun 2016 21:10:51 +0000 (21:10 +0000)]
resolve merge conflicts of
cffb19c to mnc-dev am:
3f9ea2d386 am:
d6c1126fab am:
e2c9b1af3e am:
d2a4e1b39c am:
1c3be1a5b1 am:
6b24c84fa2
am:
6bf184819c
Change-Id: I542d7994dcf165295bc11ad3678cd9b7038d003b
Adrian Roos [Fri, 17 Jun 2016 21:10:49 +0000 (21:10 +0000)]
Merge \\\"Remove RemoteInput on lockscreen setting\\\" into nyc-dev am:
a66746d167 am:
0f93a4ebe9
am:
c2188c199d
Change-Id: Iede9db36175d02d3af81eccb9e652c2cd7b039fd
Doris Liu [Fri, 17 Jun 2016 21:04:23 +0000 (21:04 +0000)]
Merge \\"Support AVD animation falling back on UI thread\\" into nyc-mr1-dev am:
4e5ee65307
am:
2df9343a77
Change-Id: I4ca02328c52c8802dc5c006ab4bec6b1ec04cd87
ugo_yu [Fri, 17 Jun 2016 21:04:18 +0000 (21:04 +0000)]
Merge \\"Correct typo in BluetoothSap binder\\" into nyc-mr1-dev am:
0db08ca3e7
am:
2380af193e
Change-Id: I2e99a9b8a408abe4eba6c66f5354b0411b69f2cf
Andrew Solovay [Fri, 17 Jun 2016 21:04:12 +0000 (21:04 +0000)]
Merge \"Merge \\\"docs: DP4 release notes: add Android Auto known issue\\\" into nyc-dev am:
bc7b3b5e52 am:
eeabbd353e\" into nyc-mr1-dev-plus-aosp
am:
2d6bbe3780
Change-Id: I2e4c587bbddce04a113d3621bc247a8b5323d2a5
Andrew Solovay [Fri, 17 Jun 2016 21:04:09 +0000 (21:04 +0000)]
Merge \\\"docs: DP4 release notes: add Android Auto known issue\\\" into nyc-dev am:
bc7b3b5e52 am:
76fe4fd14b
am:
5859a811ca
Change-Id: Ib4d5df61daa75a1f7191835c1c4093a1663bfecf
Sudheer Shanka [Fri, 17 Jun 2016 21:04:05 +0000 (21:04 +0000)]
Merge \"Merge \\\"Allow apps with CREATE_USERS permission to create restricted users.\\\" into nyc-dev am:
48ee87d4a7 am:
e1eb4cd0e7\" into nyc-mr1-dev-plus-aosp
am:
ff24b6055d
Change-Id: Id9b5de8d603cbd44b65294562a3d2797217d6cee
Sudheer Shanka [Fri, 17 Jun 2016 21:01:20 +0000 (21:01 +0000)]
Merge \\\"Allow apps with CREATE_USERS permission to create restricted users.\\\" into nyc-dev am:
48ee87d4a7 am:
be8c83a6b9
am:
40636c8a2f
Change-Id: If9f8ef35e369a5a96ebed421bfb6119aac5125cd
Ta-wei Yen [Fri, 17 Jun 2016 21:01:11 +0000 (21:01 +0000)]
Merge \\"Allow the phone process to hide outbound text SMS\\" into nyc-mr1-dev am:
3f258857b5
am:
e5ffc4ac23
Change-Id: I65218336aa17420db78c4d03ae0aa054c96546cf
Bill Yi [Fri, 17 Jun 2016 21:01:03 +0000 (21:01 +0000)]
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am:
ecfe1a5e17 -s ours am:
7085bb345d -s ours
am:
8f0d2c8e0b -s ours
Change-Id: Ia889bdcc7a972027878d064ce25fcfc0daa0e112
Andrew Sapperstein [Fri, 17 Jun 2016 21:00:49 +0000 (21:00 +0000)]
Merge \\"Refactor DeviceDefault themes.\\" into nyc-mr1-dev am:
2f75cf4bb5
am:
91a540b2de
Change-Id: I7dbe63a9e71bb9ad6f58ef273965368057c17af0
John Reck [Fri, 17 Jun 2016 21:00:30 +0000 (21:00 +0000)]
Merge \\\\"Performance Optimization: Align texture dirty rect\\\\" am:
4e6a73c16a am:
ec45adde70 am:
89132e094f
am:
8ef6b2e628
Change-Id: I46613fa164ab541a313abeadd2b2c4a3b48aad50
Wale Ogunwale [Fri, 17 Jun 2016 20:43:51 +0000 (20:43 +0000)]
Merge \"Merge \\\"Don\\\'t re-launch activities while the device is sleeping\\\" into nyc-dev am:
f6e3c9a553 am:
55ce4a5f19\" into nyc-mr1-dev-plus-aosp
am:
ca0b8d9096
Change-Id: Ibe4fa705e04fd63b1225e8fc27ef4ab0cb34f15d
Wale Ogunwale [Fri, 17 Jun 2016 20:43:44 +0000 (20:43 +0000)]
Merge \"Merge \\\"Don\\\'t re-launch activities while the device is sleeping\\\" into nyc-dev am:
f6e3c9a553 am:
4e9c615769\" into nyc-mr1-dev-plus-aosp
am:
ac769204af
Change-Id: I8b8b26c094b81a89257a7d31ac122c27b6238efc
Andrii Kulian [Fri, 17 Jun 2016 20:43:37 +0000 (20:43 +0000)]
Merge \"Merge \\\"Bring task to front when we can\\\'t move to adjacent stack\\\" into nyc-dev am:
320c15e1b2 am:
ddfeb4a6c2\" into nyc-mr1-dev-plus-aosp
am:
48b7342e1a
Change-Id: I9818dc145c1574207953336a20859ef482f1dc1e
Andrii Kulian [Fri, 17 Jun 2016 20:43:32 +0000 (20:43 +0000)]
Merge \\\"Bring task to front when we can\\\'t move to adjacent stack\\\" into nyc-dev am:
320c15e1b2 am:
8b7544fad7
am:
aef6cc7cc6
Change-Id: Ife079dba557e7cac06f8eb6c0b8214d92162417d
Yorke Lee [Fri, 17 Jun 2016 20:43:15 +0000 (20:43 +0000)]
Merge \"Merge \\\"Limit global drags to apps targeting SDK 24 and above\\\" into nyc-dev am:
f33af2285b am:
599cf6bc4a\" into nyc-mr1-dev-plus-aosp
am:
fc6c1a8a8e
Change-Id: I0bce88dd079bc5b296fea12b2f5928e815eeb7d8
Yorke Lee [Fri, 17 Jun 2016 20:42:14 +0000 (20:42 +0000)]
Merge \\\"Limit global drags to apps targeting SDK 24 and above\\\" into nyc-dev am:
f33af2285b am:
3d80871032
am:
11e3bf5d30
Change-Id: I6a99d04fd3f9fb229f532838350313169cec502a
Gina Dimino [Fri, 17 Jun 2016 20:42:12 +0000 (20:42 +0000)]
Merge \"Merge \\\"Docs: Suppress errors in SystemApi Build Bug:
28427390\\\" into nyc-dev am:
d06520a488 am:
0bae4dcd76\" into nyc-mr1-dev-plus-aosp
am:
ada74feacc
Change-Id: I9cdbd5cc246db9fee724b188223b3131e5548df7
Gina Dimino [Fri, 17 Jun 2016 20:42:09 +0000 (20:42 +0000)]
Merge \\\"Docs: Suppress errors in SystemApi Build Bug:
28427390\\\" into nyc-dev am:
d06520a488 am:
b7181150c4
am:
cb08f6805a
Change-Id: I65d3016319d0cc53a53f931aa62c642ac53b9520
Yi Kong [Fri, 17 Jun 2016 20:42:06 +0000 (20:42 +0000)]
Merge \\\"Track libcore change
45f477557ddaf68cb2fe9603544b95c0e7af9a92\\\" into stage-aosp-master am:
e1cf90c6eb am:
e8f9aa9d5d
am:
c3c9fd12b4
Change-Id: I9246184c64dcfc41e4ab5070c74822746e22dc32
Przemyslaw Szczepaniak [Fri, 17 Jun 2016 20:42:04 +0000 (20:42 +0000)]
Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c am:
9f4ad4fbb6 am:
dd094522bd
am:
0de979e93d
Change-Id: I664cbb78538a0c7816e710287da9f80fe23fe465
Andrew Solovay [Fri, 17 Jun 2016 20:39:32 +0000 (20:39 +0000)]
Merge \"Merge \\\"docs: Minor update to DP4 release notes\\\" into nyc-dev am:
5a3a66a253 am:
e73adf38a7\" into nyc-mr1-dev-plus-aosp
am:
95f4b1127c
Change-Id: I4f94adb27be1c04e89fee71500ab8f61b69f9bf1
Andrew Solovay [Fri, 17 Jun 2016 20:39:29 +0000 (20:39 +0000)]
Merge \\\"docs: Minor update to DP4 release notes\\\" into nyc-dev am:
5a3a66a253 am:
0d21553bd2
am:
f34c820174
Change-Id: Ib4a25b144e8d4599b70655481a08b4652742eef9
Yujie Qin [Fri, 17 Jun 2016 20:39:26 +0000 (20:39 +0000)]
Merge \"Merge \\\"Report error correctly for the implementation of StreamInterface::GetData()\\\" into nyc-dev am:
e09415344d am:
86c1dd5256\" into nyc-mr1-dev-plus-aosp
am:
032e0a6e5c
Change-Id: Icf9f6561ad7e4bcb45e7f2d4287803220770fe9f
Adrian Roos [Fri, 17 Jun 2016 20:39:23 +0000 (20:39 +0000)]
Merge \"Merge \\\"Fix unresponsive brightness slider after font size change\\\" into nyc-dev am:
db81dd9d2e am:
6ed10f4ffa\" into nyc-mr1-dev-plus-aosp
am:
a360260ef8
Change-Id: I331a4f9cd4c0b4837ae270f363798eb272202b26
Yujie Qin [Fri, 17 Jun 2016 20:39:20 +0000 (20:39 +0000)]
Merge \\\"Report error correctly for the implementation of StreamInterface::GetData()\\\" into nyc-dev am:
e09415344d am:
d09b020ce5
am:
7d10f45325
Change-Id: I9e7bb583346aea5bd06ba84522d52f3e8c47b079
TreeHugger Robot [Fri, 17 Jun 2016 20:32:43 +0000 (20:32 +0000)]
Merge "resolve merge conflicts of
6800033 to master"
TreeHugger Robot [Fri, 17 Jun 2016 19:01:51 +0000 (19:01 +0000)]
Merge "Implementing breadcrumb for tablet devices for navigation in the bar."
Adrian Roos [Fri, 17 Jun 2016 18:57:56 +0000 (11:57 -0700)]
resolve merge conflicts of
6800033 to master
Change-Id: Ica5523a28f15f1c3e86a80b60a119e69705cd1c9
Steve McKay [Fri, 17 Jun 2016 18:33:53 +0000 (18:33 +0000)]
Merge \"Merge \\\"Include cause when reporting errors.\\\" into nyc-dev am:
60585e6c54 am:
ba7fc3b35f\" into nyc-mr1-dev-plus-aosp
am:
5338c243c9
Change-Id: I53e32bd640eb60f407238aa6f37865515066df73
Steve McKay [Fri, 17 Jun 2016 18:33:50 +0000 (18:33 +0000)]
Merge \\\"Include cause when reporting errors.\\\" into nyc-dev am:
60585e6c54 am:
be8b6e6164
am:
7dfb6fa15e
Change-Id: Iade90d4bfb323bcc1bb7a771fcb2b64656c25d57
Felipe Leme [Fri, 17 Jun 2016 18:33:48 +0000 (18:33 +0000)]
Merge \"Merge \\\"Check extra type before blindingly casting to Parcelable.\\\" into nyc-dev am:
47c3afa10b am:
f2326e947c\" into nyc-mr1-dev-plus-aosp
am:
6548d3ad83
Change-Id: I88c6d7a40488c18e6462325ee4cf1fafc4d57851
Felipe Leme [Fri, 17 Jun 2016 18:27:04 +0000 (18:27 +0000)]
Merge \\\"Check extra type before blindingly casting to Parcelable.\\\" into nyc-dev am:
47c3afa10b am:
9b36b6d3d8
am:
b1c898ed65
Change-Id: I8b53612e8716233b444a28882028cfb94cb56e0a
Dianne Hackborn [Fri, 17 Jun 2016 18:27:00 +0000 (18:27 +0000)]
Merge \\"Merge \\\"Fix issue #
29371078: Foreground jobs should not count...\\\" into nyc-dev am:
47cfac6803\\" into nyc-mr1-dev am:
ab84ab5f35
am:
7aa2137c31
Change-Id: Iac9fde0171a021a19398d0f83d91aa00a5050fdf
Michael Kwan [Fri, 17 Jun 2016 18:26:57 +0000 (18:26 +0000)]
Merge \\"Add better configurability for dialog theme colours.\\" into nyc-mr1-dev am:
c637d4bde2
am:
2a68269a44
Change-Id: I0e30dfd1b9c970843e119b8058cea9553e7cb423
Dianne Hackborn [Fri, 17 Jun 2016 18:26:54 +0000 (18:26 +0000)]
Merge \\\"Fix issue #
29371078: Foreground jobs should not count...\\\" into nyc-dev am:
47cfac6803 am:
403e103eb2
am:
e022330079
Change-Id: Iadc898f174ffce99e622d272e1699017acb292f8
Gustav Sennton [Fri, 17 Jun 2016 18:26:50 +0000 (18:26 +0000)]
Merge \"Merge \\\"Support using uninstalled WebView packages as WebView implementation.\\\" into nyc-dev am:
e25c8532b6 am:
4a352d2c41\" into nyc-mr1-dev-plus-aosp
am:
1cfb92097c
Change-Id: I5c8fee73cb32b27b9f6514c129285cca39d0755d
Ben Lin [Fri, 10 Jun 2016 19:13:27 +0000 (12:13 -0700)]
Implementing breadcrumb for tablet devices for navigation in the bar.
Bug:
29214736
Change-Id: I37de2c39a55c33d7111496e896a0c85e1c7fa553
(cherry picked from commit
6fb1dfcc47b795b7071550a4524667d2f8f4d9a2)
Aurimas Liutikas [Fri, 17 Jun 2016 16:26:55 +0000 (16:26 +0000)]
Merge "Fix spelling error in Core App Quality docs."
Mikhail Naganov [Fri, 17 Jun 2016 15:32:00 +0000 (15:32 +0000)]
Merge "UsbMidiDevice: Clean up terminology and fix comments"
Mikhail Naganov [Fri, 17 Jun 2016 11:11:25 +0000 (04:11 -0700)]
UsbMidiDevice: Clean up terminology and fix comments
When working with physical MIDI devices, an *input* stream is used
for reading from *output* port of the device, and vice versa. Thus,
using "input" and "output" without specifying whether it's a stream
or a port is confusing.
Clarify names of counter variables, and fix a couple of comments
that were incorrect due to this confusion. No functional changes.
Change-Id: If561eaca4bade94e9296d2c703c9fcebc91296e2
Gustav Sennton [Fri, 17 Jun 2016 10:49:53 +0000 (10:49 +0000)]
Merge "resolve merge conflicts of
6cbf137 to master"
Gustav Sennton [Thu, 16 Jun 2016 19:24:23 +0000 (20:24 +0100)]
resolve merge conflicts of
6cbf137 to master
Change-Id: Idc548a46e96464c11193cf8480d9fb4e07aa438f
Bill Yi [Fri, 17 Jun 2016 06:50:33 +0000 (06:50 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am:
c4a5178d66 -s ours
am:
1d64b70109 -s ours
Change-Id: I003cf77397bf266091ef9cb55acedab5ccab39d0
Bill Yi [Fri, 17 Jun 2016 06:50:32 +0000 (06:50 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am:
b141b6399f -s ours
am:
0f1467c5f1 -s ours
Change-Id: I58d3c4ea3980dc56428650ee8f06d558fe863a4c
Christopher Tate [Fri, 17 Jun 2016 06:50:30 +0000 (06:50 +0000)]
DO NOT MERGE: Don\\\\\\\\\\\\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283 am:
f615799ef2 am:
6633a4fee4 -s ours am:
41821a26a5 -s ours am:
b1e31ad140 am:
918fb5d453 am:
2149ebeadf -s ours am:
c61f35ed9a am:
34fb87b519 am:
1a450675f3 am:
790c87a05b -s ours am:
02435d2419
am:
313dec8155
Change-Id: Iaa07eb947fad2fe822964d12275a591ce31fffc4
Christopher Tate [Fri, 17 Jun 2016 06:50:28 +0000 (06:50 +0000)]
resolve merge conflicts of
cffb19c to mnc-dev am:
3f9ea2d386 am:
d6c1126fab am:
e2c9b1af3e am:
d2a4e1b39c am:
1c3be1a5b1
am:
6b24c84fa2
Change-Id: I76d2691cdbdc5577b12e2f5b6a58f0478eb48dff
Adrian Roos [Fri, 17 Jun 2016 06:50:22 +0000 (06:50 +0000)]
Merge \\"Remove RemoteInput on lockscreen setting\\" into nyc-dev am:
a66746d167
am:
0f93a4ebe9
Change-Id: I0bafce17d126c057bc1f62f78a3efa00feb84960
Bill Yi [Fri, 17 Jun 2016 04:18:05 +0000 (04:18 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am:
c4a5178d66 -s ours
Change-Id: I2399e19b8b0e9080531f47ca66d552e909b6533b
Bill Yi [Fri, 17 Jun 2016 04:18:04 +0000 (04:18 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am:
b141b6399f -s ours
Change-Id: Ic9c2413d05260cdebcf38d729e129a5fa19a0bff
Bill Yi [Fri, 17 Jun 2016 04:13:19 +0000 (04:13 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 04:12:45 +0000 (04:12 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Seigo Nonaka [Fri, 17 Jun 2016 03:59:51 +0000 (03:59 +0000)]
Merge "Follow the minikin namespace changes"
Bill Yi [Fri, 17 Jun 2016 02:45:54 +0000 (19:45 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
29390361
Change-Id: I450ba7622c907e80c033482bfc172191f3b37f0a
Donghyun Cho [Fri, 17 Jun 2016 02:03:12 +0000 (02:03 +0000)]
Merge "Add bluetooth folder type information to MediaDescription and MediaMetadata"
Bill Yi [Fri, 17 Jun 2016 01:58:50 +0000 (18:58 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
29390361
Change-Id: I306c97d17e5448007f5ba1bfa0871d585436c061
Doris Liu [Fri, 17 Jun 2016 01:43:33 +0000 (01:43 +0000)]
Merge \"Support AVD animation falling back on UI thread\" into nyc-mr1-dev
am:
4e5ee65307
Change-Id: I06b9bf54b142fc6398e17f9f258d112f344310cb
ugo_yu [Fri, 17 Jun 2016 01:43:28 +0000 (01:43 +0000)]
Merge \"Correct typo in BluetoothSap binder\" into nyc-mr1-dev
am:
0db08ca3e7
Change-Id: I10b898a19d4d85e059d3344b696f09e8586c80f8
Christopher Tate [Fri, 17 Jun 2016 01:41:37 +0000 (01:41 +0000)]
DO NOT MERGE: Don\\\\\\\\\\\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283 am:
f615799ef2 am:
6633a4fee4 -s ours am:
41821a26a5 -s ours am:
b1e31ad140 am:
918fb5d453 am:
2149ebeadf -s ours am:
c61f35ed9a am:
34fb87b519 am:
1a450675f3 am:
790c87a05b -s ours
am:
02435d2419
Change-Id: I0c43624a99c487c8d004f2de5da6f08f2654bbde
TreeHugger Robot [Fri, 17 Jun 2016 01:33:47 +0000 (01:33 +0000)]
Merge "[multi-part] Eliminate 1k selection limit"
TreeHugger Robot [Fri, 17 Jun 2016 01:28:52 +0000 (01:28 +0000)]
Merge "Quick fix for Files crashing on start up."
TreeHugger Robot [Fri, 17 Jun 2016 01:12:30 +0000 (01:12 +0000)]
Merge "Support AVD animation falling back on UI thread" into nyc-mr1-dev
TreeHugger Robot [Fri, 17 Jun 2016 01:02:45 +0000 (01:02 +0000)]
Merge "Correct typo in BluetoothSap binder" into nyc-mr1-dev
Sergei Vasilinetc [Fri, 17 Jun 2016 00:57:50 +0000 (00:57 +0000)]
Merge "Test scene that mocks list view with text items faded on left edge."
Christopher Tate [Fri, 17 Jun 2016 00:41:07 +0000 (00:41 +0000)]
DO NOT MERGE: Don\\\\\\\\\\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283 am:
f615799ef2 am:
6633a4fee4 -s ours am:
41821a26a5 -s ours am:
b1e31ad140 am:
918fb5d453 am:
2149ebeadf -s ours am:
c61f35ed9a am:
34fb87b519 am:
1a450675f3
am:
790c87a05b -s ours
Change-Id: I33148f02fc665d5ffa7f6a651ce2b6102456eb1b
Christopher Tate [Fri, 17 Jun 2016 00:38:13 +0000 (00:38 +0000)]
resolve merge conflicts of
cffb19c to mnc-dev am:
3f9ea2d386 am:
d6c1126fab am:
e2c9b1af3e am:
d2a4e1b39c
am:
1c3be1a5b1
Change-Id: If28cb6bef6bb51540e03aede5ade118ad61805dd
Christopher Tate [Fri, 17 Jun 2016 00:34:47 +0000 (00:34 +0000)]
DO NOT MERGE: Don\\\\\\\\\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283 am:
f615799ef2 am:
6633a4fee4 -s ours am:
41821a26a5 -s ours am:
b1e31ad140 am:
918fb5d453 am:
2149ebeadf -s ours am:
c61f35ed9a am:
34fb87b519
am:
1a450675f3
Change-Id: I5fef884dbf640b60c1bf4c28a6d95abb4d42061b
Christopher Tate [Fri, 17 Jun 2016 00:32:26 +0000 (00:32 +0000)]
resolve merge conflicts of
cffb19c to mnc-dev am:
3f9ea2d386 am:
d6c1126fab am:
e2c9b1af3e
am:
d2a4e1b39c
Change-Id: I8e59a88278ba50ab7e3768031611065131ed6834
Christopher Tate [Fri, 17 Jun 2016 00:31:08 +0000 (00:31 +0000)]
DO NOT MERGE: Don\\\\\\\\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283 am:
f615799ef2 am:
6633a4fee4 -s ours am:
41821a26a5 -s ours am:
b1e31ad140 am:
918fb5d453 am:
2149ebeadf -s ours am:
c61f35ed9a
am:
34fb87b519
Change-Id: If7444547d0bd82f43bb05439977e536a01589b3c
Christopher Tate [Fri, 17 Jun 2016 00:24:29 +0000 (00:24 +0000)]
resolve merge conflicts of
cffb19c to mnc-dev am:
3f9ea2d386 am:
d6c1126fab
am:
e2c9b1af3e
Change-Id: Iab52ff84be41c1d18274d1a82492b624a7456726
Christopher Tate [Fri, 17 Jun 2016 00:22:07 +0000 (00:22 +0000)]
DO NOT MERGE: Don\\\\\\\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283 am:
f615799ef2 am:
6633a4fee4 -s ours am:
41821a26a5 -s ours am:
b1e31ad140 am:
918fb5d453 am:
2149ebeadf -s ours
am:
c61f35ed9a
Change-Id: Ied60b535ef69385c369110045ea755ebe9b0b94e
Christopher Tate [Fri, 17 Jun 2016 00:18:48 +0000 (00:18 +0000)]
resolve merge conflicts of
cffb19c to mnc-dev am:
3f9ea2d386
am:
d6c1126fab
Change-Id: I0414a137b1aab218fa57f291dbf2f7a1519bd973
Christopher Tate [Fri, 17 Jun 2016 00:15:14 +0000 (00:15 +0000)]
DO NOT MERGE: Don\\\\\\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283 am:
f615799ef2 am:
6633a4fee4 -s ours am:
41821a26a5 -s ours am:
b1e31ad140 am:
918fb5d453
am:
2149ebeadf -s ours
Change-Id: I42300992feac56eb94ab71e160da5fa8fc04929a
Christopher Tate [Fri, 17 Jun 2016 00:15:07 +0000 (00:15 +0000)]
resolve merge conflicts of
cffb19c to mnc-dev
am:
3f9ea2d386
Change-Id: Iadf90edb02bacf645896f7d074d011a2aca4b251
Steve McKay [Thu, 9 Jun 2016 17:46:07 +0000 (10:46 -0700)]
[multi-part] Eliminate 1k selection limit
* Save selection to disk, delete old selections on app startup.
* Do clipper work in background for copy/cut.
* Pull DragShadowBuilder out of DirFragment.
* Reorganize selection handling to avoid creation of large lists of objects.
* Eliminate getAll from selection, make it iterable, remove unused method.
* Avoid creating DocumentInfo instances for full selection when initiating drag and drop.
Next step will be to pass selection tokens to FileOperationService.
Change-Id: Ia3e30a88ebf328e5b045d06b0df15dbd26a01a42
(cherry picked from commit
69b63de63ddae8d1a3ad8fa49a0beb1ff6f921e1)
Adrian Roos [Thu, 16 Jun 2016 23:41:20 +0000 (23:41 +0000)]
Merge \"Remove RemoteInput on lockscreen setting\" into nyc-dev
am:
a66746d167
Change-Id: I015d3019792ecb3e4d788ace36f1ae2c9e4fb4f8
Android Build Merger (Role) [Thu, 16 Jun 2016 23:40:29 +0000 (23:40 +0000)]
Merge "Merge \\"docs: DP4 release notes: add Android Auto known issue\\" into nyc-dev am:
bc7b3b5e52 am:
eeabbd353e" into nyc-mr1-dev-plus-aosp
Andrew Solovay [Thu, 16 Jun 2016 23:40:06 +0000 (23:40 +0000)]
Merge \\"docs: DP4 release notes: add Android Auto known issue\\" into nyc-dev am:
bc7b3b5e52
am:
eeabbd353e
Change-Id: I6e593d888750cd93944c2c3e42feb0267e6a93d1
Andrew Solovay [Thu, 16 Jun 2016 23:39:33 +0000 (23:39 +0000)]
Merge \\"docs: DP4 release notes: add Android Auto known issue\\" into nyc-dev am:
bc7b3b5e52
am:
76fe4fd14b
Change-Id: I39fb9e0ed2ec7a7bd0002532777cbb6895eba38d
Andrew Solovay [Thu, 16 Jun 2016 23:34:00 +0000 (23:34 +0000)]
Merge \"docs: DP4 release notes: add Android Auto known issue\" into nyc-dev
am:
bc7b3b5e52
Change-Id: I5a69215f86a7112d2208a60d3e72279e82d20dd1
Adrian Roos [Thu, 16 Jun 2016 23:33:55 +0000 (23:33 +0000)]
Merge "Remove RemoteInput on lockscreen setting" into nyc-dev
Andrew Solovay [Thu, 16 Jun 2016 23:33:52 +0000 (23:33 +0000)]
Merge \"docs: DP4 release notes: add Android Auto known issue\" into nyc-dev
am:
bc7b3b5e52
Change-Id: Id6f76fbd483dccfa05f435ab2b62cd2d06b7e393
Christopher Tate [Thu, 16 Jun 2016 23:31:39 +0000 (16:31 -0700)]
resolve merge conflicts of
cffb19c to mnc-dev
Change-Id: I4dba574de2678d851e3d82961a07de27d61f5940
Andrew Solovay [Thu, 16 Jun 2016 23:29:13 +0000 (23:29 +0000)]
Merge "docs: DP4 release notes: add Android Auto known issue" into nyc-dev
sergeyv [Thu, 16 Jun 2016 21:52:20 +0000 (14:52 -0700)]
Test scene that mocks list view with text items faded on left edge.
Change-Id: I6159f02fa511241beaff4f0eb605c4f0bee360d1
Christopher Tate [Thu, 16 Jun 2016 22:53:29 +0000 (22:53 +0000)]
DO NOT MERGE: Don\\\\\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283 am:
f615799ef2 am:
6633a4fee4 -s ours am:
41821a26a5 -s ours am:
b1e31ad140
am:
918fb5d453
Change-Id: I660124fada1a86288a9bfb10308cec0e1503f62e
Christopher Tate [Thu, 16 Jun 2016 22:50:23 +0000 (22:50 +0000)]
DO NOT MERGE: Don\\\\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283 am:
f615799ef2 am:
6633a4fee4 -s ours am:
41821a26a5 -s ours
am:
b1e31ad140
Change-Id: I3668160c863e8fe34ca6d233d63113069fec8e5a
Android Build Merger (Role) [Thu, 16 Jun 2016 22:46:36 +0000 (22:46 +0000)]
Merge "Merge \\"Allow apps with CREATE_USERS permission to create restricted users.\\" into nyc-dev am:
48ee87d4a7 am:
e1eb4cd0e7" into nyc-mr1-dev-plus-aosp
Sudheer Shanka [Thu, 16 Jun 2016 22:46:05 +0000 (22:46 +0000)]
Merge \\"Allow apps with CREATE_USERS permission to create restricted users.\\" into nyc-dev am:
48ee87d4a7
am:
e1eb4cd0e7
Change-Id: I9539a9ebc51b3e89bfff3a47f55071daae265546
Christopher Tate [Thu, 16 Jun 2016 22:45:45 +0000 (22:45 +0000)]
DO NOT MERGE: Don\\\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283 am:
f615799ef2 am:
6633a4fee4 -s ours
am:
41821a26a5 -s ours
Change-Id: I028d0714c52079b71645197ac70a321285928fec
Sudheer Shanka [Thu, 16 Jun 2016 22:45:41 +0000 (22:45 +0000)]
Merge \\"Allow apps with CREATE_USERS permission to create restricted users.\\" into nyc-dev am:
48ee87d4a7
am:
be8c83a6b9
Change-Id: I479843ca4a8b21d11191106a8090bcaf7e78ea6c
Christopher Tate [Thu, 16 Jun 2016 22:39:05 +0000 (22:39 +0000)]
DO NOT MERGE: Don\\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283 am:
f615799ef2
am:
6633a4fee4 -s ours
Change-Id: I2c10cc7ff790c84767167c76e028456ba4dcaeb3
Sudheer Shanka [Thu, 16 Jun 2016 22:38:52 +0000 (22:38 +0000)]
Merge \"Allow apps with CREATE_USERS permission to create restricted users.\" into nyc-dev
am:
48ee87d4a7
Change-Id: I3f66f1d5937ed29f62d687d1c0c6dcfa7d88637d
Ta-wei Yen [Thu, 16 Jun 2016 22:38:43 +0000 (22:38 +0000)]
Merge \"Allow the phone process to hide outbound text SMS\" into nyc-mr1-dev
am:
3f258857b5
Change-Id: Id54d7ac48c857234e43b828368ff0cd53facc0b0
Sudheer Shanka [Thu, 16 Jun 2016 22:37:38 +0000 (22:37 +0000)]
Merge \"Allow apps with CREATE_USERS permission to create restricted users.\" into nyc-dev
am:
48ee87d4a7
Change-Id: Ib61fe36aef8fc992e87ccaa692cc2712caf36570
TreeHugger Robot [Thu, 16 Jun 2016 22:31:44 +0000 (22:31 +0000)]
Merge "Allow the phone process to hide outbound text SMS" into nyc-mr1-dev
OSDN Git Service
