OSDN Git Service
Alan Viverette [Fri, 26 Sep 2014 01:30:43 +0000 (01:30 +0000)]
am
a9ac89a3: Merge "Correctly advertise accessibility scrolling actions" into lmp-dev
* commit '
a9ac89a3fa9291553edb72f4557dcff9e77863ae':
Correctly advertise accessibility scrolling actions
Alan Viverette [Fri, 26 Sep 2014 01:13:12 +0000 (01:13 +0000)]
Merge "Correctly advertise accessibility scrolling actions" into lmp-dev
Sailesh Nepal [Fri, 26 Sep 2014 01:06:11 +0000 (01:06 +0000)]
am
7461b5a0: Merge "Adding support for Cdma conference calling." into lmp-dev
* commit '
7461b5a019dca6e02f1ddba0f75a6548e40fb632':
Adding support for Cdma conference calling.
Adam Lesinski [Fri, 26 Sep 2014 01:06:06 +0000 (01:06 +0000)]
am
0a6c5ea4: Merge "AAPT: Fix issue with synthesized resource not actually showing up" into lmp-dev
* commit '
0a6c5ea412bc1e49aa1e98a6a3fe268081883d4a':
AAPT: Fix issue with synthesized resource not actually showing up
Sailesh Nepal [Fri, 26 Sep 2014 00:56:09 +0000 (00:56 +0000)]
Merge "Adding support for Cdma conference calling." into lmp-dev
Adam Lesinski [Fri, 26 Sep 2014 00:51:35 +0000 (00:51 +0000)]
Merge "AAPT: Fix issue with synthesized resource not actually showing up" into lmp-dev
Adam Powell [Fri, 26 Sep 2014 00:16:26 +0000 (00:16 +0000)]
am
da7f9bab: Merge "Always show the name of the last used Home app in ResolverActivity" into lmp-dev
* commit '
da7f9bab0206c237f3d70b3b23eeaab41f478eb1':
Always show the name of the last used Home app in ResolverActivity
Adam Powell [Fri, 26 Sep 2014 00:07:30 +0000 (00:07 +0000)]
Merge "Always show the name of the last used Home app in ResolverActivity" into lmp-dev
Dianne Hackborn [Fri, 26 Sep 2014 00:00:07 +0000 (00:00 +0000)]
am
fcc42e8f: Merge "Fix issue #
17661444: Persistent service not automatically restarted" into lmp-dev
* commit '
fcc42e8f3375a35dfc92af41fe9303359af84626':
Fix issue #
17661444: Persistent service not automatically restarted
Adam Powell [Thu, 25 Sep 2014 23:46:36 +0000 (16:46 -0700)]
Always show the name of the last used Home app in ResolverActivity
Bug
17629220
Change-Id: Ia1d0a188f8c0911e5b74b18ba44508a6e2139d0c
Dianne Hackborn [Thu, 25 Sep 2014 23:53:13 +0000 (23:53 +0000)]
Merge "Fix issue #
17661444: Persistent service not automatically restarted" into lmp-dev
Dianne Hackborn [Thu, 25 Sep 2014 23:39:40 +0000 (16:39 -0700)]
Fix issue #
17661444: Persistent service not automatically restarted
The code to recover when running processes are removed from the
LRU list turned up an existing problem where we would remove a
persistent process from the LRU list, making it more obvious.
Now it is fixed.
Change-Id: I94ccb924b3e5649b2819d3392b6f6c9c725dc903
Svetoslav [Thu, 25 Sep 2014 23:37:32 +0000 (23:37 +0000)]
am
48ccf043: Merge "Accessibility in bad state after using SDK tool uiautomatorviewer." into lmp-dev
* commit '
48ccf04368f65f7988bb589f9c29f94c77bbd549':
Accessibility in bad state after using SDK tool uiautomatorviewer.
Svetoslav [Thu, 25 Sep 2014 23:27:00 +0000 (23:27 +0000)]
Merge "Accessibility in bad state after using SDK tool uiautomatorviewer." into lmp-dev
Svetoslav [Thu, 25 Sep 2014 22:56:28 +0000 (15:56 -0700)]
Accessibility in bad state after using SDK tool uiautomatorviewer.
The UiAutormator tool is a part of the SDK. If it is run while
accessibility is enabled it stops all accessibility services
as it is an accessibility service itself to avoid interference
and when done restores back the accessibility state. The issue
was that the accessibility state is not restored leaving the
device in a bad state.
bug:
17662770
Change-Id: I3c4f46fa05c76b874eeffdeb867ef433c3fedf2e
Tsuwei Chen [Thu, 25 Sep 2014 22:47:29 +0000 (22:47 +0000)]
am
e6e4b2bf: Merge "Fix an incorrect behavior that failed AT&T privacy test." into lmp-dev
* commit '
e6e4b2bfa3782f63ed0b4b802e5a9d59a6a48f49':
Fix an incorrect behavior that failed AT&T privacy test.
Adrian Roos [Thu, 25 Sep 2014 22:47:25 +0000 (22:47 +0000)]
am
05ade73e: Merge "Ensure that setting an empty password clears it" into lmp-dev
* commit '
05ade73e580b826ead839d3c5db508a8ea25ad93':
Ensure that setting an empty password clears it
Eino-Ville Talvala [Thu, 25 Sep 2014 22:47:21 +0000 (22:47 +0000)]
am
7b6a4acd: Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev
* commit '
7b6a4acdeb6bddbb6b058c227e037c714dd8f2b8':
Camera2 Legacy: Clear JPEG ids when reconfiguring.
Tsuwei Chen [Thu, 25 Sep 2014 22:43:03 +0000 (22:43 +0000)]
Merge "Fix an incorrect behavior that failed AT&T privacy test." into lmp-dev
Adrian Roos [Thu, 25 Sep 2014 22:42:41 +0000 (22:42 +0000)]
Merge "Ensure that setting an empty password clears it" into lmp-dev
Eino-Ville Talvala [Thu, 25 Sep 2014 22:36:58 +0000 (22:36 +0000)]
Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev
Michael Wright [Thu, 25 Sep 2014 22:27:05 +0000 (22:27 +0000)]
am
233bbabf: Merge "Specify a device identifier for keyboard layout notification." into lmp-dev
* commit '
233bbabfe10bbf7190cdf3a6bb44f081a1fa91c7':
Specify a device identifier for keyboard layout notification.
Michael Wright [Thu, 25 Sep 2014 22:18:19 +0000 (22:18 +0000)]
Merge "Specify a device identifier for keyboard layout notification." into lmp-dev
mike dooley [Thu, 25 Sep 2014 21:49:21 +0000 (14:49 -0700)]
Adding support for Cdma conference calling.
Adding methods to merge and swap Cdma conference
calls from hangouts.
Bug:
17658943
Change-Id: I0ce472415e3455503223fc0dab5e1a8ee415cde9
Tsuwei Chen [Thu, 25 Sep 2014 21:33:08 +0000 (14:33 -0700)]
Fix an incorrect behavior that failed AT&T privacy test.
Bug:
17278951
Change-Id: I8b8bf4ed19af8738e7cef3553c8a06f7e27c7264
Eino-Ville Talvala [Thu, 25 Sep 2014 21:34:40 +0000 (21:34 +0000)]
am
93f0b612: Camera2 legacy: Improve robustness to camera service crashes
* commit '
93f0b612350e217b8434a0199ba4723c2cfe0e72':
Camera2 legacy: Improve robustness to camera service crashes
Eino-Ville Talvala [Thu, 25 Sep 2014 19:52:20 +0000 (12:52 -0700)]
Camera2 Legacy: Clear JPEG ids when reconfiguring.
Otherwise, stale IDs for old streams will be left around, causing
JPEGs to be sent to the wrong consumers.
Bug:
17659125
Change-Id: I98e1a1d389147631bc80eaeb10d57f74a6256f32
Eino-Ville Talvala [Tue, 23 Sep 2014 23:37:31 +0000 (16:37 -0700)]
Camera2 legacy: Improve robustness to camera service crashes
When the camera service dies, the getParameters call is often the first
to fail, and on legacy mode, this frequently happens in a background thread.
Catch the runtime exceptions and convert to device errors, instead of killing
the process.
Bug:
17587496
Change-Id: I6757961e7c0387defd368a13cb7c343950602400
Alan Viverette [Thu, 25 Sep 2014 20:20:02 +0000 (20:20 +0000)]
am
21662c96: Merge "Cut ripple background alpha in half" into lmp-dev
* commit '
21662c96fa9d107a60f4ce98f7179264c972b142':
Cut ripple background alpha in half
Alan Viverette [Thu, 25 Sep 2014 20:14:33 +0000 (20:14 +0000)]
Merge "Cut ripple background alpha in half" into lmp-dev
Alan Viverette [Thu, 25 Sep 2014 20:14:29 +0000 (20:14 +0000)]
am
00660f66: Merge "Fix "Always apply window insets to action modes"" into lmp-dev
* commit '
00660f66ef0344698551c88c0f26663f70e31b5e':
Fix "Always apply window insets to action modes"
Svetoslav [Thu, 25 Sep 2014 20:14:25 +0000 (20:14 +0000)]
am
85daf4f0: Merge "Accessibility events may be fired even if no services observe them." into lmp-dev
* commit '
85daf4f04ade8a5d85eab70e63cd184dcb760501':
Accessibility events may be fired even if no services observe them.
Alan Viverette [Thu, 25 Sep 2014 20:11:27 +0000 (20:11 +0000)]
Merge "Fix "Always apply window insets to action modes"" into lmp-dev
Svetoslav [Thu, 25 Sep 2014 20:06:19 +0000 (20:06 +0000)]
Merge "Accessibility events may be fired even if no services observe them." into lmp-dev
Alan Viverette [Thu, 25 Sep 2014 20:06:03 +0000 (13:06 -0700)]
Cut ripple background alpha in half
Ripple alpha is supposed to be split evenly between the foreground
ripple layer and the background layer, but the background alpha wasn't
getting adjusted properly.
BUG:
17658817
Change-Id: I7af2f2ed38400a40d4a17da020363c7ae5c71a7b
Chris Wren [Thu, 25 Sep 2014 19:59:06 +0000 (19:59 +0000)]
am
2eb3b974: Merge "Allow longer translations in the notification actions." into lmp-dev
* commit '
2eb3b974ab5c1f7f1ca79410ea54026f58e35c07':
Allow longer translations in the notification actions.
Chris Wren [Thu, 25 Sep 2014 19:50:32 +0000 (19:50 +0000)]
Merge "Allow longer translations in the notification actions." into lmp-dev
Alan Viverette [Thu, 25 Sep 2014 19:43:47 +0000 (12:43 -0700)]
Correctly advertise accessibility scrolling actions
Previously, we didn't take into account partially-visible views. This
extracts existing logic for determining whether the list can scroll
up or down and applies that when adding scrolling actions.
BUG:
17648502
Change-Id: I7ed9382e1645970ab098c210ad10f8a077da834b
Ruben Brunk [Thu, 25 Sep 2014 19:29:40 +0000 (19:29 +0000)]
am
e76ce25f: Merge "camera2: Fix null check in PictureCallback." into lmp-dev
* commit '
e76ce25ff342d393ffb79ef7e01b09cae5320a73':
camera2: Fix null check in PictureCallback.
Amith Yamasani [Thu, 25 Sep 2014 19:29:36 +0000 (19:29 +0000)]
am
95548b39: Merge "Fix GPS icon not showing for secondary users" into lmp-dev
* commit '
95548b395d681b0ecfef341058f282f624ae3862':
Fix GPS icon not showing for secondary users
Ruben Brunk [Thu, 25 Sep 2014 19:22:59 +0000 (19:22 +0000)]
Merge "camera2: Fix null check in PictureCallback." into lmp-dev
John Spurlock [Thu, 25 Sep 2014 19:19:45 +0000 (19:19 +0000)]
am
0dccf597: Merge "Supertoast when user changes zen mode." into lmp-dev
* commit '
0dccf597f10fd0dc755f42514c470d447c820b20':
Supertoast when user changes zen mode.
Amith Yamasani [Thu, 25 Sep 2014 19:18:23 +0000 (19:18 +0000)]
Merge "Fix GPS icon not showing for secondary users" into lmp-dev
John Spurlock [Thu, 25 Sep 2014 19:08:39 +0000 (19:08 +0000)]
Merge "Supertoast when user changes zen mode." into lmp-dev
John Spurlock [Tue, 23 Sep 2014 18:59:51 +0000 (14:59 -0400)]
Supertoast when user changes zen mode.
If the user selects a new zen mode, display a quick toast
with the mode icon + text to aid in association.
Also fix a recent regression in the zen subhead alignment.
Bug:
16215680
Bug:
17641211
Change-Id: I4ead88d81be4d9c26459aed82c47b8c2fb32eafa
Ruben Brunk [Thu, 25 Sep 2014 18:48:27 +0000 (11:48 -0700)]
camera2: Fix null check in PictureCallback.
Bug:
17636586
Change-Id: Ieddc106e14c97dc78405821e83e346d626127e2c
Paul Lawrence [Thu, 25 Sep 2014 18:42:10 +0000 (18:42 +0000)]
am
56a38862: Merge "Fix pause when setting pin/pattern/password" into lmp-dev
* commit '
56a38862d68c3160ae9b049ca89422cc5834e8e3':
Fix pause when setting pin/pattern/password
RoboErik [Thu, 25 Sep 2014 18:42:06 +0000 (18:42 +0000)]
am
504752fb: Merge "Ensure MediaBrowser state is set to connecting after a reconnect" into lmp-dev
* commit '
504752fb3833a90f4a226a2027939cb972cb8a9b':
Ensure MediaBrowser state is set to connecting after a reconnect
RoboErik [Thu, 25 Sep 2014 18:42:00 +0000 (18:42 +0000)]
am
23df1c46: Merge "Allow null queues to be set in MediaSession" into lmp-dev
* commit '
23df1c46b768bb2a1363b6f671b0d0c4879538b7':
Allow null queues to be set in MediaSession
Paul Lawrence [Thu, 25 Sep 2014 18:33:53 +0000 (18:33 +0000)]
Merge "Fix pause when setting pin/pattern/password" into lmp-dev
RoboErik [Thu, 25 Sep 2014 18:28:49 +0000 (18:28 +0000)]
Merge "Ensure MediaBrowser state is set to connecting after a reconnect" into lmp-dev
RoboErik [Thu, 25 Sep 2014 18:28:20 +0000 (18:28 +0000)]
Merge "Allow null queues to be set in MediaSession" into lmp-dev
Ye Wen [Thu, 25 Sep 2014 18:20:08 +0000 (11:20 -0700)]
resolved conflicts for merge of
13ff7c17 to lmp-sprout-dev
Change-Id: Ic27b03fa49bb921c36cd2825bf5486903dfd0317
Junda Liu [Thu, 25 Sep 2014 17:46:39 +0000 (17:46 +0000)]
am
96c54879: Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev
* commit '
96c548791145ab33ceb0935f38323d3182d44419':
Hide CarrierPrivilege APIs in TelMgr.
Chris Wren [Thu, 25 Sep 2014 17:38:39 +0000 (13:38 -0400)]
Allow longer translations in the notification actions.
Bug:
17345743
Change-Id: Icd0588516cb568ea76e2766f54ba1a61a8f3d997
Ye Wen [Thu, 25 Sep 2014 17:36:31 +0000 (17:36 +0000)]
Merge "Hide carrier app intents in Telephony (1/2)" into lmp-dev
Junda Liu [Thu, 25 Sep 2014 17:36:09 +0000 (17:36 +0000)]
Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev
Paul Lawrence [Thu, 25 Sep 2014 16:26:34 +0000 (09:26 -0700)]
Fix pause when setting pin/pattern/password
Move setting encryption pin/pattern/password into a separate thread
Bug:
17554587
Change-Id: Ifdf2ed5aa9ca08d68bb2ed08c8985203c24dcb9f
Chris Wren [Thu, 25 Sep 2014 17:29:25 +0000 (17:29 +0000)]
am
15653a91: Merge "getCurrentInterruptionFilter should return the filter value, not the hints." into lmp-dev
* commit '
15653a918f6c1747d08f03e8241368bbbcc38fe6':
getCurrentInterruptionFilter should return the filter value, not the hints.
Junda Liu [Wed, 24 Sep 2014 19:53:36 +0000 (12:53 -0700)]
Hide CarrierPrivilege APIs in TelMgr.
Per API council decision, we will polish and public in MR1.
Bug: b/
17639966
Change-Id: Id009cd62b4d44dd17fe7a30e0f8037c6fb373c32
Chris Wren [Thu, 25 Sep 2014 17:21:31 +0000 (17:21 +0000)]
Merge "getCurrentInterruptionFilter should return the filter value, not the hints." into lmp-dev
Kenny Guy [Thu, 25 Sep 2014 16:52:12 +0000 (16:52 +0000)]
am
19acab1f: Merge "Ignore badly formed ComponentNames when loading device_owner.xml" into lmp-dev
* commit '
19acab1f8b24cb4265ed591fbec02ea13402d96a':
Ignore badly formed ComponentNames when loading device_owner.xml
Kenny Guy [Thu, 25 Sep 2014 16:42:10 +0000 (16:42 +0000)]
Merge "Ignore badly formed ComponentNames when loading device_owner.xml" into lmp-dev
Ye Wen [Tue, 23 Sep 2014 17:24:57 +0000 (10:24 -0700)]
Hide carrier app intents in Telephony (1/2)
b/
17608135
Change-Id: Ib42d40cf8aac98f62c7237fa450463ff7c1a0f47
Adrian Roos [Thu, 25 Sep 2014 16:07:13 +0000 (18:07 +0200)]
Ensure that setting an empty password clears it
Bug:
17496766
Change-Id: I7c29b632519247bc5675a05ef6cc90902fec8527
John Reck [Thu, 25 Sep 2014 16:24:33 +0000 (16:24 +0000)]
am
e5831979: Missing null check
* commit '
e58319791de1e47db1d6d3c6565f03a5f775a9cb':
Missing null check
Christoph Studer [Thu, 25 Sep 2014 16:24:22 +0000 (16:24 +0000)]
am
78205c2b: Merge "NoMan: Add 3s timeout in matchesCallFilter()" into lmp-dev
* commit '
78205c2b2e4f28cdafff93be2c599097b1b9f00d':
NoMan: Add 3s timeout in matchesCallFilter()
Ronghua Wu [Thu, 25 Sep 2014 16:23:16 +0000 (16:23 +0000)]
am
ca7f391e: Merge "MediaCodecList: fix findEncoderForFormat." into lmp-dev
* commit '
ca7f391e2b04a9efc4beb5f5b769653a983ff424':
MediaCodecList: fix findEncoderForFormat.
Sukanya Rajkhowa [Thu, 25 Sep 2014 16:23:11 +0000 (16:23 +0000)]
am
14cb7b8a: Add config to control phone switch
* commit '
14cb7b8aeb99d3337b191a49ab11eb8642cde5fa':
Add config to control phone switch
Lajos Molnar [Thu, 25 Sep 2014 16:23:07 +0000 (16:23 +0000)]
am
4e43a27a: Merge "MediaCodec: revalidate cached queued input buffers if queue fails (2)" into lmp-dev
* commit '
4e43a27a9884e24ba47599597091176b772ddb24':
MediaCodec: revalidate cached queued input buffers if queue fails (2)
Andre Eisenbach [Thu, 25 Sep 2014 16:22:45 +0000 (16:22 +0000)]
am
fe99f9f4: Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev
* commit '
fe99f9f42ad1a45922c906bacd5ea56d58667245':
Remove remanents of onConnectionCongested in framwork
Vinit Deshpande [Thu, 25 Sep 2014 16:22:40 +0000 (16:22 +0000)]
am
f9b8c88c: Merge "Introduce config setting for scanning mac OUI" into lmp-dev
* commit '
f9b8c88c6529daebe9676d7c440fcd3e478ec034':
Introduce config setting for scanning mac OUI
Lajos Molnar [Thu, 25 Sep 2014 16:22:31 +0000 (16:22 +0000)]
am
aa1f0856: Merge "MediaCodec: revalidate cached queued input buffers if queue fails" into lmp-dev
* commit '
aa1f0856a144f2f2ba14c6358d633887e7e8b936':
MediaCodec: revalidate cached queued input buffers if queue fails
Jeff Sharkey [Thu, 25 Sep 2014 16:22:22 +0000 (16:22 +0000)]
am
45ef18b6: Merge "Include reason when wiping data." into lmp-dev
* commit '
45ef18b63e78fd853865f42d9369a5c9b4dd4ba0':
Include reason when wiping data.
ztenghui [Thu, 25 Sep 2014 16:22:10 +0000 (16:22 +0000)]
am
a00457a6: Merge "Add one more test and update old tests" into lmp-dev
* commit '
a00457a60160f27e15c9d75824057f7d914b7b7d':
Add one more test and update old tests
ztenghui [Thu, 25 Sep 2014 16:22:06 +0000 (16:22 +0000)]
am
c793e67c: Merge "Fix AVD for CTS failure." into lmp-dev
* commit '
c793e67ca93a1550fa68c887ef00d207ac1e1d84':
Fix AVD for CTS failure.
Kenny Guy [Thu, 25 Sep 2014 14:40:51 +0000 (15:40 +0100)]
Ignore badly formed ComponentNames when loading device_owner.xml
In the past we wrote out badly formed ComponentNames with no
class part. Loading these results in a null pointer exception
blocking boot.
Bug:
17652534
Change-Id: Iec592343425a23c7ada5f73cf30b8646d31eae81
John Reck [Thu, 25 Sep 2014 15:33:05 +0000 (08:33 -0700)]
Missing null check
Bug:
17642023
Change-Id: I874b76e1e184a59dec714191d759c1045b7b9814
Christoph Studer [Thu, 25 Sep 2014 10:53:46 +0000 (10:53 +0000)]
Merge "NoMan: Add 3s timeout in matchesCallFilter()" into lmp-dev
Ruben Brunk [Thu, 25 Sep 2014 09:51:33 +0000 (09:51 +0000)]
am
8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev
* commit '
8acfdc7bf6b8ee5250351723ab2eef28f2b71e51':
camera2: Hide JPEGs in RGBA gralloc buffers.
Adam Lesinski [Thu, 25 Sep 2014 02:02:52 +0000 (19:02 -0700)]
AAPT: Fix issue with synthesized resource not actually showing up
AAPT keeps around a few pieces of state that are disjoint, so
simply adding to a collection won't add the resource to the final
flattened output. Instead, we create the resource from the top
and then copy over the values into the newly created resource.
Bug:
17647890
Change-Id: I214263e84c18f9370c6e6a5aa53aa2d833fc842d
Svetoslav [Thu, 25 Sep 2014 00:55:49 +0000 (17:55 -0700)]
Accessibility events may be fired even if no services observe them.
If all accessibility services are disabled we turn off event firing
to avoid a lot of work for nothing. The logic to do that had a flaw
and was not turning event firing off in every case it should. We were
tuning event firing if it is on and no service is enabled but it
is possible that a package on the system image is disabled so the
service is enabled just not bound. Arguably we can remove the
serivice from the enabled list but it is technically on the device.
Note that we correctly handle the case of a package being removed.
bug:
17332506
Change-Id: I6d6d9cb9cc271116a3d22ed9fd8d7f533dec9a0b
Alan Viverette [Thu, 25 Sep 2014 00:55:52 +0000 (17:55 -0700)]
Fix "Always apply window insets to action modes"
BUG:
17628875
Change-Id: I03bf6cfd68d0ca2904b43e00f68d07d497ff9879
Amith Yamasani [Thu, 25 Sep 2014 00:46:19 +0000 (17:46 -0700)]
Fix GPS icon not showing for secondary users
Watch for high power usage broadcasts from all users in the statusbar.
Bug:
17647654
Change-Id: I2c6c5a218d38438415a450cfa2f9328763af3f50
Ronghua Wu [Thu, 25 Sep 2014 00:23:02 +0000 (00:23 +0000)]
Merge "MediaCodecList: fix findEncoderForFormat." into lmp-dev
Sukanya Rajkhowa [Mon, 15 Sep 2014 22:59:38 +0000 (15:59 -0700)]
Add config to control phone switch
When UNSOL_RADIO_TECH_CHANGED is received, PhoneProxy
calls updatePhoneObject to decide whether to do a phone
switch. This config determines whether to also do a
phone switch when VOICE_REGISTRATION_STATE changes. Default
value is true
Bug:
17394282
Change-Id: Iae6c35992b932923d74c405d443b1e7e98f750c8
Lajos Molnar [Thu, 25 Sep 2014 00:19:43 +0000 (00:19 +0000)]
Merge "MediaCodec: revalidate cached queued input buffers if queue fails (2)" into lmp-dev
Ronghua Wu [Wed, 24 Sep 2014 17:00:48 +0000 (10:00 -0700)]
MediaCodecList: fix findEncoderForFormat.
Bug:
17460057
Bug:
17637188
Change-Id: I618ff1a4dbbecf64786207ccb5208b0a67d80ddd
Andre Eisenbach [Wed, 24 Sep 2014 23:57:01 +0000 (23:57 +0000)]
Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev
Vinit Deshpande [Wed, 24 Sep 2014 23:50:04 +0000 (23:50 +0000)]
Merge "Introduce config setting for scanning mac OUI" into lmp-dev
Lajos Molnar [Wed, 24 Sep 2014 21:07:35 +0000 (14:07 -0700)]
MediaCodec: revalidate cached queued input buffers if queue fails (2)
Handle the other ways queueBuffer can fail. Revalidate the buffers
properly, e.g. without clearing them.
Bug:
17630446
Change-Id: I22e0e89c2835eb6a461046a8cf3be03635088302
Lajos Molnar [Wed, 24 Sep 2014 23:40:55 +0000 (23:40 +0000)]
Merge "MediaCodec: revalidate cached queued input buffers if queue fails" into lmp-dev
Jeff Sharkey [Wed, 24 Sep 2014 23:27:24 +0000 (23:27 +0000)]
Merge "Include reason when wiping data." into lmp-dev
ztenghui [Wed, 24 Sep 2014 23:07:32 +0000 (23:07 +0000)]
Merge "Add one more test and update old tests" into lmp-dev
ztenghui [Wed, 24 Sep 2014 23:07:17 +0000 (23:07 +0000)]
Merge "Fix AVD for CTS failure." into lmp-dev
Ruben Brunk [Wed, 24 Sep 2014 22:51:54 +0000 (22:51 +0000)]
Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev
Chris Wren [Wed, 24 Sep 2014 22:17:36 +0000 (18:17 -0400)]
getCurrentInterruptionFilter should return the filter value, not the hints.
Bug:
17641218
Change-Id: I4a6ff073c04a3d3624916293824faba40f6226aa
Prerepa Viswanadham [Fri, 19 Sep 2014 17:57:54 +0000 (10:57 -0700)]
Remove remanents of onConnectionCongested in framwork
Bug:
17289507
Change-Id: Ia28c39822141edd0e4dc3f623b8c2f280fc5f943
Joe Fernandez [Wed, 24 Sep 2014 22:04:15 +0000 (22:04 +0000)]
am
a73fa92c: am
2c1ef532: am
1968b919: am
b8a60dad: Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs
* commit '
a73fa92c2e0bada989b9196425e179fcc5b8b0de':
docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
Joe Fernandez [Wed, 24 Sep 2014 21:54:08 +0000 (21:54 +0000)]
am
2c1ef532: am
1968b919: am
b8a60dad: Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs
* commit '
2c1ef5328cee7059b1ab0d8de849c2fa474f88dd':
docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher