119438 Commits

Author SHA1 Message Date
Narayan Kamath
7a66d8ea7c am 3bec0fbb: am fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class"
* commit '3bec0fbb349a969934828ee726956877a3a21dee':
  AArch64: Use long for pointers in SurfaceSession class
2014-02-14 13:17:13 +00:00
Narayan Kamath
3bec0fbb34 am fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class"
* commit 'fa8f95e9b96e3a12e98269c8a31ed34df6a323ca':
  AArch64: Use long for pointers in SurfaceSession class
2014-02-14 05:14:07 -08:00
Narayan Kamath
fa8f95e9b9 Merge "AArch64: Use long for pointers in SurfaceSession class" 2014-02-14 13:10:44 +00:00
Jeff Brown
ae254a8d71 am 3048191b: Remove onCreate() method that should not be there.
* commit '3048191b4cf9eff7a72b84065dec2b3dd1e89b3c':
  Remove onCreate() method that should not be there.
2014-02-14 09:14:15 +00:00
Jeff Brown
8a4c2bb1f0 am 567f7ca4: Refactor dream manager to new pattern.
* commit '567f7ca424280ae957b04d4f3df690055f2d41df':
  Refactor dream manager to new pattern.
2014-02-14 09:14:09 +00:00
Jeff Brown
3048191b4c Remove onCreate() method that should not be there.
Change-Id: I8355dd78f910afa9895d2fa00cb627a0885d9eec
2014-02-13 23:26:59 -08:00
Jeff Brown
567f7ca424 Refactor dream manager to new pattern.
Change-Id: I99ab4bd98d56a290368dc4b24e5bb24e0656b522
2014-02-13 23:26:59 -08:00
Dianne Hackborn
dc3561df11 am 01de2432: am 24d8fa73: Merge "frameworks/base: move idmap from frameworks/native"
* commit '01de243263d347f2ac13a239d67d41817e34df33':
  frameworks/base: move idmap from frameworks/native
2014-02-14 01:54:49 +00:00
Wink Saville
e574f7decf am ea56c795: am bbba8211: Merge "Telephony: Handle DATA_CALL_LIST in DCC."
* commit 'ea56c795b0b4997f5835ec42a18eccdb173bc468':
  Telephony: Handle DATA_CALL_LIST in DCC.
2014-02-14 01:54:43 +00:00
Dianne Hackborn
01de243263 am 24d8fa73: Merge "frameworks/base: move idmap from frameworks/native"
* commit '24d8fa739b7ca0791174af260ed95cdc139e0903':
  frameworks/base: move idmap from frameworks/native
2014-02-13 17:50:53 -08:00
Wink Saville
ea56c795b0 am bbba8211: Merge "Telephony: Handle DATA_CALL_LIST in DCC."
* commit 'bbba8211f9eca938d5d482583fd6e047615b4334':
  Telephony: Handle DATA_CALL_LIST in DCC.
2014-02-13 17:50:51 -08:00
Dianne Hackborn
24d8fa739b Merge "frameworks/base: move idmap from frameworks/native" 2014-02-14 01:45:12 +00:00
Wink Saville
bbba8211f9 Merge "Telephony: Handle DATA_CALL_LIST in DCC." 2014-02-13 23:37:04 +00:00
Craig Mautner
21ab13ff74 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.
2014-02-13 19:18:04 +00:00
Craig Mautner
474f1fbe8d Merge "Don't null class member before using it." into klp-modular-dev 2014-02-13 19:14:17 +00:00
Craig Mautner
991146f8ef 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
2014-02-13 11:12:42 -08:00
Craig Mautner
d14fa78dc8 am 0af894d2: Merge "Update DimLayer sizes on rotation." into klp-modular-dev
* commit '0af894d25133890e7765e6c582b3ac4829070de8':
  Update DimLayer sizes on rotation.
2014-02-13 19:05:18 +00:00
Craig Mautner
0af894d251 Merge "Update DimLayer sizes on rotation." into klp-modular-dev 2014-02-13 19:02:02 +00:00
Craig Mautner
b660b9d8cf 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
2014-02-13 10:59:16 -08:00
Wink Saville
27bf55c815 am 16c0b295: am bba3a694: Merge "Telephony API extension v2"
* commit '16c0b295ef069e128a4e01fd2f72da06784950a1':
  Telephony API extension v2
2014-02-13 08:44:55 +00:00
Wink Saville
16c0b295ef am bba3a694: Merge "Telephony API extension v2"
* commit 'bba3a694b8400fd340c0400bf42ef3d79a4285b1':
  Telephony API extension v2
2014-02-12 20:29:01 -08:00
Wink Saville
bba3a694b8 Merge "Telephony API extension v2" 2014-02-13 04:26:33 +00:00
Dirk Dougherty
321cd18ab2 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.
2014-02-13 03:53:48 +00:00
Dirk Dougherty
820bb4bdd3 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.
2014-02-13 03:50:08 +00:00
Dirk Dougherty
9c50271dc3 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.
2014-02-13 03:47:02 +00:00
Dirk Dougherty
257f67249a am 35cb4e49: Doc change: add new samples TOC groups and landing pages.
* commit '35cb4e49365a8a8da0607c2659399aaad9ea5a1c':
  Doc change: add new samples TOC groups and landing pages.
2014-02-13 03:44:38 +00:00
Dirk Dougherty
35cb4e4936 Doc change: add new samples TOC groups and landing pages.
Change-Id: I2f39e82fb79d4f19362d9fe2deafdde5d87873a7
2014-02-12 19:38:51 -08:00
Craig Mautner
d3df99c474 am 4b79f838: Merge "Add debug for 12987986." into klp-modular-dev
* commit '4b79f8380c47b0da89348e1115ea70e7898997ca':
  Add debug for 12987986.
2014-02-12 23:48:15 +00:00
Craig Mautner
4b79f8380c Merge "Add debug for 12987986." into klp-modular-dev 2014-02-12 23:44:56 +00:00
Dirk Dougherty
958a7f725d 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.
2014-02-12 23:43:56 +00:00
Craig Mautner
1646832219 Add debug for 12987986.
For bug 12987986.

Change-Id: Idc122ba369ad7566e3fee290955bf91b0f610ae1
2014-02-12 15:43:40 -08:00
Dirk Dougherty
35ad8886f2 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.
2014-02-12 23:37:57 +00:00
Dirk Dougherty
acec746b89 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.
2014-02-12 23:34:35 +00:00
Joe Fernandez
577570f299 am e5dc0c39: am 5b97ec6f: am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
* commit 'e5dc0c39912d6e1392e1a3324ad210e65c0105c8':
  MediaRouter Developer Guide
2014-02-12 23:33:43 +00:00
Dirk Dougherty
55362018c9 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.
2014-02-12 23:30:19 +00:00
Joe Fernandez
e5dc0c3991 am 5b97ec6f: am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
* commit '5b97ec6fa0e166113aad2abc1107e6bd3771cc2a':
  MediaRouter Developer Guide
2014-02-12 23:29:38 +00:00
Dirk Dougherty
271c8f12c8 Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs 2014-02-12 23:20:41 +00:00
Joe Fernandez
5b97ec6fa0 am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
* commit '3885b00ae12df9f56e922ceda12326e922be1414':
  MediaRouter Developer Guide
2014-02-12 23:19:10 +00:00
Nick Kralevich
20b5fd98fb 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.
2014-02-12 23:19:05 +00:00
Joe Fernandez
3885b00ae1 am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
* commit 'f25bc75f591fbb04733b9cc33fabee2293973b8c':
  MediaRouter Developer Guide
2014-02-12 23:15:50 +00:00
Joe Fernandez
f25bc75f59 Merge "MediaRouter Developer Guide" into klp-docs 2014-02-12 23:13:01 +00:00
Nick Kralevich
93994e9db4 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.
2014-02-12 15:12:08 -08:00
Dave Platt
34cc9f9056 am 53c7608a: am a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem"
* commit '53c7608aefb0ed754394e571cac02e96ad6fcdb3':
  Finish fixing Zygote descriptor leakage problem
2014-02-12 23:10:36 +00:00
Nick Kralevich
a9bb594da6 Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API." 2014-02-12 23:09:37 +00:00
Dave Platt
53c7608aef am a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem"
* commit 'a3c3533b1d6a4016cd1856fccac6cc404997b8a6':
  Finish fixing Zygote descriptor leakage problem
2014-02-12 15:07:07 -08:00
Dave Platt
a3c3533b1d Merge "Finish fixing Zygote descriptor leakage problem" 2014-02-12 23:03:48 +00:00
Joe Fernandez
70a2adc817 MediaRouter Developer Guide
staging: http://joefernandez2.mtv.corp.google.com:8210/guide/topics/media/mediarouter.html

Change-Id: I764828066de8b233e61ad8a5d4a102a4d231fa82
2014-02-12 14:12:15 -08:00
Ricardo Cervera
481993e92c 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
2014-02-12 22:08:33 +00:00
Ricardo Cervera
6fc66187b1 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
2014-02-12 22:08:30 +00:00
Ricardo Cervera
49968bb559 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.
2014-02-12 22:08:27 +00:00