OSDN Git Service
Prashant Malani [Fri, 18 Jul 2014 23:15:04 +0000 (23:15 +0000)]
am
c61f26fa: Make the booting flag update unconditional
* commit '
c61f26fae8c2c0b0c47c98204b07b2be8bd9a8ee':
Make the booting flag update unconditional
Prashant Malani [Tue, 15 Jul 2014 23:28:24 +0000 (16:28 -0700)]
Make the booting flag update unconditional
In case an Activity is started before we idle, there is a chance
the booting flag might never get updated.
Bug:
16015648
Change-Id: I46504bd126573e3a2ce1f914be922765ae9fe560
Conflicts:
services/core/java/com/android/server/am/ActivityStackSupervisor.java
Yin-Chia Yeh [Fri, 18 Jul 2014 23:06:50 +0000 (23:06 +0000)]
am
861dd642: Merge "Camera2: add highSpeedVideoConfig wrapper and APIs" into lmp-dev
* commit '
861dd6429d2d8fe13ec9021fc56d8d0c26440890':
Camera2: add highSpeedVideoConfig wrapper and APIs
Dake Gu [Fri, 18 Jul 2014 22:54:09 +0000 (22:54 +0000)]
am
bd497879: ActivityTransition: fix wrong width/height applied to sharedelement.
* commit '
bd497879f75bf081bec8fa560a136c630d503317':
ActivityTransition: fix wrong width/height applied to sharedelement.
Dake Gu [Tue, 15 Jul 2014 23:29:38 +0000 (16:29 -0700)]
ActivityTransition: fix wrong width/height applied to sharedelement.
transform screen position/size to position/size in parent of sharedelement.
fixed bug of transformMatirxToLocal() and transformMatrixToGlobal() that gets
Change-Id: I4c7b12f1ada7004ab7594961df4079be4ca4c909
Andre Eisenbach [Fri, 18 Jul 2014 22:49:52 +0000 (22:49 +0000)]
am
decb3109: Merge "Reduce GATT logging output" into lmp-dev
* commit '
decb310973362b9849310dd0e087d256196ac62b':
Reduce GATT logging output
Niels Egberts [Fri, 18 Jul 2014 22:41:41 +0000 (22:41 +0000)]
am
40268fc5: Merge "Add money as a new TtsSpan type." into lmp-dev
* commit '
40268fc5bb1d56ed64ee5011371f18717eb6243a':
Add money as a new TtsSpan type.
Adam Lesinski [Fri, 18 Jul 2014 22:29:07 +0000 (22:29 +0000)]
am
e0b92a6b: First iteration of a public UsageStats API
* commit '
e0b92a6b9017912fd6f4df96cad4b832288610a2':
First iteration of a public UsageStats API
Adam Lesinski [Thu, 17 Jul 2014 02:09:13 +0000 (19:09 -0700)]
First iteration of a public UsageStats API
UsageStats API that allows apps to get a list of packages that have been
recently used, along with basic stats like how long they have been in
the foreground and the most recent time they were running.
Bug:
15165667
Change-Id: I2a2d1ff69bd0b5703ac3d9de1780df42ad90d439
John Reck [Fri, 18 Jul 2014 22:14:45 +0000 (22:14 +0000)]
am
3406fe19: Add RT-enabled reveal animator
* commit '
3406fe19f70e057b77a7f597e87b4b8511e72aa5':
Add RT-enabled reveal animator
John Reck [Tue, 15 Jul 2014 21:29:33 +0000 (14:29 -0700)]
Add RT-enabled reveal animator
Bug:
16161431
Also re-writes RevealAnimator to avoid using any listeners internally,
removing the logic around shadowing the update listeners.
Change-Id: I6ed8126398eed971a87f20bccb7584c9acafbb6c
Zhijun He [Fri, 18 Jul 2014 22:04:11 +0000 (22:04 +0000)]
am
3ea4b9d0: Camera2: send the partial result with onCaptureProgressed
* commit '
3ea4b9d066bffe3e2faeb49b6e8d59068e0ccdba':
Camera2: send the partial result with onCaptureProgressed
Sailesh Nepal [Fri, 18 Jul 2014 22:04:07 +0000 (22:04 +0000)]
am
92119b9f: Merge "Add Connection.startActivityFromInCall" into lmp-dev
* commit '
92119b9f8cb357223fca86407799d0d5a274b028':
Add Connection.startActivityFromInCall
Zhijun He [Fri, 18 Jul 2014 21:20:48 +0000 (14:20 -0700)]
Camera2: send the partial result with onCaptureProgressed
When partial results are receieved, call onCaptureProgressed instead of
onCapturePartial.
Change-Id: If97233d7b980f490821bca0a722d527f19034cd9
Jean-Michel Trivi [Fri, 18 Jul 2014 21:42:59 +0000 (21:42 +0000)]
am
115bf42b: Unhide Virtualizer.getVirtualizationMode()
* commit '
115bf42b3321350e3869f6094c136cc545c8865f':
Unhide Virtualizer.getVirtualizationMode()
Sailesh Nepal [Fri, 18 Jul 2014 21:38:20 +0000 (21:38 +0000)]
am
0587043f: Merge "Use main thread for RemoteConnection callbacks" into lmp-dev
* commit '
0587043fcc353d7a9d374c346fa1445f2e57e6da':
Use main thread for RemoteConnection callbacks
Jean-Michel Trivi [Fri, 18 Jul 2014 18:42:38 +0000 (11:42 -0700)]
Unhide Virtualizer.getVirtualizationMode()
Unhide Virtualizer.getVirtualizationMode() method.
Added note in javadoc about the returned value.
Declared exceptions that can be thrown by the checkStatus(int)
helper function.
Change-Id: I4da82d1db1e39ca9dae489559bf1fb5de112c26a
Jim Miller [Fri, 18 Jul 2014 21:34:07 +0000 (21:34 +0000)]
am
0f6db1e8: Merge "Add DevicePolicyManager flag for fingerprint." into lmp-dev
* commit '
0f6db1e823a96d14ea831ec2bccc435dd321da28':
Add DevicePolicyManager flag for fingerprint.
Ye Wen [Fri, 18 Jul 2014 21:34:03 +0000 (21:34 +0000)]
am
2c960085: Merge "Unhide MMS APIs for MSIM (1/2)" into lmp-dev
* commit '
2c960085d2780d8c2fc66d6e3b0233ef6d1fbe42':
Unhide MMS APIs for MSIM (1/2)
Dan Sandler [Fri, 18 Jul 2014 21:24:59 +0000 (21:24 +0000)]
am
5239e4d2: Don\'t crash if user profile bitmap is null.
* commit '
5239e4d2f5098cfb97b6f94c155e4aa4943f9d87':
Don't crash if user profile bitmap is null.
Robert Greenwalt [Fri, 18 Jul 2014 21:20:34 +0000 (21:20 +0000)]
am
721252c0: Quit NetworkMonitors at end of life.
* commit '
721252c084d74f0755b4f093fefa5ff13c6f896d':
Quit NetworkMonitors at end of life.
Dan Sandler [Fri, 18 Jul 2014 17:22:02 +0000 (13:22 -0400)]
Don't crash if user profile bitmap is null.
Bug:
16398850
Change-Id: Ie8ddb0841af255bbde098a213cb0ec1690d14c4c
Robert Greenwalt [Thu, 17 Jul 2014 23:11:38 +0000 (16:11 -0700)]
Quit NetworkMonitors at end of life.
We were creating and orphaning a thread for each network.
Cleanup after ourselves.
bug:
16119890
Change-Id: I8c8a9fe471e43f31f712844915992084074e8047
Makoto Onuki [Fri, 18 Jul 2014 21:03:41 +0000 (21:03 +0000)]
am
38bfa1ba: Merge "Use "current" cp2 from telephony" into lmp-dev
* commit '
38bfa1ba0bedde690d6e3d8c8dd5ed4b91e1e647':
Use "current" cp2 from telephony
ztenghui [Fri, 18 Jul 2014 20:45:07 +0000 (20:45 +0000)]
am
f101ebb0: Fix FIT_XY scaleType issue on VectorDrawable
* commit '
f101ebb0f4c88053a8b1ca2295b7a6afe8540127':
Fix FIT_XY scaleType issue on VectorDrawable
ztenghui [Thu, 17 Jul 2014 22:06:03 +0000 (15:06 -0700)]
Fix FIT_XY scaleType issue on VectorDrawable
bug:
16019658
Change-Id: I8b6ac23bf14de5427d3029436acf76bd1161f0ea
ztenghui [Fri, 18 Jul 2014 20:12:13 +0000 (20:12 +0000)]
am
22fd0f85: Fix caching in VectorDrawable to pass the CTS test
* commit '
22fd0f851e46cd8292553f96d93a7ebfaf537186':
Fix caching in VectorDrawable to pass the CTS test
ztenghui [Fri, 18 Jul 2014 00:01:30 +0000 (17:01 -0700)]
Fix caching in VectorDrawable to pass the CTS test
bug:
16380401
Change-Id: I573f4cc782707c6ef3484597ddc621a7a6353898
Andrew Lee [Fri, 18 Jul 2014 19:42:57 +0000 (19:42 +0000)]
am
f72fa887: Merge "Add comments for RemoteCallVideoClient and RemoteCallVideoProvider." into lmp-dev
* commit '
f72fa88707287317d42510090e927f212cdcbb23':
Add comments for RemoteCallVideoClient and RemoteCallVideoProvider.
Andre Eisenbach [Fri, 18 Jul 2014 19:35:11 +0000 (19:35 +0000)]
am
99e79902: LE: Add connection parameter update request API (4/4)
* commit '
99e79902fbf036d2a69ce99ed4f4f51b62b419f3':
LE: Add connection parameter update request API (4/4)
Christopher Tate [Fri, 18 Jul 2014 19:16:47 +0000 (19:16 +0000)]
am
74ec3d59: Merge "Tear down agents properly at EOD in full restore" into lmp-dev
* commit '
74ec3d599b4a2d7dcf0d723af0366af73b87eda0':
Tear down agents properly at EOD in full restore
Andre Eisenbach [Thu, 17 Jul 2014 06:02:42 +0000 (23:02 -0700)]
LE: Add connection parameter update request API (4/4)
Change-Id: Ifb531a1b7ab05888817b96fcc89f85e17df7ffe2
Winson Chung [Fri, 18 Jul 2014 18:54:55 +0000 (18:54 +0000)]
am
61d52679: Fixing issue where we weren\'t restoring touch state on dismissed Task cards. (Bug
16322100)
* commit '
61d5267986f21ae7b657d9ba1cf6bff9344aa6e1':
Fixing issue where we weren't restoring touch state on dismissed Task cards. (Bug
16322100)
Winson Chung [Fri, 18 Jul 2014 01:39:02 +0000 (18:39 -0700)]
Fixing issue where we weren't restoring touch state on dismissed Task cards. (Bug
16322100)
Youngsang Cho [Fri, 18 Jul 2014 18:46:15 +0000 (18:46 +0000)]
am
e94cfccd: Merge "TIF: Add unblock content" into lmp-dev
* commit '
e94cfccd48ac07ec718b280e7793623da46c61e9':
TIF: Add unblock content
Youngsang Cho [Fri, 18 Jul 2014 18:46:11 +0000 (18:46 +0000)]
am
c28a86ff: Merge "TIF: Add onInputAdded and onInputRemoved" into lmp-dev
* commit '
c28a86ff8054bd5be6adaaff4a51609bcda76211':
TIF: Add onInputAdded and onInputRemoved
Yin-Chia Yeh [Fri, 18 Jul 2014 23:02:00 +0000 (23:02 +0000)]
Merge "Camera2: add highSpeedVideoConfig wrapper and APIs" into lmp-dev
Yin-Chia Yeh [Tue, 15 Jul 2014 17:37:31 +0000 (10:37 -0700)]
Camera2: add highSpeedVideoConfig wrapper and APIs
- Add wrapper class for highSpeedVideoConfiguration.
- Add APIs to query high speed video recording configurations in
StreamConfigurationMap
- Fix ColorSpaceTransform unit test in CameraMetadataTest
- Fix a bug in HashCodeHelper
Change-Id: I192e57f6ab5dfbba6d958571352f067a9eaec7b2
Andre Eisenbach [Fri, 18 Jul 2014 22:44:18 +0000 (22:44 +0000)]
Merge "Reduce GATT logging output" into lmp-dev
Andre Eisenbach [Fri, 18 Jul 2014 21:38:36 +0000 (14:38 -0700)]
Reduce GATT logging output
Change-Id: Iefdf101ac849e45bf50c55ce5999364f5fbd24a4
Youngsang Cho [Fri, 18 Jul 2014 18:42:33 +0000 (18:42 +0000)]
Merge "TIF: Add onInputAdded and onInputRemoved" into lmp-dev
Dan Sandler [Fri, 18 Jul 2014 18:03:48 +0000 (18:03 +0000)]
am
7aabcfa3: Merge "Deprecate and stop generating tickerViews." into lmp-dev
* commit '
7aabcfa391a7f0e4955aa5b8f8f396b4dab3579f':
Deprecate and stop generating tickerViews.
Dan Sandler [Fri, 18 Jul 2014 18:03:45 +0000 (18:03 +0000)]
am
9b557a25: Merge "Actually show secret notifications sometimes." into lmp-dev
* commit '
9b557a250922f1071774fe4b19966b4304875277':
Actually show secret notifications sometimes.
Brian Attwell [Fri, 18 Jul 2014 17:52:13 +0000 (17:52 +0000)]
am
fa15c729: Merge "Mark social APIs stream APIs as deprecated" into lmp-dev
* commit '
fa15c729359a93bc47337b2204cab3a70588b2c5':
Mark social APIs stream APIs as deprecated
Paul Jensen [Fri, 18 Jul 2014 17:33:47 +0000 (17:33 +0000)]
am
d2cb9213: Merge "Make back button work in CaptivePortalLogin app like a web browser." into lmp-dev
* commit '
d2cb92132896bc63c6a0906a385a35b1e5f474a9':
Make back button work in CaptivePortalLogin app like a web browser.
Ihab Awad [Fri, 18 Jul 2014 17:19:09 +0000 (17:19 +0000)]
am
42c4a935: Merge "Wire up multi-SIM experience (1/4)" into lmp-dev
* commit '
42c4a935466ad2909f1e7f1bc6f38682847d9840':
Wire up multi-SIM experience (1/4)
Narayan Kamath [Fri, 18 Jul 2014 16:33:41 +0000 (16:33 +0000)]
am
8ebfdcbc: Merge "Fix broken locale related assumptions in TextServicesManager." into lmp-dev
* commit '
8ebfdcbce191ec6d6203df727225584798ebe90b':
Fix broken locale related assumptions in TextServicesManager.
Yigit Boyar [Fri, 18 Jul 2014 16:17:59 +0000 (16:17 +0000)]
am
d81c4869: Update RecyclerView scroll listener to the new API
* commit '
d81c4869401b42bec84c935a1223134862089547':
Update RecyclerView scroll listener to the new API
Yigit Boyar [Mon, 14 Jul 2014 22:40:36 +0000 (15:40 -0700)]
Update RecyclerView scroll listener to the new API
Bug:
16054949
Change-Id: I264a701e8b298a08f09bb30284099734054d518c
Niels Egberts [Fri, 18 Jul 2014 15:53:48 +0000 (15:53 +0000)]
am
8fe5ff89: Merge "New TtsSpan builders for types measure, time, date, digits and verbatim." into lmp-dev
* commit '
8fe5ff8954a8d08f488a313dd6b6cc28b3447121':
New TtsSpan builders for types measure, time, date, digits and verbatim.
John Spurlock [Fri, 18 Jul 2014 15:53:44 +0000 (15:53 +0000)]
am
59371a77: Merge "Volume: Dismiss shade when launching settings from rocker." into lmp-dev
* commit '
59371a77eeede48b98d51c5914e8ffd290f630ff':
Volume: Dismiss shade when launching settings from rocker.
Jean-Michel Trivi [Fri, 18 Jul 2014 15:33:12 +0000 (15:33 +0000)]
am
9319d51e: Merge "Unhide audio virtualizer capability query methods" into lmp-dev
* commit '
9319d51ea80f562b176ced9559d69b5ba4652de4':
Unhide audio virtualizer capability query methods
Niels Egberts [Fri, 18 Jul 2014 15:28:15 +0000 (15:28 +0000)]
am
bfe7d019: Merge "Add builders for TtsSpans of type ordinal, decimal and fraction." into lmp-dev
* commit '
bfe7d01977db5e2ebd27694d17ee9b32c4b93795':
Add builders for TtsSpans of type ordinal, decimal and fraction.
Narayan Kamath [Fri, 18 Jul 2014 14:04:08 +0000 (14:04 +0000)]
am
c2819ea1: Merge "Unhide." into lmp-dev
* commit '
c2819ea18c06d729dc3b3454c5a80135ca62bf5c':
Unhide.
Dan Sandler [Fri, 18 Jul 2014 13:53:20 +0000 (13:53 +0000)]
am
ef247c27: Merge "Shrink user profile bitmaps to 48dp^2." into lmp-dev
* commit '
ef247c27a250fd0f529ee214b5a95fe184749ab0':
Shrink user profile bitmaps to 48dp^2.
Ji-Hwan Lee [Fri, 18 Jul 2014 12:54:42 +0000 (12:54 +0000)]
am
57b300cd: Fix android_system_stubs build
* commit '
57b300cd0fda909e8e59eb9df730be72942b523a':
Fix android_system_stubs build
Ji-Hwan Lee [Fri, 18 Jul 2014 12:39:57 +0000 (21:39 +0900)]
Fix android_system_stubs build
Change-Id: I52c42b5d781b5c07481cdce598d2ebc340d57850
Christoph Studer [Fri, 18 Jul 2014 11:22:42 +0000 (11:22 +0000)]
am
c6a6ae78: Merge "Cancel notification group children when summary is canceled" into lmp-dev
* commit '
c6a6ae78af611dacc51a481f83d878a8e3fba7cb':
Cancel notification group children when summary is canceled
Bryan Mawhinney [Fri, 18 Jul 2014 11:22:33 +0000 (11:22 +0000)]
am
d82b7ec9: Merge "Default MediaStyled notifications to CATEGORY_TRANSPORT" into lmp-dev
* commit '
d82b7ec93136bf0ba5c5f66e1542d33979a76e00':
Default MediaStyled notifications to CATEGORY_TRANSPORT
Dongwon Kang [Fri, 18 Jul 2014 11:22:23 +0000 (11:22 +0000)]
am
0e02f53c: TIF: introduce TvContract.buildChannelUriForPassthroughTvInput()
* commit '
0e02f53cea21c90ec63cfb2a2f8c3ee81a3848fe':
TIF: introduce TvContract.buildChannelUriForPassthroughTvInput()
Wonsik Kim [Fri, 18 Jul 2014 11:22:02 +0000 (11:22 +0000)]
am
5fec7afe: Merge "TIF: change onCreateSession() method signature" into lmp-dev
* commit '
5fec7afe3b1bb24c9382ab59a25f5c7eb87e6344':
TIF: change onCreateSession() method signature
Youngsang Cho [Fri, 18 Jul 2014 11:21:53 +0000 (11:21 +0000)]
am
ad67fc6f: Fix a build breakage
* commit '
ad67fc6fe2994c72bd31896de25dceb0adacd3cb':
Fix a build breakage
Dongwon Kang [Tue, 15 Jul 2014 12:36:43 +0000 (21:36 +0900)]
TIF: introduce TvContract.buildChannelUriForPassthroughTvInput()
This change adds a way to get a dummy channel for starting pass-through
TV inputs which don't have real channels in TvProvider.
Bug:
15496325
Change-Id: I7a6b99964319f12a0f8692b4e307e03480119a69
Jaewan Kim [Tue, 15 Jul 2014 04:01:57 +0000 (13:01 +0900)]
TIF: Add onInputAdded and onInputRemoved
Bug:
16166859
Change-Id: I51bd87aded3e8619e36be200009e924e73cd348e
Youngsang Cho [Fri, 18 Jul 2014 04:24:06 +0000 (21:24 -0700)]
Fix a build breakage
Updated current.txt.
Change-Id: Ib1434da2345aa349e5fc3112bf38dbba9955c885
Youngsang Cho [Fri, 18 Jul 2014 03:34:53 +0000 (03:34 +0000)]
am
d81f1075: Merge "TIF: Change the parameter of TvInputInfo.loadLabel/Icon" into lmp-dev
* commit '
d81f1075c0aa5623a3fd64150e8ca5f6d04907c8':
TIF: Change the parameter of TvInputInfo.loadLabel/Icon
Youngsang Cho [Fri, 18 Jul 2014 03:34:49 +0000 (03:34 +0000)]
am
aa5dbe63: Merge "TIF: Hide TvContract.Channels.COLUMN_BROWSABLE" into lmp-dev
* commit '
aa5dbe6370213b9c18e6f34d812c055645696f58':
TIF: Hide TvContract.Channels.COLUMN_BROWSABLE
Youngsang Cho [Fri, 18 Jul 2014 03:34:45 +0000 (03:34 +0000)]
am
57df5b3d: Merge "TIF: Add a notification for surface change from TvView to TvInputService" into lmp-dev
* commit '
57df5b3db54f627345d8fe16c51fc3561f563f9e':
TIF: Add a notification for surface change from TvView to TvInputService
Jae Seo [Fri, 18 Jul 2014 03:30:31 +0000 (03:30 +0000)]
am
cd12bfc7: TIF: Add a method to get TvInputInfo for a given TV input
* commit '
cd12bfc7259cd7f38986f8a135764ab42d81e30a':
TIF: Add a method to get TvInputInfo for a given TV input
John Spurlock [Fri, 18 Jul 2014 03:30:28 +0000 (03:30 +0000)]
am
5690da98: Merge "Volume: Rocker animation + style updates." into lmp-dev
* commit '
5690da980040eb4b1a89ea903733f0cc8d247c5e':
Volume: Rocker animation + style updates.
Jae Seo [Fri, 18 Jul 2014 03:30:23 +0000 (03:30 +0000)]
am
27d12ca6: TIF: Add buildInputId()
* commit '
27d12ca6b4966d6dd520fb72fb0058619a87d448':
TIF: Add buildInputId()
Jae Seo [Fri, 18 Jul 2014 03:26:23 +0000 (03:26 +0000)]
am
3245f3d7: Merge "TIF: Add TvParentalControlManager" into lmp-dev
* commit '
3245f3d76cc92899091f113e701a32a7eb819591':
TIF: Add TvParentalControlManager
Jae Seo [Sun, 13 Jul 2014 02:25:24 +0000 (19:25 -0700)]
TIF: Add a method to get TvInputInfo for a given TV input
This is going to be needed by applications to get information about the
inputs that are just added thus not included in the previously retrieved
input list.
Bug:
16166859, Bug:
15838097
Change-Id: Icecd03fcea208a0c4d41caab1eec64e574f40877
Jae Seo [Thu, 17 Jul 2014 23:53:13 +0000 (16:53 -0700)]
TIF: Add buildInputId()
A recent change mandated that we should provide "input ID" instead of
ComponentName when building URIs for channels/programs while there is no
direct way to get one to use with. This CL added a method to build an ID
from a ComponentName.
Change-Id: Ia7f868cf241bb44ca0d4f689dc15326ce6944468
Jeff Brown [Fri, 18 Jul 2014 03:08:27 +0000 (03:08 +0000)]
am
ce75065c: Merge "Add glance sensor for doze mode." into lmp-dev
* commit '
ce75065cff02b83f153306c2c2ec7e1cc3ef262b':
Add glance sensor for doze mode.
Tyler Gunn [Fri, 18 Jul 2014 02:36:12 +0000 (02:36 +0000)]
am
1a0365fd: Merge "Wiring video state through from Connection" into lmp-dev
* commit '
1a0365fd820a6ab1b6a636c95cdabe55f965608a':
Wiring video state through from Connection
Sandeep Siddhartha [Fri, 18 Jul 2014 02:31:44 +0000 (02:31 +0000)]
am
ad6bb11f: Merge "Test hotword flow" into lmp-dev
* commit '
ad6bb11f0e683cf018ff34a6be50bb51a215cec3':
Test hotword flow
Wonsik Kim [Fri, 18 Jul 2014 02:23:52 +0000 (02:23 +0000)]
am
2a7c2e38: Merge "TIF: one-to-many relationship for TvInputService to TvInputInfo" into lmp-dev
* commit '
2a7c2e3895306024932a20e38dfff488436a486a':
TIF: one-to-many relationship for TvInputService to TvInputInfo
RoboErik [Fri, 18 Jul 2014 01:43:45 +0000 (01:43 +0000)]
am
2ca51276: Fix crash when calling MediaSession callback
* commit '
2ca512761bb16c2ed2136002d866cc2d7aaf79cb':
Fix crash when calling MediaSession callback
RoboErik [Fri, 18 Jul 2014 01:26:21 +0000 (18:26 -0700)]
Fix crash when calling MediaSession callback
bug:
16311395
Change-Id: Ice52d2da63933af881dd95fa8c6f59a6fe27e0df
Marcin Kosiba [Fri, 18 Jul 2014 01:23:51 +0000 (01:23 +0000)]
am
231d57e2: Add a WebView.zoomBy API.
* commit '
231d57e20d978fda6ace2457d9a5b19ee749f1cb':
Add a WebView.zoomBy API.
Marcin Kosiba [Tue, 15 Jul 2014 16:59:51 +0000 (17:59 +0100)]
Add a WebView.zoomBy API.
The WebView has zoomIn/zoomOut APIs which zoom in/out by a fixed
amount. This adds a more flexible API.
BUG:
13399510
Change-Id: Ia505048d5b1c48f9a3ff1c4ce7129ed2f55804f8
Zhijun He [Fri, 18 Jul 2014 01:06:12 +0000 (01:06 +0000)]
am
93ecc474: Merge "Camera2: partialResultCount should be optional" into lmp-dev
* commit '
93ecc474c3cedc6511bca900590637e68c86aa05':
Camera2: partialResultCount should be optional
Jinsuk Kim [Fri, 18 Jul 2014 00:28:16 +0000 (00:28 +0000)]
am
ba5ba7a2: Merge "Remove system audio output option for HdmiControlService" into lmp-dev
* commit '
ba5ba7a2408de8a3ac40d3bf0ed18141bee2fada':
Remove system audio output option for HdmiControlService
Craig Stout [Thu, 17 Jul 2014 23:33:44 +0000 (23:33 +0000)]
am
51ff3b68: Fix timepicker double done buttons.
* commit '
51ff3b686347d4b0ce638b1556ab47b5c10140be':
Fix timepicker double done buttons.
Craig Stout [Thu, 17 Jul 2014 18:32:09 +0000 (11:32 -0700)]
Fix timepicker double done buttons.
Leanback theme uses a legacy layout with a done button, but
apps won't necessarily have target apilevel L.
Change-Id: Ib38b08df1fe07bd8fb4e64e93633ce0b7eb12567
Filip Gruszczynski [Thu, 17 Jul 2014 23:24:55 +0000 (23:24 +0000)]
am
23c51de9: resolved conflicts for merge of
bbc49941 to lmp-dev
* commit '
23c51de92cf52f02b7ff014790224199abf2e86a':
Only use bottom outset for main display.
Filip Gruszczynski [Thu, 17 Jul 2014 23:20:24 +0000 (16:20 -0700)]
resolved conflicts for merge of
bbc49941 to lmp-dev
Change-Id: If8e607ab1946c3ca5bb8960d32fdefebbfb21ffe
John Spurlock [Thu, 17 Jul 2014 23:15:32 +0000 (23:15 +0000)]
am
d92f55cb: Merge "Shade: Hide status icons, take 2." into lmp-dev
* commit '
d92f55cb1169c51858152b9787ba5d3e685ae86b':
Shade: Hide status icons, take 2.
Christopher Tate [Thu, 17 Jul 2014 23:04:24 +0000 (23:04 +0000)]
am
912793dc: Properly end full restore attempt if getNextFullRestoreDataChunk() fails
* commit '
912793dc95c09d384587195c667958723cac646a':
Properly end full restore attempt if getNextFullRestoreDataChunk() fails
Christopher Tate [Thu, 17 Jul 2014 22:58:12 +0000 (15:58 -0700)]
Properly end full restore attempt if getNextFullRestoreDataChunk() fails
Don't just drop the error return on the floor and retry (forever!).
Change-Id: I5f0ef2d09ea286d813add69517f865e474341b43
Chris Craik [Thu, 17 Jul 2014 22:42:29 +0000 (22:42 +0000)]
am
a987914f: Merge "[HWUI]: fix residual line on FrameBuffer" into lmp-dev
* commit '
a987914f5c43a1651846121e5009a84bb05f87b0':
[HWUI]: fix residual line on FrameBuffer
Michael Wright [Thu, 17 Jul 2014 22:04:05 +0000 (22:04 +0000)]
am
4d2ee15a: Merge "Add MediaProjection APIs." into lmp-dev
* commit '
4d2ee15a7dfe005461b0bdac8f518b283311fcfb':
Add MediaProjection APIs.
Jim Miller [Fri, 18 Jul 2014 21:29:43 +0000 (21:29 +0000)]
Merge "Add DevicePolicyManager flag for fingerprint." into lmp-dev
Jim Miller [Thu, 17 Jul 2014 21:46:05 +0000 (14:46 -0700)]
Add DevicePolicyManager flag for fingerprint.
Change-Id: Icb3e4b98d97487179acefabc7a3b747d3d0fa23a
Christopher Tate [Fri, 18 Jul 2014 19:10:41 +0000 (19:10 +0000)]
Merge "Tear down agents properly at EOD in full restore" into lmp-dev
Christopher Tate [Fri, 18 Jul 2014 02:09:00 +0000 (19:09 -0700)]
Tear down agents properly at EOD in full restore
The restore engine wasn't tearing down the bound agent after reaching
the end of data for the app, and furthermore was allowing the restore
operation to resume running the queue before all data had been delivered
to the current target.
Also make LocalTransport deliver data in 2K chunks rather than 32K,
as a first step towards making its timing characteristics more like
we'll see in networked situations.
Finally, added a bunch of MORE_DEBUG output for finding odd bugs
like this.
Change-Id: Icdbe6a070af6cc7c708a938ad044108d40ebce9a
Youngsang Cho [Fri, 18 Jul 2014 18:42:59 +0000 (18:42 +0000)]
Merge "TIF: Add unblock content" into lmp-dev
Jaewan Kim [Wed, 16 Jul 2014 02:28:56 +0000 (11:28 +0900)]
TIF: Add unblock content
When a TV content is blocked by the parental control settings,
TV input service will notify TV to request user's PIN code verification.
If the verification succeeds, TV input service will be notified back
that content is unblocked so it can keep playing the content.
Bug:
13172379
Change-Id: I7b31d762eb54612c4d8779ee133211f32fb73b05
Youngsang Cho [Fri, 18 Jul 2014 03:30:55 +0000 (03:30 +0000)]
Merge "TIF: Change the parameter of TvInputInfo.loadLabel/Icon" into lmp-dev