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

65775 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
86fcb90f3b am 22d41843: Fix the build, for real 
* commit '22d418437e44587cb0fba4353515719453269189':
  Fix the build, for real
 2012-01-19 18:36:34 -08:00
Romain Guy
22d418437e Fix the build, for real 
Change-Id: I6263f7e5e3ae2f7efe045f8b464c0ed1b87fc793
 2012-01-19 18:33:25 -08:00
Romain Guy
dec35b81b7 am 90bd1873: Merge "Fix build" 
* commit '90bd18737a5ce16708003363683744cfd0480d83':
  Fix build
 2012-01-19 18:17:54 -08:00
Romain Guy
90bd18737a Merge "Fix build" 2012-01-19 18:16:11 -08:00
Romain Guy
65447287cb Fix build 
Change-Id: I0e0f6a613cdad3ec075da9b84e3532dd492f0162
 2012-01-19 18:15:24 -08:00
Romain Guy
3e77e8e59c am d2f0dcd1: Merge "Remove unused code" 
* commit 'd2f0dcd182fbc0423d206919e81f3845fb9b8155':
  Remove unused code
 2012-01-19 17:44:50 -08:00
Romain Guy
d2f0dcd182 Merge "Remove unused code" 2012-01-19 17:42:10 -08:00
Romain Guy
68fc1dfce0 Remove unused code 
Change-Id: Ife0a43f3cfe64a1e74401b10bf74d37cbeefb5af
 2012-01-19 17:41:39 -08:00
Romain Guy
4adbee3784 am bad12166: Merge "Deprecate unused APIs" 
* commit 'bad12166190a7e8087eb5db0ae8df9a4e5843fde':
  Deprecate unused APIs
 2012-01-19 17:37:10 -08:00
Romain Guy
bad1216619 Merge "Deprecate unused APIs" 2012-01-19 17:34:26 -08:00
Romain Guy
f9d9c065ed Deprecate unused APIs 
Change-Id: I0107e246b632dda96b8b025217936954f1f46283
 2012-01-19 17:16:38 -08:00
Andreas Huber
a867fd9d3c am fa78fe0d: Merge "Make sure the ThrottledSource reports the proper mime type" 
* commit 'fa78fe0d70fe7e6a9eb19680888b617ea57eaad4':
  Make sure the ThrottledSource reports the proper mime type
 2012-01-19 14:42:10 -08:00
Andreas Huber
fa78fe0d70 Merge "Make sure the ThrottledSource reports the proper mime type" 2012-01-19 14:40:44 -08:00
Jeff Brown
9095e32d07 am a6885fa3: Merge "Remove no longer needed EventHub usleep() optimization." 
* commit 'a6885fa366116c9dbc8ecba2abe32bf516912e8f':
  Remove no longer needed EventHub usleep() optimization.
 2012-01-19 14:21:23 -08:00
Jeff Brown
a6885fa366 Merge "Remove no longer needed EventHub usleep() optimization." 2012-01-19 14:19:28 -08:00
Andreas Huber
efbeb9b402 Make sure the ThrottledSource reports the proper mime type 
of the underlying source.

Change-Id: I7cfd5c9f10d4b07781ed82fbdc9bf3db2e86cf84
 2012-01-19 14:17:49 -08:00
Jeff Brown
214f459b2c Remove no longer needed EventHub usleep() optimization. 
This optimization is no longer needed now that the kernel evdev
driver's poll() implementation only wakes up the poll after
the final sync.

Change-Id: If237776861df9cfac3086e744d3bbf3484d4c53b
 2012-01-19 14:16:09 -08:00
Jeff Brown
38270b44ca am ea33f4bc: Merge "Fix line wrapping." 
* commit 'ea33f4bca5def40c75214dedb3ea63c70b2a462a':
  Fix line wrapping.
 2012-01-19 14:13:53 -08:00
Jeff Brown
ea33f4bca5 Merge "Fix line wrapping." 2012-01-19 14:11:47 -08:00
Jeff Brown
4130554b45 Fix line wrapping. 
Change-Id: I41199d1145d2435eee046a7e5006dcdce0986821
 2012-01-19 14:08:48 -08:00
Jeff Brown
8fdd6b0f14 am 3e8d7cfd: Merge "Clean up SQLite debugging code." 
* commit '3e8d7cfd1e6e65a60a9f6b7e174672dc9a281e49':
  Clean up SQLite debugging code.
 2012-01-19 14:08:23 -08:00
Jeff Brown
3e8d7cfd1e Merge "Clean up SQLite debugging code." 2012-01-19 14:05:39 -08:00
Jeff Brown
2a293b61cb Clean up SQLite debugging code. 
Deleted a bunch of dead / useless code.
Raised number of logged operations in dumpsys dbinfo to 20.

Change-Id: I88344ff57a978f200c1f0172141d91e430caa1a9
 2012-01-19 14:02:22 -08:00
Xavier Ducrohet
cdcd26fecd am cd836bbb: Merge "Fix broken drawCircle LayoutLib." 
* commit 'cd836bbb8be8f4c93d6086a30da616c3b00f859e':
  Fix broken drawCircle LayoutLib.
 2012-01-19 13:19:28 -08:00
Xavier Ducrohet
cd836bbb8b Merge "Fix broken drawCircle LayoutLib." 2012-01-19 13:17:43 -08:00
Eric Laurent
2182a085fc am e988e0c3: Merge "resolved conflicts for merge of 05683c85 to master" 
* commit 'e988e0c31ca16160dee1b7c689ac31cd70fe43a2':
  AudioFlinger: mix track only when really ready (2)
 2012-01-19 10:54:03 -08:00
Eric Laurent
e988e0c31c Merge "resolved conflicts for merge of 05683c85 to master" 2012-01-19 10:52:46 -08:00
Gilles Debunne
b64f106174 am b3ca0fe6: Merge "Touch slop added to double tap detection" 
* commit 'b3ca0fe66c1def11a04b18e6872318deb0340b9b':
  Touch slop added to double tap detection
 2012-01-19 10:24:59 -08:00
Gilles Debunne
50a04a8bdf am bdf7f965: Merge "Fixes around extract mode" 
* commit 'bdf7f9658044d4c55c4826a88a41822045557ee5':
  Fixes around extract mode
 2012-01-19 10:24:57 -08:00
Gilles Debunne
b3ca0fe66c Merge "Touch slop added to double tap detection" 2012-01-19 10:23:32 -08:00
Gilles Debunne
bdf7f96580 Merge "Fixes around extract mode" 2012-01-19 10:23:18 -08:00
Teng-Hui Zhu
a96ebe72d0 am de9f0036: Merge "Support full screen back to back playing using javascript" 
* commit 'de9f0036ef58a55ca89a3c427a462bd84b5751c3':
  Support full screen back to back playing using javascript
 2012-01-19 10:03:07 -08:00
Teng-Hui Zhu
de9f0036ef Merge "Support full screen back to back playing using javascript" 2012-01-19 10:00:40 -08:00
Eric Laurent
3562931af9 resolved conflicts for merge of 05683c85 to master 
Change-Id: I7846b7da8c5813b7a9b1f3f71aede0229689ff0d
 2012-01-19 10:00:02 -08:00
Glenn Kasten
33ddd1b2a4 am 00db1f52: Rename JNI implementation to match Java method 
* commit '00db1f52b1c12d3670a0419305aa7548f7932aa0':
  Rename JNI implementation to match Java method
 2012-01-19 09:51:40 -08:00
Glenn Kasten
00db1f52b1 Rename JNI implementation to match Java method 
android_media_AudioTrack_native_write renamed to
android_media_AudioTrack_native_write_byte, since the Java method name
is called native_write_byte.

Change-Id: I85ef092cf3f5a01d275fc4ef127b4b6d190139e8
 2012-01-19 07:42:11 -08:00
Glenn Kasten
2effb7385e am 92ecdd63: Merge "Fix incorrect includes of AudioTrack.h" 
* commit '92ecdd63033a53b3c6301a9dc94c2438e498f27b':
  Fix incorrect includes of AudioTrack.h
 2012-01-19 06:13:00 -08:00
Glenn Kasten
98db092e13 am adf10837: Merge "Simplify range check for audio_mode_t (continued)" 
* commit 'adf10837719627e725187e26a2e3654ba97245c8':
  Simplify range check for audio_mode_t (continued)
 2012-01-19 06:10:48 -08:00
Glenn Kasten
aec6d7de10 am 6808516e: Merge "Add units to time periods" 
* commit '6808516e8e2327ddf4a6b2f3528d3a4d3ff105b3':
  Add units to time periods
 2012-01-19 06:10:45 -08:00
Glenn Kasten
fb77fd5436 am f4a93d09: Merge "Use const const strings for arrays and pointers to strings" 
* commit 'f4a93d0965f5e4c6ea22798a83823174fa9f38eb':
  Use const const strings for arrays and pointers to strings
 2012-01-19 06:10:42 -08:00
Glenn Kasten
0a81ecf32c am 0d7a9979: Merge "For booleans, use ! instead of == false" 
* commit '0d7a9979651511eb69bab14068fc0bee5d1a8441':
  For booleans, use ! instead of == false
 2012-01-19 06:10:39 -08:00
Glenn Kasten
92ecdd6303 Merge "Fix incorrect includes of AudioTrack.h" 2012-01-19 06:10:37 -08:00
Glenn Kasten
035fb3cdf7 am e119bd14: Merge "Replace run-time stream types by compile-time" 
* commit 'e119bd144207b9b89ec7d52ee619bdbcda8ab497':
  Replace run-time stream types by compile-time
 2012-01-19 06:10:36 -08:00
Glenn Kasten
adf1083771 Merge "Simplify range check for audio_mode_t (continued)" 2012-01-19 06:09:20 -08:00
Glenn Kasten
6808516e8e Merge "Add units to time periods" 2012-01-19 06:09:05 -08:00
Glenn Kasten
f4a93d0965 Merge "Use const const strings for arrays and pointers to strings" 2012-01-19 06:08:53 -08:00
Glenn Kasten
0d7a997965 Merge "For booleans, use ! instead of == false" 2012-01-19 06:08:40 -08:00
Glenn Kasten
e119bd1442 Merge "Replace run-time stream types by compile-time" 2012-01-19 06:08:12 -08:00
Jeff Brown
594326d2a5 am 6534c0e0: Merge "Fix issues with reentrant SQLite triggers." 
* commit '6534c0e0548332801cffaa0977af165025030297':
  Fix issues with reentrant SQLite triggers.
 2012-01-18 18:33:03 -08:00
Jeff Brown
6534c0e054 Merge "Fix issues with reentrant SQLite triggers." 2012-01-18 18:31:06 -08:00