drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
119,446 Commits 1 Branch 0 Tags
Commit Graph

119446 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
3816fa8bee am 21ab13ff: am 474f1fbe: Merge "Don\'t null class member before using it." into klp-modular-dev 
* commit '21ab13ff743fda1cec1923a8dec6b5553a514759':
  Don't null class member before using it.
 2014-02-13 19:21:41 +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
4dd839756c am d14fa78d: am 0af894d2: Merge "Update DimLayer sizes on rotation." into klp-modular-dev 
* commit 'd14fa78dc84507fbdee8507205a3aff40296d328':
  Update DimLayer sizes on rotation.
 2014-02-13 19:10:15 +00: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
396b9e792f am 27bf55c8: am 16c0b295: am bba3a694: Merge "Telephony API extension v2" 
* commit '27bf55c8159e7f883ddc839453d5a12374ddc50a':
  Telephony API extension v2
 2014-02-13 08:49:13 +00: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
b9378d8108 am 321cd18a: am 820bb4bd: am 9c50271d: am 257f6724: am 35cb4e49: Doc change: add new samples TOC groups and landing pages. 
* commit '321cd18ab21966383d75ba1e9c09b0adf932383b':
  Doc change: add new samples TOC groups and landing pages.
 2014-02-13 03:57:19 +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
f24ee13254 am d3df99c4: am 4b79f838: Merge "Add debug for 12987986." into klp-modular-dev 
* commit 'd3df99c474b8e267cead8382912b083b6f6ebe3d':
  Add debug for 12987986.
 2014-02-13 00:13:10 +00:00
Dirk Dougherty
47d3eaf6b1 am 958a7f72: am 35ad8886: am acec746b: am 55362018: am 271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs 
* commit '958a7f725d9d01415fe33ed2ec35eec72a6d66e3':
  Doc change: minor edits to support easier extraction of document summaries.
 2014-02-13 00:13:06 +00:00
Joe Fernandez
8853b9c4b4 am 577570f2: am e5dc0c39: am 5b97ec6f: am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs 
* commit '577570f29919da32e2b616dbab1e52fadabcb315':
  MediaRouter Developer Guide
 2014-02-13 00:13:02 +00:00
Nick Kralevich
4f2d02fb00 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.
 2014-02-13 00:12:55 +00:00
Dave Platt
5137fa03c3 am 34cc9f90: am 53c7608a: am a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem" 
* commit '34cc9f9056e8736143e82891ccd01a85106a4518':
  Finish fixing Zygote descriptor leakage problem
 2014-02-13 00:12:50 +00: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
Ricardo Cervera
d34172830c 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
 2014-02-12 22:22:06 +00:00
Ricardo Cervera
131c2e13ba 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
 2014-02-12 22:22:03 +00:00
Ricardo Cervera
6bc06c815f 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.
 2014-02-12 22:22:00 +00:00
Craig Mautner
69481d54c2 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.
 2014-02-12 22:21:56 +00:00
John Spurlock
5788f2ba9b am ae5708db: am c4aee98a: Improve error handling in listener services. 
* commit 'ae5708db9d02433027f4574f912def6558805642':
  Improve error handling in listener services.
 2014-02-12 22:21:42 +00:00
Narayan Kamath
efe6e05ca8 am 3caed58a: am 8fa3f443: am 54e7f53f: Merge "Fix build." 
* commit '3caed58ac7f439cfeefd2dd32d57f1d7d755bd29':
  Fix build.
 2014-02-12 22:20:01 +00:00
Paul Duffin
4de9111819 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
 2014-02-12 22:19:58 +00:00
Narayan Kamath
342819663c am fc268eca: am aa98fb51: am f991771f: Merge "Use size_t* in AssetManager::createIdmap" 
* commit 'fc268ecae13f1634054e984a7cc6e325c21f6ab5':
  Use size_t* in AssetManager::createIdmap
 2014-02-12 22:19:56 +00:00