ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity
41,459 Commits 2 Branches 0 Tags 54 MiB
e2b94cd392
Commit Graph

41459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Sandler
0dd46977df am 8b9ba6fa: am f52a4482: Merge "Add a default Dreams component." into ics-mr1 
* commit '8b9ba6fa8806c401c89df88f0a1690fbfd1ebb89':
  Add a default Dreams component.
 2011-11-17 07:48:15 -08:00
Daniel Sandler
d05ecb49dd am e11bcd1d: am 5311917d: Merge "Remove day of week from phone notification panel." into ics-mr1 
* commit 'e11bcd1d72cb45af984b9d457c4306f51923e853':
  Remove day of week from phone notification panel.
 2011-11-17 07:48:12 -08:00
Mathias Agopian
1c46c42c16 am abdade71: am 69c17a11: Merge "Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"" into ics-mr1 
* commit 'abdade71bc17153696fe2abe281c5a3b0c2e5abe':
  Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"
 2011-11-17 07:48:10 -08:00
Marco Nelissen
e19d46c2c8 am 3de68918: am e937da83: Merge "Change MediaController look b/5584613" into ics-mr1 
* commit '3de689186531cebfabcb4b4d4163eae6baac528d':
  Change MediaController look b/5584613
 2011-11-17 07:48:01 -08:00
Robert Ly
f74f3239a2 Merge "docs: adt 15.0.1 rel notes" into ics-mr0 2011-11-17 07:17:04 -08:00
Glenn Kasten
1cd89a7494 Merge "MidiFile uses C++ Thread not createThreadEtc" 2011-11-17 07:14:41 -08:00
Glenn Kasten
46f31d3741 Merge "JetPlayer uses C++ Thread not createThreadEtc" 2011-11-17 07:14:29 -08:00
The Android Automerger
ac2cb039e4 merge in ics-mr1-release history after reset to ics-mr1 2011-11-17 06:46:36 -08:00
The Android Automerger
2f30ae90e6 merge in ics-mr0-release history after reset to ics-mr0 2011-11-17 06:28:25 -08:00
Dianne Hackborn
71a115ba1c am 9aa6bd1c: am 717a25dc: Add new ManagedEGLContext class to help apps participate in memory trimming. 
* commit '9aa6bd1c34fe3583fe31f283a6415e84fec12567':
  Add new ManagedEGLContext class to help apps participate in memory trimming.
 2011-11-17 05:46:34 -08:00
Dianne Hackborn
5b82398255 am 65952ec4: am 4c6a65bc: Merge "Maybe fix issue #5627399: java.lang.RuntimeException - While sign in..." into ics-mr1 
* commit '65952ec4dc0e1703eb87a54c252953c53d07affc':
  Maybe fix issue #5627399: java.lang.RuntimeException - While sign in...
 2011-11-17 05:46:32 -08:00
Robert Greenwalt
7e3db07cc3 am 795fcd07: am 33fe4a36: Merge "Fix TelephonyManager to grab the best context" into ics-mr1 
* commit '795fcd07943ac1aaab309a4fa0d6bad1b67671a8':
  Fix TelephonyManager to grab the best context
 2011-11-17 05:46:05 -08:00
Jamie Gennis
ccf5b9febc am 7765fc65: am fd6b64f6: Merge "SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call" into ics-mr1 
* commit '7765fc651a9519dd2f0ac9d3374a50e9865c5c99':
  SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call
 2011-11-17 05:46:00 -08:00
Eric Fischer
571263b875 am 02ed923d: (-s ours) am 7dc81e06: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '02ed923da995a10c537018861cfc149d04c66bc2':
  Import revised translations.  DO NOT MERGE
 2011-11-17 05:45:54 -08:00
Gilles Debunne
f47c36817c am b3272d29: am de8c5ec8: Merge "IME action (done, next...) correctly handled" into ics-mr1 
* commit 'b3272d297bb45e5cd3201766baef4fef7921ce05':
  IME action (done, next...) correctly handled
 2011-11-17 05:45:29 -08:00
Kristian Monsen
aa8cc5b5ab Merge "Fix fix for bug 2816327" 2011-11-17 05:43:40 -08:00
Alex Sakhartchouk
33957d2619 am a962ef29: am 4c593010: Merge "Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body." into ics-mr1 
* commit 'a962ef2993099e6c5db3809a7e829e43c8cf084a':
  Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body.
 2011-11-17 04:08:30 -08:00
Fred Chung
4c93ecb90c am d592714d: am 15fe377c: Merge "Bluetooth HDP sample." into ics-mr1 
* commit 'd592714d9a48afce69d6904fc539f150b7c02898':
  Bluetooth HDP sample.
 2011-11-17 04:08:28 -08:00
The Android Open Source Project
4dd795871b am 4dce941e: am 816e68e2: No-op merge from ics-mr0 
* commit '4dce941ecec71aa999cf777a43f05821793b6749':
 2011-11-17 04:08:27 -08:00
Ben Murdoch
0f1439acf7 am fead0e14: Merge changes I59323dc5,I31a01aa3 into ics-mr1 
* commit 'fead0e14b437e80b1c2b0578ec33fc5cbf910ddf':
  WebViewDatabase v11 for ICS.
  Fix a bug in the database upgrade process, and refactor slightly.
 2011-11-17 02:15:40 -08:00
Ben Murdoch
4c0658c898 Merge changes I59323dc5,I31a01aa3 into ics-mr1 
* changes:
  WebViewDatabase v11 for ICS.
  Fix a bug in the database upgrade process, and refactor slightly.
 2011-11-17 02:13:19 -08:00
Jeff Sharkey
1b11309907 am b9df01d3: Merge "Update NTP outside locks, log large trim events." into ics-mr1 
* commit 'b9df01d39692c45b182c429015cc2086ef27db97':
  Update NTP outside locks, log large trim events.
 2011-11-16 23:01:15 -08:00
Jeff Sharkey
deca348e76 Merge "Update NTP outside locks, log large trim events." into ics-mr1 2011-11-16 22:59:13 -08:00
Daniel Sandler
1cd383626b am 293f861a: Merge "Activate Dreams (screen saver) when desk-docked." into ics-mr1 
* commit '293f861aab64a0dbae00bb33c90e6e565a7fabfc':
  Activate Dreams (screen saver) when desk-docked.
 2011-11-16 22:35:30 -08:00
Daniel Sandler
10c776af11 am d5decdcc: Merge "Disable desk dock apps." into ics-mr1 
* commit 'd5decdccc64c59ad62de86c70dbe9ead12150cdc':
  Disable desk dock apps.
 2011-11-16 22:35:28 -08:00
Daniel Sandler
795bcc13c7 Merge "Activate Dreams (screen saver) when desk-docked." into ics-mr1 2011-11-16 22:33:55 -08:00
Daniel Sandler
d54b32aaf3 Merge "Disable desk dock apps." into ics-mr1 2011-11-16 22:33:44 -08:00
Mathias Agopian
4ecb74ce01 am 8fc3540f: Merge "be a bit more defensive when parsing extension strings" into ics-mr1 
* commit '8fc3540fdf759ff3bb03b00e81d94d6c4102d530':
  be a bit more defensive when parsing extension strings
 2011-11-16 21:00:52 -08:00
Mathias Agopian
410f141622 Merge "be a bit more defensive when parsing extension strings" into ics-mr1 2011-11-16 20:59:30 -08:00
Nicolas Roard
fa92fd7d66 am e88ca718: Merge "Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition." into ics-mr1 
* commit 'e88ca718ed9af788f2dc46b5f2db494906bbf41d':
  Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition.
 2011-11-16 19:42:07 -08:00
Nicolas Roard
fa5a800da4 Merge "Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition." into ics-mr1 2011-11-16 19:40:04 -08:00
Matthew Xie
ae7600c8b3 am 302afb93: Merge "Call notifyIncomingA2dpConnection with correct rejected status" into ics-mr1 
* commit '302afb93d4fd908949ac796eda8343f9683e616a':
  Call notifyIncomingA2dpConnection with correct rejected status
 2011-11-16 18:25:04 -08:00
Mathias Agopian
ddca905c01 am 1125f89e: Merge "remove hack that hardcoded the refresh rate" into ics-mr1 
* commit '1125f89e47b06b12a0e047d64f1ef953d0c48489':
  remove hack that hardcoded the refresh rate
 2011-11-16 18:22:26 -08:00
Matthew Xie
d858f05940 Merge "Call notifyIncomingA2dpConnection with correct rejected status" into ics-mr1 2011-11-16 18:20:50 -08:00
Mathias Agopian
20b52631fa Merge "remove hack that hardcoded the refresh rate" into ics-mr1 2011-11-16 18:19:33 -08:00
Mangesh Ghiware
92d1396bbf am 4fdfdeed: Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1 
* commit '4fdfdeedc64eef2efe3811198e8fad40aa1b8fc3':
  Revert change to setInitialScale() to take display density into account.
 2011-11-16 18:03:51 -08:00
Mangesh Ghiware
ae8891278a Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1 2011-11-16 18:01:35 -08:00
Steven Ross
1820cde4e3 Merge "Not showing facelock when plugging/unplugging fixes 5438524" 2011-11-16 17:46:44 -08:00
satok
b4394bdc70 am e5febfd5: Merge "Clean up the spell checker framework" into ics-mr1 
* commit 'e5febfd5bd9b19a01383760b523476ba7f013a5c':
  Clean up the spell checker framework
 2011-11-16 17:37:46 -08:00
satok
517dcd273f Merge "Clean up the spell checker framework" into ics-mr1 2011-11-16 17:35:54 -08:00
Daniel Sandler
0bad94570c am f52a4482: Merge "Add a default Dreams component." into ics-mr1 
* commit 'f52a4482dd3ca336f84fc6c533ea4a99a72b23dd':
  Add a default Dreams component.
 2011-11-16 17:16:54 -08:00
Daniel Sandler
f04df720b6 am 5311917d: Merge "Remove day of week from phone notification panel." into ics-mr1 
* commit '5311917df5fe9804105ff6070346b8fac4b102df':
  Remove day of week from phone notification panel.
 2011-11-16 17:14:30 -08:00
Daniel Sandler
a974a262ee Merge "Add a default Dreams component." into ics-mr1 2011-11-16 17:13:35 -08:00
Daniel Sandler
c33702f3fb Merge "Remove day of week from phone notification panel." into ics-mr1 2011-11-16 17:13:16 -08:00
Mathias Agopian
f3ae82d813 be a bit more defensive when parsing extension strings 
hopefully this will fix a crash in the emulator.

Bug: 5624674
Change-Id: I96586e29ea20efd73c4ad50870df5b7368bf3c3b
 2011-11-16 16:49:25 -08:00
Mathias Agopian
ec200fadc5 Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" 
This reverts commit e7758be6da85728df6b4215f413660c67c5a9740.

Seemed to cause failures un SurfaceTexture.

Bug: 5627450
 2011-11-16 16:29:25 -08:00
Mathias Agopian
ec3c8a12b1 am 69c17a11: Merge "Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"" into ics-mr1 
* commit '69c17a11a2ce5badc238e66ce9f8ca4a3a1028b3':
  Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"
 2011-11-16 16:16:11 -08:00
Mathias Agopian
c554d2b8ad Merge "Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"" into ics-mr1 2011-11-16 16:13:38 -08:00
Mathias Agopian
c21180ee67 Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" 
This reverts commit e7758be6da85728df6b4215f413660c67c5a9740.

Seemed to cause failures un SurfaceTexture.

Bug: 5627450
 2011-11-16 15:59:13 -08:00
Matthew Xie
e8b051d904 Merge "Check the bluetooth state for getUuid call" into ics-mr0 2011-11-16 15:31:03 -08:00