ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity
42,982 Commits 2 Branches 0 Tags 54 MiB
f7f5e8cc95
Commit Graph

42982 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Jurka
f7f5e8cc95 Merge "Remove fastInvalidate and setFast* methods" 2012-01-23 07:24:32 -08:00
Michael Jurka
ccf85f5005 Merge "Improve rapid-fire presses on system bar" 2012-01-23 07:23:56 -08:00
Dianne Hackborn
7b648d8175 resolved conflicts for merge of 892d11f4 to master 
Change-Id: I21eca0002100d898e167a25aaa46d896deca2a11
 2012-01-20 18:42:07 -08:00
Christopher Tate
5e92e0a0d1 Merge "Fix shared-storage full backup" 2012-01-20 17:59:06 -08:00
Glenn Kasten
80531a7cce Merge "Remove AudioFlinger dependencies on client" 2012-01-20 17:16:36 -08:00
Guang Zhu
a6c78c0805 Merge "Revert "Use port 18000 instead of 8000 for layout tests"" 2012-01-20 17:06:42 -08:00
Daniel Sandler
819ec42520 am a64f899f: am 4d3161f3: Merge "Always show appropriate mobile service label." into ics-mr1 
* commit 'a64f899fa6159a8839a769d3f107f6c502da58c8':
  Always show appropriate mobile service label.
 2012-01-20 16:38:24 -08:00
Jeff Brown
9e13af9b3a am 1bc82792: (-s ours) am ad1f4a2c: Merge "Implement a max time bound for rotation. (DO NOT MERGE)" into ics-mr1 
* commit '1bc82792b87c0aee65c53f84a6d7c6b5031a09bc':
  Implement a max time bound for rotation.  (DO NOT MERGE)
 2012-01-20 16:38:10 -08:00
Jeff Brown
86c1cd17a8 am 06a0fb95: (-s ours) am 5d58eb06: Merge "Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)" into ics-mr1 
* commit '06a0fb953ff1c544bdbef2618d20ec1ba551eb6e':
  Fix a few memory leaks in the input dispatcher.  (DO NOT MERGE)
 2012-01-20 16:38:07 -08:00
The Android Open Source Project
1a5746d7a5 am 288cde7f: Reconcile with ics-mr1-release 
* commit '288cde7f0a17f47f7071168f442d19f703947cc9':
 2012-01-20 16:38:02 -08:00
Jean-Baptiste Queru
29d58b2928 am ee567e08: am c3c36b4f: am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT" 
* commit 'ee567e08d973c0fad214889e8d980f9bfb535b34':
  Rename LOG_ASSERT to ALOG_ASSERT
 2012-01-20 16:37:52 -08:00
Jean-Baptiste Queru
3142502991 am 45470559: (-s ours) am 12b7da69: am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)" 
* commit '45470559cd4a499fd5d38cf708f0b531dc081fed':
  Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
 2012-01-20 16:37:49 -08:00
Jean-Baptiste Queru
28a907bd19 am db2b3930: (-s ours) am f3f650db: am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)" 
* commit 'db2b39300a8f763cf2d0c9808deb86db87d5492c':
  Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
 2012-01-20 16:35:20 -08:00
Jean-Baptiste Queru
7f6e9de133 am dde686e2: (-s ours) am 08d3c6e5: am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)" 
* commit 'dde686e2bdf7ea679dae4fd4edbf94c71802dc28':
  Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
 2012-01-20 16:32:45 -08:00
Jean-Baptiste Queru
1aecf7be2c am a1e87397: (-s ours) am 7ae84204: am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)" 
* commit 'a1e873975704814416ee4d5023bf0740ec195ec0':
  Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
 2012-01-20 16:30:21 -08:00
Jean-Baptiste Queru
f63efc7bde am d6b5584b: (-s ours) am 97aa8ee8: Merge ee4618bc 
* commit 'd6b5584b67f8a2f3d8ea20d748652673d5761e33':
  Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
 2012-01-20 16:28:04 -08:00
Jean-Baptiste Queru
1db68b3e47 am fd266b36: (-s ours) am 36b48c30: am c318bbb0: Merge "Rename (IF_)LOG() to (IF_)ALOG()" 
* commit 'fd266b36826aa6dd8cd3fa00c159a094423899fb':
  Rename (IF_)LOG() to (IF_)ALOG()
 2012-01-20 16:25:45 -08:00
Justin Ho
32c4388ffa am abc90a7b: (-s ours) am 820b45c0: Merge "DO NOT MERGE Revert "Fix issue #5823276: home repaints after full-screen app is exited"" into ics-mr1 
* commit 'abc90a7b48b058379a50a426bd0d2769ac7229b6':
  DO NOT MERGE Revert "Fix issue #5823276: home repaints after full-screen app is exited"
 2012-01-20 16:23:03 -08:00
Jeff Brown
fc14b7a857 Merge "Delete dead code." 2012-01-20 16:20:24 -08:00
Wink Saville
50c5167bbc Merge "Additional logging information for Card Application Toolkit/SIM Toolkit" 2012-01-20 15:56:56 -08:00
Robert Ly
2c8fd0dfbe am cdc1ea03: am 4e552533: resolved conflicts for merge of b078d942 to ics-mr1 
* commit 'cdc1ea03130763963fe6c179ed1f5ec14d6c7750':
  cherrypick from master docs: Renderscript changes Change-Id: Ic84b7d8c5c48e118f337e60c8bb5b8bc68b0da16
 2012-01-20 15:52:32 -08:00
The Android Open Source Project
045b505dc2 am 5d0c713a: Reconcile with ics-mr1-release 
* commit '5d0c713a87e9fd3cc7a775092aef9fc1194c7440':
 2012-01-20 15:52:27 -08:00
Robert Ly
0a1cd6f664 am ab8f1ba0: am 12310ee8: am 9575a1ab: Merge "docs: wifi direct" into ics-mr0 
* commit 'ab8f1ba0ec9d66db2f653b08f4caa24a27b3a996':
  docs: wifi direct
 2012-01-20 15:52:07 -08:00
Jim Miller
237c720c90 am ab9601cd: am 230a7092: Merge "Fix 5863053: Add method to lock screen immediately." into ics-mr1 
* commit 'ab9601cdbb95ae94088750eff9a926a572c1a4d6':
  Fix 5863053: Add method to lock screen immediately.
 2012-01-20 15:48:21 -08:00
Glenn Kasten
498713533b Merge "Fix warning for redundant typedef" 2012-01-20 15:06:01 -08:00
Robert Greenwalt
81acea1e17 Merge "Stop using shared DUN APN when tethering stops." 2012-01-20 14:35:41 -08:00
Eino-Ville Talvala
39d22241e1 Merge "Add ANativeWindow timestamp support to camera service." 2012-01-20 14:32:22 -08:00
Robert Greenwalt
d1a7460920 Merge "Log netd traffic nicely." 2012-01-20 14:24:15 -08:00
Jeff Brown
b1ea19c09b Merge "Initialize SQLite as part of the android runtime." 2012-01-20 14:07:59 -08:00
Gilles Debunne
43414fbb52 Merge "Touch moves cursor in text refactored" 2012-01-20 14:06:19 -08:00
Andreas Huber
3b03ffe05e Merge "Starhub RTSP apparently does not establish time on all tracks" 2012-01-20 13:43:39 -08:00
Glenn Kasten
8cfd833c3e Merge "Fix typos in string constants" 2012-01-20 12:16:06 -08:00
Glenn Kasten
43e5bc529b Merge "Remove dead file include/media/thread_init.h" 2012-01-20 12:15:38 -08:00
Glenn Kasten
c7a184d946 Merge "Remove redundant get()" 2012-01-20 12:14:32 -08:00
Dianne Hackborn
98bd6e7708 am 1bae8066: Merge "Fix issue #5823276 again: home repaints after full-screen app is exited" into ics-mr1 
* commit '1bae80668cc1d12bb4a4b93bce1960b2601de131':
  Fix issue #5823276 again: home repaints after full-screen app is exited
 2012-01-20 12:03:47 -08:00
Dianne Hackborn
e2b2ee959a Merge "Fix issue #5823276 again: home repaints after full-screen app is exited" into ics-mr1 2012-01-20 12:01:51 -08:00
Glenn Kasten
2a216a47eb Merge "Move memcpy_to_i16_from_u8 to audio_utils" 2012-01-20 11:49:04 -08:00
Daniel Sandler
798f073a62 am 4d3161f3: Merge "Always show appropriate mobile service label." into ics-mr1 
* commit '4d3161f379195302b720e120c5e6b65a0adfaf8c':
  Always show appropriate mobile service label.
 2012-01-20 11:31:10 -08:00
Daniel Sandler
cec0a8e6a4 Merge "Always show appropriate mobile service label." into ics-mr1 2012-01-20 11:28:44 -08:00
Jeff Brown
c15791f7c7 am ad1f4a2c: Merge "Implement a max time bound for rotation. (DO NOT MERGE)" into ics-mr1 
* commit 'ad1f4a2ca825b8524c6bed494a7cf3ca70ee7e28':
  Implement a max time bound for rotation.  (DO NOT MERGE)
 2012-01-20 11:26:46 -08:00
Jeff Brown
33700dff16 am 5d58eb06: Merge "Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)" into ics-mr1 
* commit '5d58eb06bcc8671bae72fb2389a9929e106131cc':
  Fix a few memory leaks in the input dispatcher.  (DO NOT MERGE)
 2012-01-20 11:26:43 -08:00
Jeff Brown
2c0b7fbafa Merge "Implement a max time bound for rotation. (DO NOT MERGE)" into ics-mr1 2012-01-20 11:24:13 -08:00
Jeff Brown
0428b94c03 Merge "Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)" into ics-mr1 2012-01-20 11:24:01 -08:00
Gilles Debunne
0c62715893 Merge "AOOB in AutoComplete" 2012-01-20 10:27:10 -08:00
Gilles Debunne
9341357e77 Merge "Make sure text selection always starts" 2012-01-20 10:27:00 -08:00
The Android Open Source Project
ccbb697798 Reconcile with ics-mr1-release 
Change-Id: I97a21a76245bb9212aab17c3e3c4856963d64b6c
 2012-01-20 10:25:28 -08:00
Glenn Kasten
094cf42111 Merge "Remove dead setRingerMode(mode, mask)" 2012-01-20 10:07:06 -08:00
Glenn Kasten
64dc252ee4 Merge "Fix build warning for void * arithmetic" 2012-01-20 08:32:45 -08:00
Pin Ting
72982710df Merge "Fixes some javadoc." 2012-01-20 01:37:12 -08:00
Jeff Brown
3e43730c22 Merge "Don't need to link to libsqlite from media JNI library." 2012-01-19 19:54:16 -08:00