Commit Graph

272855 Commits

Author SHA1 Message Date
Bill Yi
b2a76f2625 Import translations. DO NOT MERGE
Change-Id: I0fe9631435b256c8c440fe78f39eb0e6c113265c
Auto-generated-cl: translation import
2016-07-11 21:25:24 -07:00
Shubham Ajmera
807cf8699a Merge "Add new StrictMode thread policy - DETECT_UNBUFFERED_IO" 2016-07-11 12:15:24 +00:00
Sergei Vasilinetc
ed3c2bd812 Merge "UiBench: add NotificationShadeActivity" 2016-07-11 07:13:35 +00:00
TreeHugger Robot
e7d27dd2fc Merge "Add onTerminate runner to MtpServer." 2016-07-11 03:04:03 +00:00
TreeHugger Robot
ede2e7d822 Merge "Add @NonNull / @Nullable annotations to android.mtp API." 2016-07-11 02:29:12 +00:00
Daichi Hirono
f1d69ee247 Add onTerminate runner to MtpServer.
The CL adds onTerminate runner to MtpServer constructor's arguments to
know when MtpServer stops its thread.

BUG=29971895

Change-Id: I685ad6bc663f76e04ae3837129cbe12805d2093c
2016-07-11 10:15:41 +09:00
TreeHugger Robot
b25c0d9714 Merge "Add free space precondition check for copy job." 2016-07-08 22:20:59 +00:00
Mark Salyzyn
0238f64092 Settings: add logpersist kernel only selection (strings) am: 1e6dab2b91 am: 23cb96ae9b
am: 7d0c912653

Change-Id: I6ea5815f4c99b0c19ff06c4bb7c8340283c08bac
2016-07-08 21:46:32 +00:00
Justin Klaassen
029c2f4e3f Merge \\"Add Night display feature\\" into nyc-mr1-dev am: 76262b8e14
am: 1228803cde

Change-Id: I855bf48a271b15f671957b1451caab24d08d8293
2016-07-08 21:46:23 +00:00
Mark Salyzyn
7d0c912653 Settings: add logpersist kernel only selection (strings) am: 1e6dab2b91
am: 23cb96ae9b

Change-Id: I1d8a124dfa81051abb6a9de4276c059ab396b839
2016-07-08 21:42:03 +00:00
Mark Salyzyn
23cb96ae9b Settings: add logpersist kernel only selection (strings)
am: 1e6dab2b91

Change-Id: If1f3da789eab3c36a622a26f06df6dc74f222bb5
2016-07-08 21:37:36 +00:00
Mark Salyzyn
1e6dab2b91 Settings: add logpersist kernel only selection (strings)
Bug: 28936216
Bug: 29831823
Change-Id: I4e578bbe2f5bbf936b03fbdac34a225a0432e503
2016-07-08 14:31:22 -07:00
Eino-Ville Talvala
6d5c9de640 Merge \\"Camera2: Add @hide variant for openCamera for UID forwarding\\" into nyc-mr1-dev am: 8c22370331
am: 9b74b46034

Change-Id: I870e4adb3377dcd9ef4d51f15c7ebe23ef1b78e1
2016-07-08 21:21:43 +00:00
Michael Kwan
bebcca4c37 Merge \\"Updated margins and spacing of preferences for watch type devices.\\" into nyc-mr1-dev am: 3a45f27ceb
am: 48ff322bb5

Change-Id: I2c5e445df1180535373ceb15eacb089300611a28
2016-07-08 21:21:33 +00:00
Justin Klaassen
1228803cde Merge \"Add Night display feature\" into nyc-mr1-dev
am: 76262b8e14

Change-Id: I03912016390820f61fb515b1f206edd9bfea9ccf
2016-07-08 21:15:35 +00:00
Eino-Ville Talvala
9b74b46034 Merge \"Camera2: Add @hide variant for openCamera for UID forwarding\" into nyc-mr1-dev
am: 8c22370331

Change-Id: Ie03815d4793fd432f8e49d2119d2a9478bdd4332
2016-07-08 21:15:20 +00:00
Michael Kwan
48ff322bb5 Merge \"Updated margins and spacing of preferences for watch type devices.\" into nyc-mr1-dev
am: 3a45f27ceb

Change-Id: Ia6cdf20fa4e4ad7c7988c2b613d4a35bdd01bbf3
2016-07-08 21:11:45 +00:00
Justin Klaassen
76262b8e14 Merge "Add Night display feature" into nyc-mr1-dev 2016-07-08 21:07:48 +00:00
TreeHugger Robot
8c22370331 Merge "Camera2: Add @hide variant for openCamera for UID forwarding" into nyc-mr1-dev 2016-07-08 21:02:51 +00:00
Michael Kwan
3a45f27ceb Merge "Updated margins and spacing of preferences for watch type devices." into nyc-mr1-dev 2016-07-08 20:44:25 +00:00
Justin Klaassen
ea12f1f2bd Merge \\"Remove \\"Night mode\\" from tuner\\" into nyc-mr1-dev am: e615e16ab6
am: 9a087f6954

Change-Id: Ia48d7c96454c2361bb8ad0ce9c76ff3dc36830ba
2016-07-08 20:27:07 +00:00
Justin Klaassen
9a087f6954 Merge \"Remove \"Night mode\" from tuner\" into nyc-mr1-dev
am: e615e16ab6

Change-Id: I497cf51948597f8f70e756e4f11dac94c2d69444
2016-07-08 20:22:10 +00:00
TreeHugger Robot
e615e16ab6 Merge "Remove "Night mode" from tuner" into nyc-mr1-dev 2016-07-08 20:14:43 +00:00
Jean-Michel Trivi
05d9795b36 Merge \"Merge \\\"More javadoc for audio recording activity API\\\" into nyc-dev am: 8d5fd92314 am: ee0a01c8a6\" into nyc-mr1-dev-plus-aosp
am: b1589396cb

Change-Id: I7c41230d9a99490d4a71811db13e691f18b30753
2016-07-08 20:04:01 +00:00
Jean-Michel Trivi
95a8724dff Merge \\\"More javadoc for audio recording activity API\\\" into nyc-dev am: 8d5fd92314 am: a90df50109
am: 7cd1622ca3

Change-Id: Ic2453ac826b5fc80a73b9a03d99c84cfd0132186
2016-07-08 20:03:58 +00:00
Android Build Merger (Role)
b1589396cb Merge "Merge \\"More javadoc for audio recording activity API\\" into nyc-dev am: 8d5fd92314 am: ee0a01c8a6" into nyc-mr1-dev-plus-aosp 2016-07-08 19:55:32 +00:00
Jean-Michel Trivi
af2cc95569 Merge \\"More javadoc for audio recording activity API\\" into nyc-dev am: 8d5fd92314
am: ee0a01c8a6

Change-Id: I1f52abbc78812f5a80042440fc4781b7f51afa4d
2016-07-08 19:55:11 +00:00
Jean-Michel Trivi
7cd1622ca3 Merge \\"More javadoc for audio recording activity API\\" into nyc-dev am: 8d5fd92314
am: a90df50109

Change-Id: I256b03cae0e76b7a5c61a691c9359a091f1f666a
2016-07-08 19:55:08 +00:00
Jean-Michel Trivi
ee0a01c8a6 Merge \"More javadoc for audio recording activity API\" into nyc-dev
am: 8d5fd92314

Change-Id: If513added909df2135fb57a2f86804edec821177
2016-07-08 19:49:09 +00:00
Jean-Michel Trivi
a90df50109 Merge \"More javadoc for audio recording activity API\" into nyc-dev
am: 8d5fd92314

Change-Id: I58f991a41a6d17ca8e854109dad6ab41b14bc65a
2016-07-08 19:45:54 +00:00
Jean-Michel Trivi
8d5fd92314 Merge "More javadoc for audio recording activity API" into nyc-dev 2016-07-08 19:36:33 +00:00
Jeff Sharkey
0df84b24e1 Merge \\"Use visible paths when cleaning up MediaStore.\\" into nyc-mr1-dev am: 8ee0a67ba7
am: a637f17150

Change-Id: I0433fd57cb7da13d163eab1fde944cccec9c67bf
2016-07-08 19:21:30 +00:00
Garfield, Tan
71ac8a003e Add free space precondition check for copy job.
Bug: 24948755
Change-Id: I210395bdf339d630604e90e867ffddbbd3cf4bea
(cherry picked from commit 2a530ab3be585b366d562ea24940dcdd239af6d0)
2016-07-08 19:17:48 +00:00
Jeff Sharkey
a637f17150 Merge \"Use visible paths when cleaning up MediaStore.\" into nyc-mr1-dev
am: 8ee0a67ba7

Change-Id: I387c13b1208ebdf05d03b4d172d538015dc3c6a5
2016-07-08 19:11:48 +00:00
Eino-Ville Talvala
62deabcc4f Camera2: Add @hide variant for openCamera for UID forwarding
Trusted services may open a camera device on behalf of some client
of theirs; such services need to forward the UID of their client to
the camera service for validation of permissions, etc.

Add a variant of openCamera that makes this simple, only accessible
to unbundled services for now.  Only services explicitly trusted
by the camera service can pass an argument other than USE_CALLING_UID
to this method.

Bug: 27616192
Change-Id: Idb06112201b805a8b5c979b5f0761fec1c6994a3
2016-07-08 12:11:11 -07:00
TreeHugger Robot
8ee0a67ba7 Merge "Use visible paths when cleaning up MediaStore." into nyc-mr1-dev 2016-07-08 19:01:09 +00:00
Justin Klaassen
911e88939c Add Night display feature
Bug: 28615069

Tints the display at night automatically according to your schedule or
using the sunrise/sunset corresponding to your current location.

Change-Id: Ie56b4eed88cc2fcbae88002492b1edad5820b6b1
2016-07-08 11:47:50 -07:00
Justin Klaassen
e81fa85782 Remove "Night mode" from tuner
Bug: 28887927
Change-Id: Ic1c217152e56db63a87a1f1e772696d97b4b58b3
2016-07-08 11:46:27 -07:00
Andreas Gampe
8f4731db63 Merge \\"Revert \\"Frameworks/base: Refactor UserHandle and Environment a bit\\"\\" into nyc-mr1-dev am: 56177bf81b
am: 5c1dc014ca

Change-Id: Ia51a5349ea826ca56ec0c5f8baf1c1afac7c6b81
2016-07-08 18:27:10 +00:00
Andreas Gampe
5c1dc014ca Merge \"Revert \"Frameworks/base: Refactor UserHandle and Environment a bit\"\" into nyc-mr1-dev
am: 56177bf81b

Change-Id: I7ee938b31784d093680783c1988a68cc803cce3f
2016-07-08 18:19:33 +00:00
Derek Sollenberger
ae9c4cb9aa Merge "Remove unused code from HWUI Layer" 2016-07-08 18:12:15 +00:00
Sergey Vasilinets
50f67331ca UiBench: add NotificationShadeActivity
Change-Id: I67a80c35b04bc8fba092b224b19de9cddbd98f6f
2016-07-08 11:11:06 -07:00
Andreas Gampe
56177bf81b Merge "Revert "Frameworks/base: Refactor UserHandle and Environment a bit"" into nyc-mr1-dev 2016-07-08 18:09:54 +00:00
Chris Thornton
dcd9a83e9e Merge \\"Updates to the sound trigger test app\\" into nyc-mr1-dev am: e1fdcc49fd
am: 8ce7b9b6ff

Change-Id: Ib96262c213f9cc397d49b6be6d2ca5975a580ce4
2016-07-08 18:09:38 +00:00
Chris Thornton
8ce7b9b6ff Merge \"Updates to the sound trigger test app\" into nyc-mr1-dev
am: e1fdcc49fd

Change-Id: I84028121d101f417e2c55450b2a95041f33d2d40
2016-07-08 18:01:33 +00:00
Chris Thornton
e1fdcc49fd Merge "Updates to the sound trigger test app" into nyc-mr1-dev 2016-07-08 17:47:52 +00:00
Jeff Sharkey
813f9e8323 Use visible paths when cleaning up MediaStore.
The media scanner always records visible paths, so we need to use
visible paths when cleaning up deleted records.

Bug: 28581384
Change-Id: I8a2c65001216e4a96b2375579363a771de782bcc
2016-07-08 11:18:06 -06:00
TreeHugger Robot
b2969355c9 Merge "Move RemoteViewsTest to the right package" 2016-07-08 17:13:05 +00:00
Kirill Grouchnikov
8376f9eaa0 Move RemoteViewsTest to the right package
RemoteViews is in android.widget and not android.view

Bug: 29805243
Change-Id: I6210f60f60a21443d8a873c3a8e6f39d956ea123
2016-07-08 11:27:03 -04:00
TreeHugger Robot
1404b09938 Merge "Docsui-level work for implementing Eject on Roots list." 2016-07-08 15:24:58 +00:00