Katie McCormick
755d54e258
am 4c9f4571: am fb19fc61: am 905a5b14: am 87d9d1a0: Doc Update: revert PendingIntent fix.
...
* commit '4c9f457141747b19f2f78f682889313bcbd010e6':
Doc Update: revert PendingIntent fix.
2014-04-01 01:32:55 +00:00
Katie McCormick
4c9f457141
am fb19fc61: am 905a5b14: am 87d9d1a0: Doc Update: revert PendingIntent fix.
...
* commit 'fb19fc61f28bcff1b129d1a60913f5b8722f10cf':
Doc Update: revert PendingIntent fix.
2014-04-01 01:25:41 +00:00
Zhijun He
70e7b073e0
am 1a9b646c: Camera2: Fix missing capture result callback issue
...
* commit '1a9b646c6b83aa091164dc94f9d1348bfca38227':
Camera2: Fix missing capture result callback issue
2014-04-01 01:01:58 +00:00
Zhijun He
1a9b646c6b
Camera2: Fix missing capture result callback issue
...
When configuring output right after submitting some capture request, the
waitUntilIdle clears the capture mCaptureListenerMap and
mRepeatingRequestIdDeletedList. This caused the listener is cleared before
the capture result is delivered to application side. Since the listener is
already removed properly, it is really not needed to clear them right after
idling the device.
It also doesn't make sense to add the repeating request id that has no
listener hooked up to the mRepeatingRequestIdDeletedList, this caused
out of sync between id deleted list and the mCaptureListenerMap for
repeating request.
Bug: 13730119
Change-Id: I94ab7a5515f841ffd97b103c2c1b71d92afd955a
2014-03-31 17:34:29 -07:00
Katie McCormick
fb19fc61f2
am 905a5b14: am 87d9d1a0: Doc Update: revert PendingIntent fix.
...
* commit '905a5b1477b3a1899ef389dbe081f9c70a4fe13d':
Doc Update: revert PendingIntent fix.
2014-04-01 00:21:34 +00:00
Katie McCormick
905a5b1477
am 87d9d1a0: Doc Update: revert PendingIntent fix.
...
* commit '87d9d1a0405e6cdbcd7c87cfebee04b622100753':
Doc Update: revert PendingIntent fix.
2014-04-01 00:15:52 +00:00
Katie McCormick
87d9d1a040
Doc Update: revert PendingIntent fix.
...
Original fix was in error. Reverting. See:
b/10641568
Change-Id: I471157388b2d55aa99bd16813c07607b8a0a7046
2014-03-31 16:18:15 -07:00
Zhihai Xu
0db3ae63e4
am 6b96c1b2: am 7d394df2: am ae1b763c: Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev
...
* commit '6b96c1b2ea5d28fc2501226bda14327f1963ba0c':
LE: Add API to configure MTU for a given connection (3/4)
2014-03-31 21:40:31 +00:00
Zhihai Xu
6b96c1b2ea
am 7d394df2: am ae1b763c: Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev
...
* commit '7d394df2ab8f951215a775df8d2bd9e6518e746a':
LE: Add API to configure MTU for a given connection (3/4)
2014-03-31 21:35:38 +00:00
Zhihai Xu
7d394df2ab
am ae1b763c: Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev
...
* commit 'ae1b763cded7e2cb3eec3cbec0680c25e55c109c':
LE: Add API to configure MTU for a given connection (3/4)
2014-03-31 21:28:47 +00:00
Zhihai Xu
ae1b763cde
Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev
2014-03-31 21:21:54 +00:00
ztenghui
2b2ad8f728
am 2f9ec356: Merge "Make the reveal animation API public"
...
* commit '2f9ec3560d21e3db4f91a64e68d6b678714cd749':
Make the reveal animation API public
2014-03-31 20:10:46 +00:00
Brian Carlstrom
1ad28fd8fc
am ed99dc89: am 7156b7c6: am b11952d6: am e3434fc4: Merge "Improve detail message for X509TrustManagerExtensions argument validation"
...
* commit 'ed99dc89c32830cffe7a3912b2026942910c4c8f':
Improve detail message for X509TrustManagerExtensions argument validation
2014-03-31 20:10:43 +00:00
ztenghui
2f9ec3560d
Merge "Make the reveal animation API public"
2014-03-31 20:08:12 +00:00
Brian Carlstrom
ed99dc89c3
am 7156b7c6: am b11952d6: am e3434fc4: Merge "Improve detail message for X509TrustManagerExtensions argument validation"
...
* commit '7156b7c65d6f158c4898a93f8e2cea0bf94791d1':
Improve detail message for X509TrustManagerExtensions argument validation
2014-03-31 20:06:06 +00:00
Brian Carlstrom
7156b7c65d
am b11952d6: am e3434fc4: Merge "Improve detail message for X509TrustManagerExtensions argument validation"
...
* commit 'b11952d6f6851dbd1da447da967f6e07984942fe':
Improve detail message for X509TrustManagerExtensions argument validation
2014-03-31 19:59:31 +00:00
Adrian Roos
e6978cda71
am 53ab5174: Merge "Define trust agent framework components"
...
* commit '53ab5174d5009786dc58da3011181b77e325c130':
Define trust agent framework components
2014-03-31 19:26:11 +00:00
Adrian Roos
53ab5174d5
Merge "Define trust agent framework components"
2014-03-31 19:21:05 +00:00
Adrian Roos
82142c21dd
Define trust agent framework components
...
Adds the TrustManager system service that allows
registering for changes to the trust status and
reporting events that are important to trust agents.
Bug: 13723878
Change-Id: I7d0d2ea86fd755702d31aa5d49cac038a6cd4301
2014-03-31 21:18:28 +02:00
Alan Viverette
58c8a028d7
am 883e04b3: Merge "Remove unthemed drawable cache, since canApplyTheme != isThemed"
...
* commit '883e04b3c9ec3e3e976661c7accfc530c2d0e21e':
Remove unthemed drawable cache, since canApplyTheme != isThemed
2014-03-31 19:14:28 +00:00
Adrian Roos
82f19417ed
am 716f20d8: Merge "Define initial trust agent API"
...
* commit '716f20d833537461fef7d5d7ed62157451391f1c':
Define initial trust agent API
2014-03-31 19:14:25 +00:00
John Reck
0949792f77
am b4a132a0: Merge "Turn on RenderThread"
...
* commit 'b4a132a05f5dc1cc10352d63cb80921b1004bd7a':
Turn on RenderThread
2014-03-31 19:14:23 +00:00
Alan Viverette
883e04b3c9
Merge "Remove unthemed drawable cache, since canApplyTheme != isThemed"
2014-03-31 19:12:45 +00:00
Adrian Roos
716f20d833
Merge "Define initial trust agent API"
2014-03-31 19:11:36 +00:00
John Reck
b4a132a05f
Merge "Turn on RenderThread"
2014-03-31 19:09:13 +00:00
Adrian Roos
ff2144ccb4
Define initial trust agent API
...
Adds the minimal API needed to define a useful trust agent.
Bug: 13723878
Change-Id: Ib24440bab7b16d0b656bde8b059e7d42cab2c7dc
2014-03-31 20:40:49 +02:00
Brian Carlstrom
ff9ca781d0
Improve detail message for X509TrustManagerExtensions argument validation
...
Bug: 13728564
Change-Id: I03d08babcdc0d11baff5e76a339b4285e92edee8
2014-03-31 11:22:34 -07:00
John Reck
26311cb5d5
am 8e150fef: Merge "Add invokeFunctor"
...
* commit '8e150fef2bb0d3e672b7ecba2caa35ee37a8c27d':
Add invokeFunctor
2014-03-31 18:09:05 +00:00
John Reck
8e150fef2b
Merge "Add invokeFunctor"
2014-03-31 18:04:06 +00:00
ztenghui
be23fa2f73
Make the reveal animation API public
...
Change-Id: Iafb17bc768b33b320ffa731a9474be05382126e6
2014-03-31 10:41:31 -07:00
John Reck
0f61cde234
Turn on RenderThread
...
Change-Id: I50fd607420baa438eb16b99b1de8604037c11a88
2014-03-31 10:19:14 -07:00
Jorim Jaggi
bd490ad59f
Merge "Make Keyguard a library and make StatusBar the new Keyguard." into master-lockscreen-dev
2014-03-31 12:05:54 +00:00
John Reck
0d1f634f4b
Add invokeFunctor
...
Change-Id: I09e675d3e02e3e528642175ada00b2b17fab7652
2014-03-28 20:57:32 -07:00
Wei Wang
ab4fc115e9
am 1b09c97d: am 4447405d: Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev
...
* commit '1b09c97d8a7156a9f35ebab3c98db7b103852a58':
Callback on correct method when status is unsuccessful.
2014-03-29 02:03:03 +00:00
Wei Wang
1b09c97d8a
am 4447405d: Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev
...
* commit '4447405d76b5a9152aacadbfdefd1f8fd60a03ad':
Callback on correct method when status is unsuccessful.
2014-03-29 01:57:31 +00:00
Wei Wang
4447405d76
Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev
2014-03-29 01:53:33 +00:00
Wei Wang
c07a5dd709
Callback on correct method when status is unsuccessful.
...
Change-Id: I63c07bbae559765af1aecb492379ab18268336d8
2014-03-29 01:42:41 +00:00
John Reck
c75db8266b
Merge "Remove kStatusInvoke & kStatusDraw"
2014-03-29 01:41:50 +00:00
John Reck
903d6407b0
Merge "Remove DisplayList.java"
2014-03-29 01:41:44 +00:00
Chris Craik
42dda81e15
Merge "Update several stale RenderNode variable names"
2014-03-29 01:39:57 +00:00
Chris Craik
64a12e177d
Update several stale RenderNode variable names
...
Change-Id: I61c8c66f5a79e3a89ae0d3cffbfd351c05bd6a2b
2014-03-28 18:12:12 -07:00
Michael Wright
84ad5d8891
am 5d7db503: am e9eb58c9: Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev
...
* commit '5d7db503bd779fb712391174a2b12327a0f9ec51':
Add InputDevice#supportsSource(int).
2014-03-29 01:09:30 +00:00
Michael Wright
5d7db503bd
am e9eb58c9: Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev
...
* commit 'e9eb58c9a0f48f1ea3afa60f01cfab1f539e5d8e':
Add InputDevice#supportsSource(int).
2014-03-29 00:59:49 +00:00
Michael Wright
4669cfff1e
am d020fd33: Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev
...
* commit 'd020fd33d147c88a9cda4976d2fa559e55b4ab03':
Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
Adds API for determining confirm and cancel keys.
2014-03-29 00:59:46 +00:00
Michael Wright
e9eb58c9a0
Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev
2014-03-29 00:56:17 +00:00
Michael Wright
d020fd33d1
Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev
...
* changes:
Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
Adds API for determining confirm and cancel keys.
2014-03-29 00:56:00 +00:00
Chris Craik
69a30b5e54
Merge "Simplify RenderNode refresh/build/update process"
2014-03-29 00:07:07 +00:00
Chris Craik
df0c431e6c
Simplify RenderNode refresh/build/update process
...
A View's RenderNode is created lazily, but the instance never changes
afterward.
Change-Id: I0b05769cd49aa55061d3fb8c2ea55a04e8391e48
2014-03-28 17:03:12 -07:00
Alan Viverette
efaf51ad0c
Merge "Fix drag-to-open forwarding behavior"
2014-03-28 23:59:39 +00:00
Alan Viverette
78efdbac8a
Fix drag-to-open forwarding behavior
...
BUG: 13695088
Change-Id: I4c6e824267b145e6dcedb1aa46c8378fd5b6ff83
2014-03-28 16:53:56 -07:00