ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity
43,067 Commits 2 Branches 0 Tags 54 MiB
6c48805c1c
Commit Graph

43067 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jim Miller
b618fe6b34 am eaa11a72: Merge "Fix 5797764: Increase lock screen\'s thread priority" into ics-mr1 
* commit 'eaa11a723150f1ea79446d7ba4bf77eb47b73337':
  Fix 5797764: Increase lock screen's thread priority
 2012-01-20 15:26:42 -08:00
Jim Miller
27e1118292 Merge "Fix 5797764: Increase lock screen's thread priority" into ics-mr1 2012-01-20 15:24:20 -08:00
Glenn Kasten
498713533b Merge "Fix warning for redundant typedef" 2012-01-20 15:06:01 -08:00
Justin Ho
f22a3b9825 am b09f6f96: Merge "Update WiMAX assets to match new style Bug: 5724605" into ics-mr1 
* commit 'b09f6f96e3583da320b69486869bc98fd463735e':
  Update WiMAX assets to match new style Bug: 5724605
 2012-01-20 14:50:30 -08:00
Justin Ho
4989420b27 Merge "Update WiMAX assets to match new style Bug: 5724605" into ics-mr1 2012-01-20 14:48:51 -08:00
Daniel Sandler
aa6598472a am 639ed754: Hide mobile RSSI on devices without mobile data. 
* commit '639ed754bba866d2a47ef7ca58e56806b546b149':
  Hide mobile RSSI on devices without mobile data.
 2012-01-20 14:40:26 -08:00
Robert Greenwalt
81acea1e17 Merge "Stop using shared DUN APN when tethering stops." 2012-01-20 14:35:41 -08:00
Justin Ho
d814b614ef am 70e21c92: Merge "New out-of-service RSSI." into ics-mr1 
* commit '70e21c927afeff05d8f26e9df2f36785ca19fdfd':
  New out-of-service RSSI.
 2012-01-20 14:35:09 -08:00
Justin Ho
849c08b732 Merge "New out-of-service RSSI." into ics-mr1 2012-01-20 14:33:07 -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
Jeff Brown
eaec3d7bae Merge "Clean up SQLiteDebug natives." 2012-01-19 19:54:05 -08:00
Jeff Brown
0a2df4995f Merge "Remove custom SQLITE_UNCLOSED error code." 2012-01-19 19:53:38 -08:00
James Dong
7e16e907dd Merge "Remove obsolete TODO comments" 2012-01-19 18:53:27 -08:00
Romain Guy
9e9942918b Merge "Fix build" 2012-01-19 18:16:11 -08:00
Romain Guy
2e47bf1e49 Merge "Remove unused code" 2012-01-19 17:42:10 -08:00
Romain Guy
644a23677d Merge "Deprecate unused APIs" 2012-01-19 17:34:26 -08:00
Jean-Baptiste Queru
2f6bc1c106 am c3c36b4f: am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT" 
* commit 'c3c36b4fe5863c8ac0ea5470be633e8fade9c483':
  Rename LOG_ASSERT to ALOG_ASSERT
 2012-01-19 17:28:34 -08:00
Jean-Baptiste Queru
64efe6e47a am 12b7da69: am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)" 
* commit '12b7da69957ef894ce5134989e38479c64308ea1':
  Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
 2012-01-19 17:28:30 -08:00
Jean-Baptiste Queru
1f7552fadf am f3f650db: am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)" 
* commit 'f3f650db96d40014a0203393c585c368b0dd7a9a':
  Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
 2012-01-19 17:28:26 -08:00
Jean-Baptiste Queru
d3ed2f2e33 am 08d3c6e5: am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)" 
* commit '08d3c6e5ba5c3e5fcc386b07efa709325d45b9ff':
  Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
 2012-01-19 17:28:22 -08:00
Jean-Baptiste Queru
9cb49d5854 am 7ae84204: am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)" 
* commit '7ae84204c14b4abff70fcc19c3c33de2591df34b':
  Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
 2012-01-19 17:28:18 -08:00
Jean-Baptiste Queru
364cc01b24 am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT" 
* commit '9d25b82d280c2d979d500e7da4447148f32f820b':
  Rename LOG_ASSERT to ALOG_ASSERT
 2012-01-19 17:26:16 -08:00
Jean-Baptiste Queru
1d151e1aba am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)" 
* commit '6df477be186233e36fc370c4d2db6c1ed928a740':
  Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
 2012-01-19 17:26:12 -08:00
Jean-Baptiste Queru
29964df372 am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)" 
* commit 'a826f9e2c4f6329d8d48c927f6e942e78ffaf92f':
  Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
 2012-01-19 17:26:08 -08:00
Jean-Baptiste Queru
381857ed67 am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)" 
* commit '4f367f3387887c538c81c34cc8becaea6fa5e430':
  Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
 2012-01-19 17:26:03 -08:00