OSDN Git Service
Joe Fernandez [Thu, 13 Feb 2014 01:11:51 +0000 (01:11 +0000)]
am
8853b9c4: am
577570f2: am
e5dc0c39: am
5b97ec6f: am
3885b00a: am
f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
* commit '
8853b9c4b478df6ac8286d3dc825aa821f375afa':
MediaRouter Developer Guide
Nick Kralevich [Thu, 13 Feb 2014 01:11:47 +0000 (01:11 +0000)]
am
4f2d02fb: am
20b5fd98: am
93994e9d: am
a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
* commit '
4f2d02fb0073c4129957c0d2ac6e0c0055f4dad8':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
Dave Platt [Thu, 13 Feb 2014 01:11:41 +0000 (01:11 +0000)]
am
5137fa03: am
34cc9f90: am
53c7608a: am
a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem"
* commit '
5137fa03c3e416c6f68c36f3ec922621853609b1':
Finish fixing Zygote descriptor leakage problem
Michael Wright [Thu, 13 Feb 2014 00:46:58 +0000 (00:46 +0000)]
Merge changes I8f4249da,I012bd99f
* changes:
Extract automatic brightness strategy
New ambient light level filtering for automatic brightness
Michael Wright [Sat, 18 Jan 2014 02:29:12 +0000 (18:29 -0800)]
Extract automatic brightness strategy
Pull the strategy for determining the automatic brightness levels
into its own class. This cleans up DisplayPowerController a bit and
lets us experiment with different automatic brightness strategies
more easily.
Change-Id: I8f4249da511e38f63260dbef81f97f5507aac948
Adam Powell [Thu, 13 Feb 2014 00:43:26 +0000 (00:43 +0000)]
Merge "Point to the correct voice search icons in themes"
ztenghui [Thu, 13 Feb 2014 00:16:36 +0000 (00:16 +0000)]
Merge "Fix one flag setting bug"
Joe Fernandez [Thu, 13 Feb 2014 00:13:02 +0000 (00:13 +0000)]
am
577570f2: am
e5dc0c39: am
5b97ec6f: am
3885b00a: am
f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
* commit '
577570f29919da32e2b616dbab1e52fadabcb315':
MediaRouter Developer Guide
Nick Kralevich [Thu, 13 Feb 2014 00:12:55 +0000 (00:12 +0000)]
am
20b5fd98: am
93994e9d: am
a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
* commit '
20b5fd98fb9c80ed29d57d67eb706a36b02708da':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
Dave Platt [Thu, 13 Feb 2014 00:12:50 +0000 (00:12 +0000)]
am
34cc9f90: am
53c7608a: am
a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem"
* commit '
34cc9f9056e8736143e82891ccd01a85106a4518':
Finish fixing Zygote descriptor leakage problem
Alan Viverette [Wed, 12 Feb 2014 23:51:56 +0000 (23:51 +0000)]
Merge "Update smoothScrollToPosition to move faster for large offsets"
Alan Viverette [Wed, 12 Feb 2014 23:51:11 +0000 (23:51 +0000)]
Merge "Fix RelativeLayout measurement"
Michael Wright [Thu, 14 Nov 2013 00:18:32 +0000 (16:18 -0800)]
New ambient light level filtering for automatic brightness
This new filtering method maintains a ring buffer of all light sensor
measurements within the last ten seconds. Once all of the
measurements are either above the brightening threshold or below the
darkening threshold, adjust the screen brightness to the average of
the recorded measurements.
Change-Id: I012bd99f86149e02f03b05f19722aef9a07aba31
Alan Viverette [Wed, 12 Feb 2014 23:49:18 +0000 (15:49 -0800)]
Fix RelativeLayout measurement
BUG:
12993953
Change-Id: Idf82734eb9a06ea7610e8eb42705da9f4a4639e9
Joe Fernandez [Wed, 12 Feb 2014 23:33:43 +0000 (23:33 +0000)]
am
e5dc0c39: am
5b97ec6f: am
3885b00a: am
f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
* commit '
e5dc0c39912d6e1392e1a3324ad210e65c0105c8':
MediaRouter Developer Guide
Joe Fernandez [Wed, 12 Feb 2014 23:29:38 +0000 (23:29 +0000)]
am
5b97ec6f: am
3885b00a: am
f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
* commit '
5b97ec6fa0e166113aad2abc1107e6bd3771cc2a':
MediaRouter Developer Guide
John Spurlock [Wed, 12 Feb 2014 23:21:15 +0000 (23:21 +0000)]
Merge "Remove unused output array in QuickSettingsModel."
Joe Fernandez [Wed, 12 Feb 2014 23:19:10 +0000 (23:19 +0000)]
am
3885b00a: am
f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
* commit '
3885b00ae12df9f56e922ceda12326e922be1414':
MediaRouter Developer Guide
Nick Kralevich [Wed, 12 Feb 2014 23:19:05 +0000 (23:19 +0000)]
am
93994e9d: am
a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
* commit '
93994e9db44a30402bd596764163d81ee1b1fd30':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
Joe Fernandez [Wed, 12 Feb 2014 23:15:50 +0000 (23:15 +0000)]
am
f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
* commit '
f25bc75f591fbb04733b9cc33fabee2293973b8c':
MediaRouter Developer Guide
Joe Fernandez [Wed, 12 Feb 2014 23:13:01 +0000 (23:13 +0000)]
Merge "MediaRouter Developer Guide" into klp-docs
Nick Kralevich [Wed, 12 Feb 2014 23:12:08 +0000 (15:12 -0800)]
am
a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
* commit '
a9bb594da6aff97ba927ba67a34486d0b9c1b4a0':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
Dave Platt [Wed, 12 Feb 2014 23:10:36 +0000 (23:10 +0000)]
am
53c7608a: am
a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem"
* commit '
53c7608aefb0ed754394e571cac02e96ad6fcdb3':
Finish fixing Zygote descriptor leakage problem
Nick Kralevich [Wed, 12 Feb 2014 23:09:37 +0000 (23:09 +0000)]
Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
Dave Platt [Wed, 12 Feb 2014 23:07:07 +0000 (15:07 -0800)]
am
a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem"
* commit '
a3c3533b1d6a4016cd1856fccac6cc404997b8a6':
Finish fixing Zygote descriptor leakage problem
Dave Platt [Wed, 12 Feb 2014 23:03:48 +0000 (23:03 +0000)]
Merge "Finish fixing Zygote descriptor leakage problem"
Ricardo Cervera [Wed, 12 Feb 2014 23:02:05 +0000 (23:02 +0000)]
am
d3417283: am
481993e9: am
3cb62db2: am
640e0c89: am
36547014: am
670944aa: Merge "docs: Added missing elements in uses-feature. Bug:
12913153" into klp-docs
* commit '
d34172830cf4ce3524be500d77dc26e80f0f8190':
docs: Added missing elements in uses-feature. Bug:
12913153
Ricardo Cervera [Wed, 12 Feb 2014 23:02:00 +0000 (23:02 +0000)]
am
131c2e13: am
6fc66187: am
7d3344fd: am
58305f88: am
bff7db19: am
521a54d0: Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs
* commit '
131c2e13bac619144f2780baf229c34b33b0c674':
docs: Added notes for Build Tools Revision 19.0.2
Ricardo Cervera [Wed, 12 Feb 2014 23:01:56 +0000 (23:01 +0000)]
am
6bc06c81: am
49968bb5: am
6960ad58: am
ac74a524: am
566e4df8: am
ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs
* commit '
6bc06c815f47021e49e191740caeb8ee2c846c5a':
docs: Added Revision 3 of Google APIs System Image.
Craig Mautner [Wed, 12 Feb 2014 23:01:52 +0000 (23:01 +0000)]
am
69481d54: am
8dfda07d: am
731c30c1: Merge "Don\'t add windows from exiting app tokens twice." into klp-modular-dev
* commit '
69481d54c2c6da6ec931bb7435bddf7be1aba0af':
Don't add windows from exiting app tokens twice.
John Spurlock [Wed, 12 Feb 2014 23:01:48 +0000 (23:01 +0000)]
am
5788f2ba: am
ae5708db: am
c4aee98a: Improve error handling in listener services.
* commit '
5788f2ba9b634ecc35a861d53b086bee1384d0b0':
Improve error handling in listener services.
Narayan Kamath [Wed, 12 Feb 2014 23:01:43 +0000 (23:01 +0000)]
Paul Duffin [Wed, 12 Feb 2014 23:01:39 +0000 (23:01 +0000)]
am
4de91118: am
0741e11c: am
75d67c6a: am
d562a9b5: Merge "Improve Parcel\'s handling of non-primitive arrays"
* commit '
4de9111819638b70dd6fb58094d7a61477fc59da':
Improve Parcel's handling of non-primitive arrays
Narayan Kamath [Wed, 12 Feb 2014 23:01:35 +0000 (23:01 +0000)]
am
34281966: am
fc268eca: am
aa98fb51: am
f991771f: Merge "Use size_t* in AssetManager::createIdmap"
* commit '
342819663c15db09dc60477167c5bdf1a5a877ae':
Use size_t* in AssetManager::createIdmap
Dianne Hackborn [Wed, 12 Feb 2014 23:01:30 +0000 (23:01 +0000)]
am
32acb5e9: am
97de064a: am
133f6826: am
89492190: Merge "Runtime resource overlay, iteration 2, test cases"
* commit '
32acb5e9d130ac858f34d83526e7460c624b41c7':
Runtime resource overlay, iteration 2, test cases
Adam Powell [Wed, 12 Feb 2014 22:40:33 +0000 (14:40 -0800)]
Point to the correct voice search icons in themes
Update the preloaded drawables lists for previous asset import
Change-Id: Ia7be297f6387a14829717f64561c41fe0810a51c
John Spurlock [Wed, 12 Feb 2014 22:44:41 +0000 (17:44 -0500)]
Remove unused output array in QuickSettingsModel.
Change-Id: I0e9ce2ee1f20f5bf03f838a7ca965a71270b97d4
Nick Kralevich [Wed, 12 Feb 2014 22:41:25 +0000 (14:41 -0800)]
resolved conflicts for merge of
1cbea39f to master
Change-Id: Ib33484546c6a03cbc4cd96e97d9d785d68e10700
ztenghui [Wed, 12 Feb 2014 22:16:22 +0000 (14:16 -0800)]
Fix one flag setting bug
TODO: encapsulate the bit operations into functions.
Change-Id: I68ada214c080ac54ea43c327684c87dacef85491
Alan Viverette [Wed, 12 Feb 2014 22:28:45 +0000 (22:28 +0000)]
Merge "Fix gradient radius attribute to match documentation"
Ricardo Cervera [Wed, 12 Feb 2014 22:22:06 +0000 (22:22 +0000)]
am
481993e9: am
3cb62db2: am
640e0c89: am
36547014: am
670944aa: Merge "docs: Added missing elements in uses-feature. Bug:
12913153" into klp-docs
* commit '
481993e92c20907521e22a57d09c8b7c206af726':
docs: Added missing elements in uses-feature. Bug:
12913153
Ricardo Cervera [Wed, 12 Feb 2014 22:22:03 +0000 (22:22 +0000)]
am
6fc66187: am
7d3344fd: am
58305f88: am
bff7db19: am
521a54d0: Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs
* commit '
6fc66187b1920db0a233603721c3a2db15ae1269':
docs: Added notes for Build Tools Revision 19.0.2
Ricardo Cervera [Wed, 12 Feb 2014 22:22:00 +0000 (22:22 +0000)]
am
49968bb5: am
6960ad58: am
ac74a524: am
566e4df8: am
ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs
* commit '
49968bb559cefbd96ce84b593b11203bddfa134a':
docs: Added Revision 3 of Google APIs System Image.
Craig Mautner [Wed, 12 Feb 2014 22:21:56 +0000 (22:21 +0000)]
am
8dfda07d: am
731c30c1: Merge "Don\'t add windows from exiting app tokens twice." into klp-modular-dev
* commit '
8dfda07dd410c1776c6b0d373229fe77c76f8cfc':
Don't add windows from exiting app tokens twice.
John Spurlock [Wed, 12 Feb 2014 22:21:42 +0000 (22:21 +0000)]
am
ae5708db: am
c4aee98a: Improve error handling in listener services.
* commit '
ae5708db9d02433027f4574f912def6558805642':
Improve error handling in listener services.
Narayan Kamath [Wed, 12 Feb 2014 22:20:01 +0000 (22:20 +0000)]
Paul Duffin [Wed, 12 Feb 2014 22:19:58 +0000 (22:19 +0000)]
am
0741e11c: am
75d67c6a: am
d562a9b5: Merge "Improve Parcel\'s handling of non-primitive arrays"
* commit '
0741e11c65350aba95df150d52674c2fab41511a':
Improve Parcel's handling of non-primitive arrays
Narayan Kamath [Wed, 12 Feb 2014 22:19:56 +0000 (22:19 +0000)]
am
fc268eca: am
aa98fb51: am
f991771f: Merge "Use size_t* in AssetManager::createIdmap"
* commit '
fc268ecae13f1634054e984a7cc6e325c21f6ab5':
Use size_t* in AssetManager::createIdmap
Dianne Hackborn [Wed, 12 Feb 2014 22:19:53 +0000 (22:19 +0000)]
am
97de064a: am
133f6826: am
89492190: Merge "Runtime resource overlay, iteration 2, test cases"
* commit '
97de064a9a01d2481c47767d7fbb5b7d5482a3aa':
Runtime resource overlay, iteration 2, test cases
Joe Fernandez [Wed, 29 Jan 2014 00:17:44 +0000 (16:17 -0800)]
MediaRouter Developer Guide
staging: http://joefernandez2.mtv.corp.google.com:8210/guide/topics/media/mediarouter.html
Change-Id: I764828066de8b233e61ad8a5d4a102a4d231fa82
Ricardo Cervera [Wed, 12 Feb 2014 22:08:33 +0000 (22:08 +0000)]
am
3cb62db2: am
640e0c89: am
36547014: am
670944aa: Merge "docs: Added missing elements in uses-feature. Bug:
12913153" into klp-docs
* commit '
3cb62db29583d277ba630ee1644617fff5b615e5':
docs: Added missing elements in uses-feature. Bug:
12913153
Ricardo Cervera [Wed, 12 Feb 2014 22:08:30 +0000 (22:08 +0000)]
am
7d3344fd: am
58305f88: am
bff7db19: am
521a54d0: Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs
* commit '
7d3344fd9c71fc3c7202250a6b4752d30da3295d':
docs: Added notes for Build Tools Revision 19.0.2
Ricardo Cervera [Wed, 12 Feb 2014 22:08:27 +0000 (22:08 +0000)]
am
6960ad58: am
ac74a524: am
566e4df8: am
ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs
* commit '
6960ad58ac989ce6ab2b5d34159ceeb1093b0e39':
docs: Added Revision 3 of Google APIs System Image.
Nick Kralevich [Wed, 12 Feb 2014 22:05:30 +0000 (14:05 -0800)]
resolved conflicts for merge of
dd3d95f1 to klp-volantis-dev
Change-Id: I96c0f0da852a0b3cf8aef9158678d38aa30f456f
Ricardo Cervera [Wed, 12 Feb 2014 22:02:53 +0000 (22:02 +0000)]
am
640e0c89: am
36547014: am
670944aa: Merge "docs: Added missing elements in uses-feature. Bug:
12913153" into klp-docs
* commit '
640e0c89c3fb4ee4f180b7a2d8b9aaad237f2f9c':
docs: Added missing elements in uses-feature. Bug:
12913153
Ricardo Cervera [Wed, 12 Feb 2014 22:02:49 +0000 (22:02 +0000)]
am
58305f88: am
bff7db19: am
521a54d0: Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs
* commit '
58305f88fdf111f960869340d54f46387fcab4bf':
docs: Added notes for Build Tools Revision 19.0.2
Ricardo Cervera [Wed, 12 Feb 2014 22:02:43 +0000 (22:02 +0000)]
am
ac74a524: am
566e4df8: am
ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs
* commit '
ac74a5245bf115c4b5e23a3db515c0c3b5166662':
docs: Added Revision 3 of Google APIs System Image.
Ricardo Cervera [Wed, 12 Feb 2014 21:59:39 +0000 (21:59 +0000)]
am
36547014: am
670944aa: Merge "docs: Added missing elements in uses-feature. Bug:
12913153" into klp-docs
* commit '
36547014a3fa62e966739e12ccd31634b17058e9':
docs: Added missing elements in uses-feature. Bug:
12913153
Ricardo Cervera [Wed, 12 Feb 2014 21:59:36 +0000 (21:59 +0000)]
am
bff7db19: am
521a54d0: Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs
* commit '
bff7db19e3bbd2997490beec671b52e4e925c0a5':
docs: Added notes for Build Tools Revision 19.0.2
Ricardo Cervera [Wed, 12 Feb 2014 21:59:33 +0000 (21:59 +0000)]
am
566e4df8: am
ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs
* commit '
566e4df8c3ff66fae6c343524272d332510e26f4':
docs: Added Revision 3 of Google APIs System Image.
Ricardo Cervera [Wed, 12 Feb 2014 21:56:29 +0000 (21:56 +0000)]
am
670944aa: Merge "docs: Added missing elements in uses-feature. Bug:
12913153" into klp-docs
* commit '
670944aa7272e95ba3ec02b83b2ae4f38ad577ba':
docs: Added missing elements in uses-feature. Bug:
12913153
Ricardo Cervera [Wed, 12 Feb 2014 21:56:27 +0000 (21:56 +0000)]
am
521a54d0: Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs
* commit '
521a54d0cc5288c4467652f4d773f372eebe970b':
docs: Added notes for Build Tools Revision 19.0.2
Ricardo Cervera [Wed, 12 Feb 2014 21:56:24 +0000 (21:56 +0000)]
am
ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs
* commit '
ca8757bfc5fd506c647ccd1452c53c6ca4fafb81':
docs: Added Revision 3 of Google APIs System Image.
Chris Craik [Wed, 12 Feb 2014 21:52:42 +0000 (21:52 +0000)]
Merge "Avoid crash if layer is destroyed after GLRenderer"
Alan Viverette [Wed, 12 Feb 2014 21:50:34 +0000 (13:50 -0800)]
Fix gradient radius attribute to match documentation
BUG:
12191666
Change-Id: I62de3296500543797c595eeee15aa250e5b1511a
Chris Craik [Wed, 12 Feb 2014 21:44:47 +0000 (13:44 -0800)]
Avoid crash if layer is destroyed after GLRenderer
bug:
12988766
Change-Id: I96961aeef0b1d42ae8c609f1607a100e61a3d593
Alan Viverette [Wed, 12 Feb 2014 21:30:20 +0000 (13:30 -0800)]
Update smoothScrollToPosition to move faster for large offsets
Adds a method to AbsListView for translating from position to row
and vice-versa. Doesn't NPE this time.
BUG:
3434554
Change-Id: I6a731aedda6d951ad46322dbe87df00b8d34a22c
Christopher Tate [Wed, 12 Feb 2014 21:18:48 +0000 (21:18 +0000)]
Merge "Always call super.onCreate(). Always."
Christopher Tate [Wed, 12 Feb 2014 21:14:10 +0000 (13:14 -0800)]
Always call super.onCreate(). Always.
Bug
12991134
Change-Id: Ife16ef93408253e3318a06dc0206ab4b88c7f367
Ricardo Cervera [Wed, 12 Feb 2014 21:05:31 +0000 (21:05 +0000)]
Merge "docs: Added missing elements in uses-feature. Bug:
12913153" into klp-docs
Ricardo Cervera [Wed, 12 Feb 2014 21:04:40 +0000 (21:04 +0000)]
Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs
Ricardo Cervera [Wed, 12 Feb 2014 21:04:00 +0000 (21:04 +0000)]
Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs
Craig Mautner [Wed, 12 Feb 2014 21:01:47 +0000 (21:01 +0000)]
am
731c30c1: Merge "Don\'t add windows from exiting app tokens twice." into klp-modular-dev
* commit '
731c30c17dac51e2279f8f789a647c61bd55028b':
Don't add windows from exiting app tokens twice.
Ricardo Cervera [Fri, 31 Jan 2014 00:12:51 +0000 (16:12 -0800)]
docs: Added Revision 3 of Google APIs System Image.
Updated Google Play services version to 4.2.42 too.
Change-Id: I1887414760e91808ed0a2574c24dab3598797f32
Review: http://quixote.mtv.corp.google.com:8003/tools/revisions/platforms.html
Craig Mautner [Wed, 12 Feb 2014 20:56:36 +0000 (20:56 +0000)]
Merge "Don't add windows from exiting app tokens twice." into klp-modular-dev
Alan Viverette [Wed, 12 Feb 2014 20:46:38 +0000 (20:46 +0000)]
Merge "Add support for assigning keyed View tags via XML"
Craig Mautner [Wed, 12 Feb 2014 20:37:17 +0000 (12:37 -0800)]
Don't add windows from exiting app tokens twice.
If an apptoken's removal has been delayed then it will be in both
mExitingAppTokens and the stack's tasks. When rebuilding the windows
the windows from that apptoken will get added twice. This change
skips adding those windows from apptokens that have already been
added from mExitingAppTokens.
Change-Id: I55f94b7dbef36aeacb390b91fbe82426eaac5458
Alan Viverette [Wed, 12 Feb 2014 20:26:54 +0000 (20:26 +0000)]
Merge "Set properties for pooled CollectionItemInfo, CollectionInfo"
John Spurlock [Wed, 12 Feb 2014 19:36:25 +0000 (19:36 +0000)]
am
c4aee98a: Improve error handling in listener services.
* commit '
c4aee98a62f400dd9f6f964d26d739d409212775':
Improve error handling in listener services.
John Spurlock [Wed, 12 Feb 2014 17:12:26 +0000 (12:12 -0500)]
Improve error handling in listener services.
Check explicitly for null listeners in NMS, throwing
IllegalArgumentException (on the small list of exceptions
that survive RPC boundaries) with a message.
Normally this situation is caused by listeners that attempt to
perform NM-related actions before they are bound. Check for
this case in the base NLS class and avoid the call to NM if we
know it will fail.
Although it's tempting to throw an IllegalStateException on the
client side, preserve the existing semantics for backwards-compatibility
purposes. That is, silently fail (or return null) - and provide a
log warning.
Bug:
12805707
Change-Id: I0d92fd0d460a8592e8a23fd8fd718ae2ba3bd4c7
Alan Viverette [Wed, 12 Feb 2014 19:28:33 +0000 (11:28 -0800)]
Set properties for pooled CollectionItemInfo, CollectionInfo
BUG:
12978446
Change-Id: I64a366952090ab663ffef43a1d210528805e113c
Narayan Kamath [Wed, 12 Feb 2014 19:23:45 +0000 (19:23 +0000)]
Paul Duffin [Wed, 12 Feb 2014 19:23:01 +0000 (19:23 +0000)]
am
75d67c6a: am
d562a9b5: Merge "Improve Parcel\'s handling of non-primitive arrays"
* commit '
75d67c6aa051392e711fde3b901a4f2c62f983db':
Improve Parcel's handling of non-primitive arrays
Narayan Kamath [Wed, 12 Feb 2014 19:22:56 +0000 (19:22 +0000)]
am
aa98fb51: am
f991771f: Merge "Use size_t* in AssetManager::createIdmap"
* commit '
aa98fb51a8a0148b72e1662cc42102c6547776ce':
Use size_t* in AssetManager::createIdmap
Dianne Hackborn [Wed, 12 Feb 2014 19:22:24 +0000 (19:22 +0000)]
am
133f6826: am
89492190: Merge "Runtime resource overlay, iteration 2, test cases"
* commit '
133f6826e58aa7643858d4e50630103eb01f1815':
Runtime resource overlay, iteration 2, test cases
John Spurlock [Wed, 12 Feb 2014 19:20:21 +0000 (19:20 +0000)]
Merge "Improve error handling in listener services."
Nick Kralevich [Wed, 12 Feb 2014 19:05:59 +0000 (11:05 -0800)]
resolved conflicts for merge of
4ad93639 to klp-modular-dev-plus-aosp
Change-Id: I7ad222301ec0b863d48a1a9a839469436c385ea0
Derek Sollenberger [Wed, 12 Feb 2014 19:00:45 +0000 (19:00 +0000)]
Merge "Revert "Refactor setting an SkPaint onto a hwui Layer.""
Derek Sollenberger [Wed, 12 Feb 2014 18:59:05 +0000 (18:59 +0000)]
Revert "Refactor setting an SkPaint onto a hwui Layer."
This reverts commit
e889298cd6ae1fc0d76bc00d7d12586db03eb261.
Change-Id: I4b1d609b2d4280595d40cb10d6c18875c22999f8
Derek Sollenberger [Wed, 12 Feb 2014 18:10:20 +0000 (18:10 +0000)]
Merge "Refactor setting an SkPaint onto a hwui Layer."
John Spurlock [Wed, 12 Feb 2014 17:12:26 +0000 (12:12 -0500)]
Improve error handling in listener services.
Check explicitly for null listeners in NMS, throwing
IllegalArgumentException (on the small list of exceptions
that survive RPC boundaries) with a message.
Normally this situation is caused by listeners that attempt to
perform NM-related actions before they are bound. Check for
this case in the base NLS class and avoid the call to NM if we
know it will fail.
Although it's tempting to throw an IllegalStateException on the
client side, preserve the existing semantics for backwards-compatibility
purposes. That is, silently fail (or return null) - and provide a
log warning.
Bug:
12805707
Change-Id: I0d92fd0d460a8592e8a23fd8fd718ae2ba3bd4c7
Narayan Kamath [Wed, 12 Feb 2014 17:29:55 +0000 (09:29 -0800)]
Narayan Kamath [Wed, 12 Feb 2014 17:26:57 +0000 (17:26 +0000)]
Merge "Fix build."
Scott Main [Wed, 12 Feb 2014 17:15:26 +0000 (17:15 +0000)]
am
7594767e: am
aa318b28: am
879592d8: am
bc64716c: am
a2739fa7: am
a4c5bba0: add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:
10679818
* commit '
7594767e55e011101ed9341f01d40730fdbd4cc7':
add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:
10679818
Dirk Dougherty [Wed, 12 Feb 2014 17:15:20 +0000 (17:15 +0000)]
am
57b00e2b: am
17f0d48c: am
8b6597bd: am
b6ecc342: am
37ae7032: am
1654264e: Update generated docs for Google Play Services.
* commit '
57b00e2bdf1d2eb596c6525a6fdaa16563e1f132':
Update generated docs for Google Play Services.
Scott Main [Wed, 12 Feb 2014 17:12:10 +0000 (17:12 +0000)]
am
aa318b28: am
879592d8: am
bc64716c: am
a2739fa7: am
a4c5bba0: add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:
10679818
* commit '
aa318b2851042c6f98723446f33469a6545c7294':
add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:
10679818
Dirk Dougherty [Wed, 12 Feb 2014 17:12:06 +0000 (17:12 +0000)]
am
17f0d48c: am
8b6597bd: am
b6ecc342: am
37ae7032: am
1654264e: Update generated docs for Google Play Services.
* commit '
17f0d48ccf4ea817308e8cc3958d249bf77c2a2f':
Update generated docs for Google Play Services.
Scott Main [Wed, 12 Feb 2014 17:09:06 +0000 (17:09 +0000)]
am
879592d8: am
bc64716c: am
a2739fa7: am
a4c5bba0: add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:
10679818
* commit '
879592d89a78383a9e3cd29d53357f34337e5f04':
add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:
10679818
Dirk Dougherty [Wed, 12 Feb 2014 17:09:03 +0000 (17:09 +0000)]
am
8b6597bd: am
b6ecc342: am
37ae7032: am
1654264e: Update generated docs for Google Play Services.
* commit '
8b6597bd07411ff3037d068dd0ef55d70ff18f18':
Update generated docs for Google Play Services.
Scott Main [Wed, 12 Feb 2014 17:06:32 +0000 (17:06 +0000)]
am
bc64716c: am
a2739fa7: am
a4c5bba0: add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:
10679818
* commit '
bc64716cfb1269d07b64f89c3b46800afa5dc266':
add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:
10679818