OSDN Git Service
Jeff Brown [Fri, 14 Feb 2014 09:14:09 +0000 (09:14 +0000)]
am
567f7ca4: Refactor dream manager to new pattern.
* commit '
567f7ca424280ae957b04d4f3df690055f2d41df':
Refactor dream manager to new pattern.
Jeff Brown [Fri, 31 Jan 2014 07:38:03 +0000 (23:38 -0800)]
Refactor dream manager to new pattern.
Change-Id: I99ab4bd98d56a290368dc4b24e5bb24e0656b522
Dianne Hackborn [Fri, 14 Feb 2014 01:54:49 +0000 (01:54 +0000)]
am
01de2432: am
24d8fa73: Merge "frameworks/base: move idmap from frameworks/native"
* commit '
01de243263d347f2ac13a239d67d41817e34df33':
frameworks/base: move idmap from frameworks/native
Wink Saville [Fri, 14 Feb 2014 01:54:43 +0000 (01:54 +0000)]
am
ea56c795: am
bbba8211: Merge "Telephony: Handle DATA_CALL_LIST in DCC."
* commit '
ea56c795b0b4997f5835ec42a18eccdb173bc468':
Telephony: Handle DATA_CALL_LIST in DCC.
Dianne Hackborn [Fri, 14 Feb 2014 01:50:53 +0000 (17:50 -0800)]
am
24d8fa73: Merge "frameworks/base: move idmap from frameworks/native"
* commit '
24d8fa739b7ca0791174af260ed95cdc139e0903':
frameworks/base: move idmap from frameworks/native
Wink Saville [Fri, 14 Feb 2014 01:50:51 +0000 (17:50 -0800)]
am
bbba8211: Merge "Telephony: Handle DATA_CALL_LIST in DCC."
* commit '
bbba8211f9eca938d5d482583fd6e047615b4334':
Telephony: Handle DATA_CALL_LIST in DCC.
Dianne Hackborn [Fri, 14 Feb 2014 01:45:12 +0000 (01:45 +0000)]
Merge "frameworks/base: move idmap from frameworks/native"
Wink Saville [Thu, 13 Feb 2014 23:37:03 +0000 (23:37 +0000)]
Merge "Telephony: Handle DATA_CALL_LIST in DCC."
Craig Mautner [Thu, 13 Feb 2014 19:18:04 +0000 (19:18 +0000)]
am
474f1fbe: Merge "Don\'t null class member before using it." into klp-modular-dev
* commit '
474f1fbe8d87563909c3cb69ec921d427cd1f0b0':
Don't null class member before using it.
Craig Mautner [Thu, 13 Feb 2014 19:14:17 +0000 (19:14 +0000)]
Merge "Don't null class member before using it." into klp-modular-dev
Craig Mautner [Thu, 13 Feb 2014 19:12:42 +0000 (11:12 -0800)]
Don't null class member before using it.
Changing the order of detachStack() and usage of mDisplayContent
fixes NPE.
Fixes bug
12823709.
Change-Id: I04760b1d6fd5d3ffc49b99ca4acb47bf7e61cb46
Craig Mautner [Thu, 13 Feb 2014 19:05:18 +0000 (19:05 +0000)]
am
0af894d2: Merge "Update DimLayer sizes on rotation." into klp-modular-dev
* commit '
0af894d25133890e7765e6c582b3ac4829070de8':
Update DimLayer sizes on rotation.
Craig Mautner [Thu, 13 Feb 2014 19:02:01 +0000 (19:02 +0000)]
Merge "Update DimLayer sizes on rotation." into klp-modular-dev
Craig Mautner [Thu, 13 Feb 2014 18:59:16 +0000 (10:59 -0800)]
Update DimLayer sizes on rotation.
Required replumbing and updating the TaskStack bounds calculations
to match the new separation of TaskStack from DisplayContent.
Fixes bug
12780687.
Change-Id: I061c92831c06f4eb3e673ad6296e721b0c0f3202
Wink Saville [Thu, 13 Feb 2014 08:44:55 +0000 (08:44 +0000)]
am
16c0b295: am
bba3a694: Merge "Telephony API extension v2"
* commit '
16c0b295ef069e128a4e01fd2f72da06784950a1':
Telephony API extension v2
Wink Saville [Thu, 13 Feb 2014 04:29:01 +0000 (20:29 -0800)]
am
bba3a694: Merge "Telephony API extension v2"
* commit '
bba3a694b8400fd340c0400bf42ef3d79a4285b1':
Telephony API extension v2
Wink Saville [Thu, 13 Feb 2014 04:26:33 +0000 (04:26 +0000)]
Merge "Telephony API extension v2"
Dirk Dougherty [Thu, 13 Feb 2014 03:53:48 +0000 (03:53 +0000)]
am
820bb4bd: am
9c50271d: am
257f6724: am
35cb4e49: Doc change: add new samples TOC groups and landing pages.
* commit '
820bb4bdd358bfaac446b8ce4af5474dcfc77613':
Doc change: add new samples TOC groups and landing pages.
Dirk Dougherty [Thu, 13 Feb 2014 03:50:08 +0000 (03:50 +0000)]
am
9c50271d: am
257f6724: am
35cb4e49: Doc change: add new samples TOC groups and landing pages.
* commit '
9c50271dc34e48d527db7da85c3b3474574faee2':
Doc change: add new samples TOC groups and landing pages.
Dirk Dougherty [Thu, 13 Feb 2014 03:47:02 +0000 (03:47 +0000)]
am
257f6724: am
35cb4e49: Doc change: add new samples TOC groups and landing pages.
* commit '
257f67249afb017c9a3d0a79e545da567aa5bd02':
Doc change: add new samples TOC groups and landing pages.
Dirk Dougherty [Thu, 13 Feb 2014 03:44:38 +0000 (03:44 +0000)]
am
35cb4e49: Doc change: add new samples TOC groups and landing pages.
* commit '
35cb4e49365a8a8da0607c2659399aaad9ea5a1c':
Doc change: add new samples TOC groups and landing pages.
Dirk Dougherty [Sat, 8 Feb 2014 05:05:43 +0000 (21:05 -0800)]
Doc change: add new samples TOC groups and landing pages.
Change-Id: I2f39e82fb79d4f19362d9fe2deafdde5d87873a7
Craig Mautner [Wed, 12 Feb 2014 23:48:15 +0000 (23:48 +0000)]
am
4b79f838: Merge "Add debug for
12987986." into klp-modular-dev
* commit '
4b79f8380c47b0da89348e1115ea70e7898997ca':
Add debug for
12987986.
Craig Mautner [Wed, 12 Feb 2014 23:44:55 +0000 (23:44 +0000)]
Merge "Add debug for
12987986." into klp-modular-dev
Dirk Dougherty [Wed, 12 Feb 2014 23:43:56 +0000 (23:43 +0000)]
am
35ad8886: am
acec746b: am
55362018: am
271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs
* commit '
35ad8886f230d4bde4ea4cb2df9f07cf213c7cd1':
Doc change: minor edits to support easier extraction of document summaries.
Craig Mautner [Wed, 12 Feb 2014 23:43:40 +0000 (15:43 -0800)]
Add debug for
12987986.
For bug
12987986.
Change-Id: Idc122ba369ad7566e3fee290955bf91b0f610ae1
Dirk Dougherty [Wed, 12 Feb 2014 23:37:57 +0000 (23:37 +0000)]
am
acec746b: am
55362018: am
271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs
* commit '
acec746b8963410d4a9324df46272ac91f846868':
Doc change: minor edits to support easier extraction of document summaries.
Dirk Dougherty [Wed, 12 Feb 2014 23:34:35 +0000 (23:34 +0000)]
am
55362018: am
271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs
* commit '
55362018c9dfadff5eb1a138a1d90187110c253e':
Doc change: minor edits to support easier extraction of document summaries.
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
Dirk Dougherty [Wed, 12 Feb 2014 23:30:19 +0000 (23:30 +0000)]
am
271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs
* commit '
271c8f12c88e87563ed17f4ad29610037bd300be':
Doc change: minor edits to support easier extraction of document summaries.
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
Dirk Dougherty [Wed, 12 Feb 2014 23:20:40 +0000 (23:20 +0000)]
Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs
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"
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.
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.
Dirk Dougherty [Sun, 9 Feb 2014 04:29:06 +0000 (20:29 -0800)]
Doc change: minor edits to support easier extraction of document summaries.
Change-Id: I1a15a1d233464d6c8d35a741c54932412dea28ee
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
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
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
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
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
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: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
Dirk Dougherty [Wed, 12 Feb 2014 17:06:26 +0000 (17:06 +0000)]
am
b6ecc342: am
37ae7032: am
1654264e: Update generated docs for Google Play Services.
* commit '
b6ecc342d3e9f355a78a0a10e613bbda31286f3a':
Update generated docs for Google Play Services.
Scott Main [Wed, 12 Feb 2014 17:03:26 +0000 (17:03 +0000)]
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 '
a2739fa795981f597b044e93a5c552051cfe1c00':
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:03:22 +0000 (17:03 +0000)]
am
37ae7032: am
1654264e: Update generated docs for Google Play Services.
* commit '
37ae70326feebd23cf2b9c5254f1250d5bf3a029':
Update generated docs for Google Play Services.
Scott Main [Wed, 12 Feb 2014 16:59:56 +0000 (16:59 +0000)]
am
a4c5bba0: add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:
10679818
* commit '
a4c5bba07e121569ab504b2191ee576f09407f5b':
add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:
10679818
Scott Main [Sat, 5 Oct 2013 02:08:08 +0000 (19:08 -0700)]
add document about GoogleApiClient and one about GoogleAuthUtil
also remove the Authorization document from the Google Services
section.
bug:
10679818
Change-Id: Ibfade1eca68d89afe30b79d75ca5e38a2b3a84a8
Paul Duffin [Wed, 12 Feb 2014 10:29:41 +0000 (02:29 -0800)]
am
d562a9b5: Merge "Improve Parcel\'s handling of non-primitive arrays"
* commit '
d562a9b5160b491a9cc884f72651e46d786bdc0a':
Improve Parcel's handling of non-primitive arrays
Paul Duffin [Wed, 12 Feb 2014 10:27:13 +0000 (10:27 +0000)]
Merge "Improve Parcel's handling of non-primitive arrays"
Dianne Hackborn [Tue, 11 Feb 2014 21:56:21 +0000 (13:56 -0800)]
Fix build.
At least part of what is broken. Other stuff still seems to be.
(cherry picked from
32bb5fae353b5bb6275e75952e89c514c7369cee)
Change-Id: I280376645166fe772ff7a31ff2e8494dce2adbf8
Narayan Kamath [Wed, 12 Feb 2014 09:40:24 +0000 (01:40 -0800)]
am
f991771f: Merge "Use size_t* in AssetManager::createIdmap"
* commit '
f991771f81953f5d355eb905d05a784ed7287016':
Use size_t* in AssetManager::createIdmap
Narayan Kamath [Wed, 12 Feb 2014 09:32:16 +0000 (09:32 +0000)]
Merge "Use size_t* in AssetManager::createIdmap"
Dirk Dougherty [Wed, 12 Feb 2014 03:13:19 +0000 (03:13 +0000)]
am
1654264e: Update generated docs for Google Play Services.
* commit '
1654264edd68adfd4347d12112aa3124f1d0acb9':
Update generated docs for Google Play Services.
Dirk Dougherty [Sat, 8 Feb 2014 03:58:28 +0000 (19:58 -0800)]
Update generated docs for Google Play Services.
Change-Id: I6dab64736cd07b1ffb398d9baab21250552c5e17
Colin Cross [Wed, 12 Feb 2014 02:04:44 +0000 (18:04 -0800)]
frameworks/base: move idmap from frameworks/native
idmap depends on libandroidfw, so it should go in frameworks/base.
Change-Id: I3c1db3baa355f53d6b523d60f4377e63eff00c30
Colin Cross [Wed, 12 Feb 2014 02:02:06 +0000 (18:02 -0800)]
Use size_t* in AssetManager::createIdmap
ResTable::createIdmap takes a size_t*, and the idmap command is
passing in a size_t*, make AssetManager::createIdmap take a
size_t*. Should fix the mac build.
Change-Id: Idc16dedfe2aa7367c75f89a937a8242d494e8f8e
Scott Main [Wed, 12 Feb 2014 01:24:02 +0000 (01:24 +0000)]
am
08d28f59: am
6d1d2134: am
11bb34da: am
9854f69f: Merge "add google cast feature page edit other feature pages for consistent call to action paragraph and remove \'preview\' notice from Drive page" into klp-docs
* commit '
08d28f59bd74ab4109cf5343ef056a8d4b796ef6':
add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
Scott Main [Wed, 12 Feb 2014 01:18:48 +0000 (01:18 +0000)]
am
6d1d2134: am
11bb34da: am
9854f69f: Merge "add google cast feature page edit other feature pages for consistent call to action paragraph and remove \'preview\' notice from Drive page" into klp-docs
* commit '
6d1d21340fe6ca84fdef76dd6f9ba7c315b7a73e':
add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
Scott Main [Wed, 12 Feb 2014 01:15:25 +0000 (01:15 +0000)]
am
11bb34da: am
9854f69f: Merge "add google cast feature page edit other feature pages for consistent call to action paragraph and remove \'preview\' notice from Drive page" into klp-docs
* commit '
11bb34da5f68f70f3350199e3578445d9a1eaae3':
add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
Scott Main [Wed, 12 Feb 2014 01:12:08 +0000 (01:12 +0000)]
am
9854f69f: Merge "add google cast feature page edit other feature pages for consistent call to action paragraph and remove \'preview\' notice from Drive page" into klp-docs
* commit '
9854f69f75352e473e34410b0b298b7c7f04434a':
add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
Scott Main [Wed, 12 Feb 2014 01:09:21 +0000 (01:09 +0000)]
Merge "add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page" into klp-docs
Jeff Brown [Wed, 12 Feb 2014 00:37:24 +0000 (00:37 +0000)]
am
38f96e50: Add support for injecting events into ActivityContainers. (DO NOT MERGE)
* commit '
38f96e5020b3e82b98fe97b0be363a5ad185860f':
Add support for injecting events into ActivityContainers. (DO NOT MERGE)
Jeff Brown [Tue, 11 Feb 2014 22:32:56 +0000 (14:32 -0800)]
Add support for injecting events into ActivityContainers. (DO NOT MERGE)
Modified ActivityView to inject touch events it receives back into
its activity container. The container then injects the event into
the input system along with the display id of the underlying virtual
display.
Enhanced the input system to support concurrent dispatch of touch
events on multiple displays which is required for this to work.
Change-Id: I9cf1870db3be6f99a52ed9a1e3ceafe42c940093
Griff Hazen [Tue, 11 Feb 2014 21:34:53 +0000 (21:34 +0000)]
am
0ff811db: Merge "Add local-only option to Notification (using flag)" into klp-modular-dev
* commit '
0ff811db58089e7b4e8fbca4f41be8f20c86ce10':
Add local-only option to Notification (using flag)
Dianne Hackborn [Tue, 11 Feb 2014 21:34:49 +0000 (13:34 -0800)]
am
89492190: Merge "Runtime resource overlay, iteration 2, test cases"
* commit '
89492190b39e301d8203d0a9a9f6b11120c16ecb':
Runtime resource overlay, iteration 2, test cases
Dianne Hackborn [Tue, 11 Feb 2014 21:34:46 +0000 (13:34 -0800)]
am
67754d93: Merge "Runtime resource overlay, iteration 2"
* commit '
67754d93c4bfb2da1831b1dd2b40c12a838b1028':
Runtime resource overlay, iteration 2
Dianne Hackborn [Tue, 11 Feb 2014 21:30:08 +0000 (21:30 +0000)]
Merge "Runtime resource overlay, iteration 2, test cases"
Dianne Hackborn [Tue, 11 Feb 2014 21:29:58 +0000 (21:29 +0000)]
Merge "Runtime resource overlay, iteration 2"