OSDN Git Service
Andrei Stingaceanu [Fri, 15 Jul 2016 10:12:20 +0000 (11:12 +0100)]
Keyboard shortcuts: minor Activity broadcast refactor
Since the broadcast intents have an action, specifying an explicit
component name is not needed. Specified only the package name and
left it for the system to resolve the full component name for the
receiver that handles the action in that package. Also got rid of
warning: "Calling a method in the system process without a
qualified user" by correctly sending the broadcast as the SYSTEM
user.
Bug:
28012198
Change-Id: Ia572fb1b7f2f3c96160d16e2842d6aff3b7f10a1
Sergei Vasilinetc [Mon, 11 Jul 2016 07:13:34 +0000 (07:13 +0000)]
Merge "UiBench: add NotificationShadeActivity"
TreeHugger Robot [Mon, 11 Jul 2016 03:04:01 +0000 (03:04 +0000)]
Merge "Add onTerminate runner to MtpServer."
TreeHugger Robot [Mon, 11 Jul 2016 02:29:11 +0000 (02:29 +0000)]
Merge "Add @NonNull / @Nullable annotations to android.mtp API."
Daichi Hirono [Thu, 7 Jul 2016 01:57:47 +0000 (10:57 +0900)]
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
TreeHugger Robot [Fri, 8 Jul 2016 22:20:58 +0000 (22:20 +0000)]
Merge "Add free space precondition check for copy job."
Mark Salyzyn [Fri, 8 Jul 2016 21:46:32 +0000 (21:46 +0000)]
Settings: add logpersist kernel only selection (strings) am:
1e6dab2b91 am:
23cb96ae9b
am:
7d0c912653
Change-Id: I6ea5815f4c99b0c19ff06c4bb7c8340283c08bac
Justin Klaassen [Fri, 8 Jul 2016 21:46:23 +0000 (21:46 +0000)]
Merge \\"Add Night display feature\\" into nyc-mr1-dev am:
76262b8e14
am:
1228803cde
Change-Id: I855bf48a271b15f671957b1451caab24d08d8293
Mark Salyzyn [Fri, 8 Jul 2016 21:42:03 +0000 (21:42 +0000)]
Settings: add logpersist kernel only selection (strings) am:
1e6dab2b91
am:
23cb96ae9b
Change-Id: I1d8a124dfa81051abb6a9de4276c059ab396b839
Mark Salyzyn [Fri, 8 Jul 2016 21:37:36 +0000 (21:37 +0000)]
Settings: add logpersist kernel only selection (strings)
am:
1e6dab2b91
Change-Id: If1f3da789eab3c36a622a26f06df6dc74f222bb5
Mark Salyzyn [Thu, 7 Jul 2016 18:30:32 +0000 (11:30 -0700)]
Settings: add logpersist kernel only selection (strings)
Bug:
28936216
Bug:
29831823
Change-Id: I4e578bbe2f5bbf936b03fbdac34a225a0432e503
Eino-Ville Talvala [Fri, 8 Jul 2016 21:21:43 +0000 (21:21 +0000)]
Merge \\"Camera2: Add @hide variant for openCamera for UID forwarding\\" into nyc-mr1-dev am:
8c22370331
am:
9b74b46034
Change-Id: I870e4adb3377dcd9ef4d51f15c7ebe23ef1b78e1
Michael Kwan [Fri, 8 Jul 2016 21:21:33 +0000 (21:21 +0000)]
Merge \\"Updated margins and spacing of preferences for watch type devices.\\" into nyc-mr1-dev am:
3a45f27ceb
am:
48ff322bb5
Change-Id: I2c5e445df1180535373ceb15eacb089300611a28
Justin Klaassen [Fri, 8 Jul 2016 21:15:35 +0000 (21:15 +0000)]
Merge \"Add Night display feature\" into nyc-mr1-dev
am:
76262b8e14
Change-Id: I03912016390820f61fb515b1f206edd9bfea9ccf
Eino-Ville Talvala [Fri, 8 Jul 2016 21:15:20 +0000 (21:15 +0000)]
Merge \"Camera2: Add @hide variant for openCamera for UID forwarding\" into nyc-mr1-dev
am:
8c22370331
Change-Id: Ie03815d4793fd432f8e49d2119d2a9478bdd4332
Michael Kwan [Fri, 8 Jul 2016 21:11:45 +0000 (21:11 +0000)]
Merge \"Updated margins and spacing of preferences for watch type devices.\" into nyc-mr1-dev
am:
3a45f27ceb
Change-Id: Ia6cdf20fa4e4ad7c7988c2b613d4a35bdd01bbf3
Justin Klaassen [Fri, 8 Jul 2016 21:07:47 +0000 (21:07 +0000)]
Merge "Add Night display feature" into nyc-mr1-dev
TreeHugger Robot [Fri, 8 Jul 2016 21:02:49 +0000 (21:02 +0000)]
Merge "Camera2: Add @hide variant for openCamera for UID forwarding" into nyc-mr1-dev
Michael Kwan [Fri, 8 Jul 2016 20:44:24 +0000 (20:44 +0000)]
Merge "Updated margins and spacing of preferences for watch type devices." into nyc-mr1-dev
Justin Klaassen [Fri, 8 Jul 2016 20:27:07 +0000 (20:27 +0000)]
Merge \\"Remove \\"Night mode\\" from tuner\\" into nyc-mr1-dev am:
e615e16ab6
am:
9a087f6954
Change-Id: Ia48d7c96454c2361bb8ad0ce9c76ff3dc36830ba
Justin Klaassen [Fri, 8 Jul 2016 20:22:10 +0000 (20:22 +0000)]
Merge \"Remove \"Night mode\" from tuner\" into nyc-mr1-dev
am:
e615e16ab6
Change-Id: I497cf51948597f8f70e756e4f11dac94c2d69444
TreeHugger Robot [Fri, 8 Jul 2016 20:14:42 +0000 (20:14 +0000)]
Merge "Remove "Night mode" from tuner" into nyc-mr1-dev
Jean-Michel Trivi [Fri, 8 Jul 2016 20:04:01 +0000 (20:04 +0000)]
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
Jean-Michel Trivi [Fri, 8 Jul 2016 20:03:58 +0000 (20:03 +0000)]
Merge \\\"More javadoc for audio recording activity API\\\" into nyc-dev am:
8d5fd92314 am:
a90df50109
am:
7cd1622ca3
Change-Id: Ic2453ac826b5fc80a73b9a03d99c84cfd0132186
Android Build Merger (Role) [Fri, 8 Jul 2016 19:55:31 +0000 (19:55 +0000)]
Merge "Merge \\"More javadoc for audio recording activity API\\" into nyc-dev am:
8d5fd92314 am:
ee0a01c8a6" into nyc-mr1-dev-plus-aosp
Jean-Michel Trivi [Fri, 8 Jul 2016 19:55:11 +0000 (19:55 +0000)]
Merge \\"More javadoc for audio recording activity API\\" into nyc-dev am:
8d5fd92314
am:
ee0a01c8a6
Change-Id: I1f52abbc78812f5a80042440fc4781b7f51afa4d
Jean-Michel Trivi [Fri, 8 Jul 2016 19:55:08 +0000 (19:55 +0000)]
Merge \\"More javadoc for audio recording activity API\\" into nyc-dev am:
8d5fd92314
am:
a90df50109
Change-Id: I256b03cae0e76b7a5c61a691c9359a091f1f666a
Jean-Michel Trivi [Fri, 8 Jul 2016 19:49:09 +0000 (19:49 +0000)]
Merge \"More javadoc for audio recording activity API\" into nyc-dev
am:
8d5fd92314
Change-Id: If513added909df2135fb57a2f86804edec821177
Jean-Michel Trivi [Fri, 8 Jul 2016 19:45:54 +0000 (19:45 +0000)]
Merge \"More javadoc for audio recording activity API\" into nyc-dev
am:
8d5fd92314
Change-Id: I58f991a41a6d17ca8e854109dad6ab41b14bc65a
Jean-Michel Trivi [Fri, 8 Jul 2016 19:36:32 +0000 (19:36 +0000)]
Merge "More javadoc for audio recording activity API" into nyc-dev
Jeff Sharkey [Fri, 8 Jul 2016 19:21:30 +0000 (19:21 +0000)]
Merge \\"Use visible paths when cleaning up MediaStore.\\" into nyc-mr1-dev am:
8ee0a67ba7
am:
a637f17150
Change-Id: I0433fd57cb7da13d163eab1fde944cccec9c67bf
Garfield, Tan [Thu, 7 Jul 2016 00:24:20 +0000 (17:24 -0700)]
Add free space precondition check for copy job.
Bug:
24948755
Change-Id: I210395bdf339d630604e90e867ffddbbd3cf4bea
(cherry picked from commit
2a530ab3be585b366d562ea24940dcdd239af6d0)
Jeff Sharkey [Fri, 8 Jul 2016 19:11:48 +0000 (19:11 +0000)]
Merge \"Use visible paths when cleaning up MediaStore.\" into nyc-mr1-dev
am:
8ee0a67ba7
Change-Id: I387c13b1208ebdf05d03b4d172d538015dc3c6a5
Eino-Ville Talvala [Fri, 8 Jul 2016 19:11:11 +0000 (12:11 -0700)]
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
TreeHugger Robot [Fri, 8 Jul 2016 19:01:08 +0000 (19:01 +0000)]
Merge "Use visible paths when cleaning up MediaStore." into nyc-mr1-dev
Justin Klaassen [Wed, 22 Jun 2016 01:24:24 +0000 (18:24 -0700)]
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
Justin Klaassen [Tue, 21 Jun 2016 15:55:55 +0000 (08:55 -0700)]
Remove "Night mode" from tuner
Bug:
28887927
Change-Id: Ic1c217152e56db63a87a1f1e772696d97b4b58b3
Andreas Gampe [Fri, 8 Jul 2016 18:27:10 +0000 (18:27 +0000)]
Merge \\"Revert \\"Frameworks/base: Refactor UserHandle and Environment a bit\\"\\" into nyc-mr1-dev am:
56177bf81b
am:
5c1dc014ca
Change-Id: Ia51a5349ea826ca56ec0c5f8baf1c1afac7c6b81
Andreas Gampe [Fri, 8 Jul 2016 18:19:33 +0000 (18:19 +0000)]
Merge \"Revert \"Frameworks/base: Refactor UserHandle and Environment a bit\"\" into nyc-mr1-dev
am:
56177bf81b
Change-Id: I7ee938b31784d093680783c1988a68cc803cce3f
Derek Sollenberger [Fri, 8 Jul 2016 18:12:14 +0000 (18:12 +0000)]
Merge "Remove unused code from HWUI Layer"
Sergey Vasilinets [Fri, 8 Jul 2016 03:38:07 +0000 (20:38 -0700)]
UiBench: add NotificationShadeActivity
Change-Id: I67a80c35b04bc8fba092b224b19de9cddbd98f6f
Andreas Gampe [Fri, 8 Jul 2016 18:09:52 +0000 (18:09 +0000)]
Merge "Revert "Frameworks/base: Refactor UserHandle and Environment a bit"" into nyc-mr1-dev
Chris Thornton [Fri, 8 Jul 2016 18:09:38 +0000 (18:09 +0000)]
Merge \\"Updates to the sound trigger test app\\" into nyc-mr1-dev am:
e1fdcc49fd
am:
8ce7b9b6ff
Change-Id: Ib96262c213f9cc397d49b6be6d2ca5975a580ce4
Chris Thornton [Fri, 8 Jul 2016 18:01:33 +0000 (18:01 +0000)]
Merge \"Updates to the sound trigger test app\" into nyc-mr1-dev
am:
e1fdcc49fd
Change-Id: I84028121d101f417e2c55450b2a95041f33d2d40
Chris Thornton [Fri, 8 Jul 2016 17:47:51 +0000 (17:47 +0000)]
Merge "Updates to the sound trigger test app" into nyc-mr1-dev
Jeff Sharkey [Fri, 8 Jul 2016 17:06:58 +0000 (11:06 -0600)]
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
TreeHugger Robot [Fri, 8 Jul 2016 17:13:03 +0000 (17:13 +0000)]
Merge "Move RemoteViewsTest to the right package"
Kirill Grouchnikov [Fri, 8 Jul 2016 15:27:03 +0000 (11:27 -0400)]
Move RemoteViewsTest to the right package
RemoteViews is in android.widget and not android.view
Bug:
29805243
Change-Id: I6210f60f60a21443d8a873c3a8e6f39d956ea123
TreeHugger Robot [Fri, 8 Jul 2016 15:24:57 +0000 (15:24 +0000)]
Merge "Docsui-level work for implementing Eject on Roots list."
Andrei Stingaceanu [Fri, 8 Jul 2016 15:23:45 +0000 (15:23 +0000)]
Merge "TimePicker - introduce hidden methods for CTS testing"
Andrei Stingaceanu [Fri, 8 Jul 2016 15:13:25 +0000 (15:13 +0000)]
Merge "CalendarView Material - throw exception if date is out of range"
Suprabh Shukla [Fri, 8 Jul 2016 14:52:26 +0000 (14:52 +0000)]
Merge \\"Making timeouts configurable through Settings\\" into nyc-mr1-dev am:
33fa5dfa1d
am:
087d33febf
Change-Id: If1bb99b356d4b6fdf3471e1ccccc2c6ebf8ace43
Suprabh Shukla [Fri, 8 Jul 2016 14:44:53 +0000 (14:44 +0000)]
Merge \"Making timeouts configurable through Settings\" into nyc-mr1-dev
am:
33fa5dfa1d
Change-Id: Ife69e438d83ddfb75433f92c6c5521ae4c3f82cc
TreeHugger Robot [Fri, 8 Jul 2016 14:36:33 +0000 (14:36 +0000)]
Merge "Making timeouts configurable through Settings" into nyc-mr1-dev
Andrei Stingaceanu [Tue, 28 Jun 2016 14:56:44 +0000 (15:56 +0100)]
CalendarView Material - throw exception if date is out of range
Similar to CalendarViewLegacyDelegate#goTo
Bug:
28019187
Change-Id: Id21dcd208a594b98dc89caf59d36b32bdf9484be
Kirill Grouchnikov [Fri, 8 Jul 2016 14:11:11 +0000 (14:11 +0000)]
Merge "One more pass over Javadocs of RemoteViews public APIs"
Derek Sollenberger [Fri, 8 Jul 2016 13:57:56 +0000 (09:57 -0400)]
Remove unused code from HWUI Layer
Change-Id: If9046add5ca5a647351187c5809841edcf0bfa9b
Andreas Gampe [Fri, 8 Jul 2016 03:50:27 +0000 (03:50 +0000)]
Revert "Frameworks/base: Refactor UserHandle and Environment a bit"
Breaks monkey in root mode.
This reverts commit
6e16714c688ed9c52763696f5a5e7b90802a471b.
Bug:
29338430
Change-Id: I238f89dad77d7dcae6d02eccbda52eb9c6c6466c
Keisuke Kuroyanagi [Fri, 8 Jul 2016 03:34:13 +0000 (03:34 +0000)]
Merge "Make Undo/Redo work properly with IME."
Daichi Hirono [Thu, 7 Jul 2016 08:36:26 +0000 (17:36 +0900)]
Add @NonNull / @Nullable annotations to android.mtp API.
BUG=
26758882
Change-Id: Ic86d2253114b487d68a069f3e63f19b200d6cb97
TreeHugger Robot [Fri, 8 Jul 2016 01:40:41 +0000 (01:40 +0000)]
Merge "AAPT2: Fix fully qualified java class verification"
Adam Lesinski [Fri, 8 Jul 2016 00:12:12 +0000 (17:12 -0700)]
AAPT2: Fix fully qualified java class verification
Proguard rules would be ignored for components defined
in AndroidManifest.xml for android:name attributes if
they didn't start with '.'.
Change-Id: I029b5a2f224f4daf155b73a2a4dcd940dd43372e
Ben Lin [Wed, 29 Jun 2016 00:12:52 +0000 (17:12 -0700)]
Docsui-level work for implementing Eject on Roots list.
1. Added Eject Icon for Roots that support eject
2. Added Context Menu for RootsFragment (Settings and Eject)
Bug:
29584653
Change-Id: I97f582de05763e3f0327bc0d2dc6d4e2222e047c
(cherry picked from commit
d96661f8b0f613b40f2bdfc178bbe06022b5f76c)
Todd Kennedy [Thu, 7 Jul 2016 23:31:18 +0000 (23:31 +0000)]
Merge \\"Add values to ApplicationInfoFlags\\" into nyc-mr1-dev am:
6ac6ceb28b
am:
296b9edfb5
Change-Id: Icb86b109bb55500ad8f0f0768a5e8e8b04147bab
Todd Kennedy [Thu, 7 Jul 2016 23:24:00 +0000 (23:24 +0000)]
Merge \"Add values to ApplicationInfoFlags\" into nyc-mr1-dev
am:
6ac6ceb28b
Change-Id: I3aa2488496d7f21440c2bef03944b0f2bdaaa0b3
Michael Kwan [Thu, 7 Jul 2016 23:12:23 +0000 (16:12 -0700)]
Updated margins and spacing of preferences for watch type devices.
Bug:
27962897
Change-Id: I2625925bd972a574d40d22593dfdf35f80529a7c
TreeHugger Robot [Thu, 7 Jul 2016 23:15:25 +0000 (23:15 +0000)]
Merge "Add values to ApplicationInfoFlags" into nyc-mr1-dev
Winson [Thu, 7 Jul 2016 21:27:50 +0000 (14:27 -0700)]
Fixing regression in button clickability.
Bug:
29548227
Change-Id: I01fb29423133a0445de27fb69ce9ced02e31dc90
Chris Craik [Wed, 6 Jul 2016 23:10:09 +0000 (16:10 -0700)]
Delete old rendering pipeline
fixes:
30002246
Change-Id: I45df0e924708526cee045b14c291bd23aa1a92db
Jim Miller [Thu, 7 Jul 2016 22:45:58 +0000 (22:45 +0000)]
Merge \\"Fix bug with launching home activity from LockSettingsService\\" into nyc-mr1-dev am:
49fd320574
am:
7d5389bd07
Change-Id: I93dd8dd06d447b6d5401b7af8fc18b6345ce03b1
Jim Miller [Thu, 7 Jul 2016 22:38:27 +0000 (22:38 +0000)]
Merge \"Fix bug with launching home activity from LockSettingsService\" into nyc-mr1-dev
am:
49fd320574
Change-Id: Id050bad455a77ecc6523e8f0d5363668677f6945
TreeHugger Robot [Thu, 7 Jul 2016 22:32:09 +0000 (22:32 +0000)]
Merge "Fix bug with launching home activity from LockSettingsService" into nyc-mr1-dev
Chris Thornton [Fri, 1 Jul 2016 05:05:51 +0000 (22:05 -0700)]
Updates to the sound trigger test app
Moved the logic for talking to the system service into a service in the
app - this now lets you close the activity and still be able to receive
events. Additionally, we get CLI support using commands with the intent
com.android.intent.action.MANAGE_SOUND_TRIGGER.
Bug:
29073629
Change-Id: Ie904b73b4414f2c9fded013aeb5e6c6c3a67f5d3
Todd Kennedy [Thu, 7 Jul 2016 21:29:06 +0000 (14:29 -0700)]
Add values to ApplicationInfoFlags
Need to add MATCH_DISABLED_UNTIL_USED_COMPONENTS [and the deprecated
GET_DISABLED_UNTIL_USED_COMPONENTS] since those are used when building
the ApplicationInfo object.
Bug:
29824931
Change-Id: I09b24427222fed082f0946717826d2e0db857c7a
Makoto Onuki [Thu, 7 Jul 2016 21:16:43 +0000 (21:16 +0000)]
Merge \\"Hide more shortcut APIs\\" into nyc-mr1-dev am:
07e234c9d7
am:
639a862315
Change-Id: I215b00bae0bb6f9f6c44c23a713f69988f9ec9df
Suprabh Shukla [Wed, 6 Jul 2016 23:32:56 +0000 (16:32 -0700)]
Making timeouts configurable through Settings
Adding a global setting for timeouts used in retail demo mode.
Also renaming the protected intent ACTION_RESET_DEMO to reflect proper
owner package.
Bug:
29917613
Change-Id: I9a174503626ab28cceb5024a8e63d27612439b92
Makoto Onuki [Thu, 7 Jul 2016 21:10:00 +0000 (21:10 +0000)]
Merge \"Hide more shortcut APIs\" into nyc-mr1-dev
am:
07e234c9d7
Change-Id: If18c62359352c928e2b36c42563d5223c517964e
Eric Laurent [Thu, 7 Jul 2016 21:08:17 +0000 (21:08 +0000)]
Merge \"Merge \\\"SoundPool: fix enforced camera shutter sound\\\" into nyc-dev am:
a2266f7a0f am:
f638978b07\" into nyc-mr1-dev-plus-aosp
am:
984e51b4da
Change-Id: Icef781a5d53f99930e78936785ba351701f625d3
Jeff Sharkey [Thu, 7 Jul 2016 21:08:12 +0000 (21:08 +0000)]
Merge \"Merge \\"API 25 is frozen, so we can\\'t change API.\\" into nyc-mr1-dev am:
663cfc0f8d\" into nyc-mr1-dev-plus-aosp
am:
a57cbde260
Change-Id: Ide9ce12a3c45722cbdd412e8c41cbf7256453d21
Winson [Thu, 7 Jul 2016 21:08:07 +0000 (21:08 +0000)]
Merge \"Merge \\"Adding debugging for last active time.\\" into nyc-mr1-dev am:
d6c332b01a\" into nyc-mr1-dev-plus-aosp
am:
33597d225b
Change-Id: I1403993a36922c3a9b1e18a5dc2168b678bd7154
Eric Laurent [Thu, 7 Jul 2016 21:08:03 +0000 (21:08 +0000)]
Merge \\\"SoundPool: fix enforced camera shutter sound\\\" into nyc-dev am:
a2266f7a0f am:
a165d12737
am:
be50351b72
Change-Id: Ib25af848035f9bf1376c3c48506d9c5f882a9cb5
Android Build Merger (Role) [Thu, 7 Jul 2016 21:00:00 +0000 (21:00 +0000)]
Merge "Merge \\"SoundPool: fix enforced camera shutter sound\\" into nyc-dev am:
a2266f7a0f am:
f638978b07" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 7 Jul 2016 20:59:48 +0000 (20:59 +0000)]
Merge "Merge \"API 25 is frozen, so we can\'t change API.\" into nyc-mr1-dev am:
663cfc0f8d" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 7 Jul 2016 20:59:37 +0000 (20:59 +0000)]
Merge "Merge \"Adding debugging for last active time.\" into nyc-mr1-dev am:
d6c332b01a" into nyc-mr1-dev-plus-aosp
Jeff Sharkey [Thu, 7 Jul 2016 20:59:19 +0000 (20:59 +0000)]
Merge \\"Suppress PRE_BOOT notifications for some profiles.\\" into nyc-mr1-dev am:
99f70388ff
am:
7ca3706ebd
Change-Id: I7e5dc6ca7d01f4fb6345c13a8780eb29b058a685
Tim Murray [Thu, 7 Jul 2016 20:59:09 +0000 (20:59 +0000)]
Merge changes from topic \\'fifo\\' into nyc-mr1-dev am:
a96d445aef
am:
03b34e402c
Change-Id: If3104889f659aef9a6d7035e18ab839544c9ecb3
Eric Laurent [Thu, 7 Jul 2016 20:59:04 +0000 (20:59 +0000)]
Merge \\"SoundPool: fix enforced camera shutter sound\\" into nyc-dev am:
a2266f7a0f
am:
f638978b07
Change-Id: I88acecb9321d4a3480622b04b5a49ae87d7aff78
Jeff Sharkey [Thu, 7 Jul 2016 20:58:58 +0000 (20:58 +0000)]
Merge \"API 25 is frozen, so we can\'t change API.\" into nyc-mr1-dev
am:
663cfc0f8d
Change-Id: I5dbe4256bc61672658b0e755d1fa4c5cd36e140a
Winson [Thu, 7 Jul 2016 20:58:52 +0000 (20:58 +0000)]
Merge \"Adding debugging for last active time.\" into nyc-mr1-dev
am:
d6c332b01a
Change-Id: Ie79a7b46e73eb8ecaa29ddc73b43f4ce214b1695
Eric Laurent [Thu, 7 Jul 2016 20:57:54 +0000 (20:57 +0000)]
Merge \\"SoundPool: fix enforced camera shutter sound\\" into nyc-dev am:
a2266f7a0f
am:
a165d12737
Change-Id: I8e79a3f627ec38c736decdca2c88b56a4f5b5452
Makoto Onuki [Thu, 7 Jul 2016 20:52:21 +0000 (20:52 +0000)]
Merge "Hide more shortcut APIs" into nyc-mr1-dev
Eric Laurent [Thu, 7 Jul 2016 20:49:13 +0000 (20:49 +0000)]
Merge \"SoundPool: fix enforced camera shutter sound\" into nyc-dev
am:
a2266f7a0f
Change-Id: Ibb406207b55a532fdb42a68d0787b851deec8d05
Jeff Sharkey [Thu, 7 Jul 2016 20:48:43 +0000 (20:48 +0000)]
Merge \"Suppress PRE_BOOT notifications for some profiles.\" into nyc-mr1-dev
am:
99f70388ff
Change-Id: I977d5e4073ce57809ffb2b2e324b133c52341c4f
Tim Murray [Thu, 7 Jul 2016 20:48:27 +0000 (20:48 +0000)]
Merge changes from topic \'fifo\' into nyc-mr1-dev
am:
a96d445aef
Change-Id: If4a5c3f65cb611aecf82ad49ad6d992f098cbfb1
Eric Laurent [Thu, 7 Jul 2016 20:46:20 +0000 (20:46 +0000)]
Merge \"SoundPool: fix enforced camera shutter sound\" into nyc-dev
am:
a2266f7a0f
Change-Id: I6ae2457bd8bd9f53b35373fb1be7eb66f80f1510
Jeff Sharkey [Thu, 7 Jul 2016 20:41:37 +0000 (20:41 +0000)]
Merge "API 25 is frozen, so we can't change API." into nyc-mr1-dev
TreeHugger Robot [Thu, 7 Jul 2016 20:40:36 +0000 (20:40 +0000)]
Merge "Adding debugging for last active time." into nyc-mr1-dev
Eric Laurent [Thu, 7 Jul 2016 20:36:59 +0000 (20:36 +0000)]
Merge "SoundPool: fix enforced camera shutter sound" into nyc-dev
Jeff Sharkey [Thu, 7 Jul 2016 20:35:36 +0000 (20:35 +0000)]
Merge \\"Treat everyone the same.\\" into nyc-mr1-dev am:
a1b026ea2e
am:
f32a5c426f
Change-Id: I5e3c1c5fc2b25fd7a5b8cd61ed9fb073b66240e2
TreeHugger Robot [Thu, 7 Jul 2016 20:31:35 +0000 (20:31 +0000)]
Merge "Suppress PRE_BOOT notifications for some profiles." into nyc-mr1-dev
OSDN Git Service
