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

24440 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Laurent
84440ee9aa am 83904eb5: am 27a308d3: Merge "Fix issue 2667797: [Audio Effect Framework] new base class and binder interfaces for effect control." into kraken 2010-05-26 11:43:00 -07:00
Mathias Agopian
b3ece2d595 am eaac2761: am 64f7549b: Merge "fix [2712278] The preview buffer left some black borders in left and bottom edges" into kraken 2010-05-26 11:42:51 -07:00
Yu Shan Emily Lau
cbc8270c7e am 393f5698: am f35ce7f8: am 6e0967b3: am b0016e2b: Merge "Added the runtime parameters for the mediarecorder stress test. Set the total number of the stress loops of camera preview memory test to 200." into froyo 2010-05-26 11:42:39 -07:00
Jim Miller
5ee2a771b5 am 14f56a0b: am b35cd7dd: Merge "Fix 2667859: change text back to default size" into kraken 2010-05-26 11:42:33 -07:00
Robert Greenwalt
585d6e11af Merge "resolved conflicts for merge of 3cd6a3e3 to master" 2010-05-26 11:40:53 -07:00
Dmitry Shmidt
3cc02cbf90 Merge "bugreport: wifi: Add list of networks" 2010-05-26 11:32:57 -07:00
Andreas Huber
e08d5ccfa0 am a581a776: Merge "Squashed commit of the following:" into kraken 2010-05-26 11:22:49 -07:00
Andreas Huber
a581a77640 Merge "Squashed commit of the following:" into kraken 2010-05-26 11:21:06 -07:00
Dmitry Shmidt
631e0f163a bugreport: wifi: Add list of networks 
Change-Id: I0271bf1f2cac874c1801658a81a3dcf7533da781
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2010-05-26 10:57:11 -07:00
Robert Greenwalt
d1c3ea6a21 resolved conflicts for merge of 3cd6a3e3 to master 
Change-Id: If3e45cc3494b2c52a1f1dcc19deff763a50498d7
 2010-05-26 10:37:48 -07:00
Vasu Nori
23a42230af Merge "when sqlite returns SQLITE_OK on SQLITEStatement.execute(), ignore it" 2010-05-26 10:27:40 -07:00
Vasu Nori
d72ec5f29d when sqlite returns SQLITE_OK on SQLITEStatement.execute(), ignore it 
if it is not ignored AND if SQLITEStatement.execute() is called with a SELECT
or a pragma or some sql statement that returns data, caller gets an exception
with a weird error: "error code 100: unknown error"
to avoid confusion generated by this exception, just write a warning
and ignore the returned data.
Change-Id: I8f0225ceff8f92e32a58f323551e5ada6df63593
 2010-05-26 10:14:41 -07:00
Kristian Monsen
ffa5de2e07 Merge "Display index and count when running layout tests" 2010-05-26 03:05:08 -07:00
Eric Laurent
c6ea353728 Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO. 
The problem is that when an input stream is opened for record over bluetooth SCO, the kernel
mono audio device should be opened in RW mode to allow further use of this same device by an output stream
also routed to bluetooth SCO.
This does not happen because of a bug in AudioSystem::isBluetoothScoDevice() that does not return true
when the device is DEVICE_IN_BLUETOOTH_SCO_HEADSET (input device for blurtooth SCO).

Change-Id: I9100e972931d8142295c7d64ec06e31304407586
 2010-05-26 01:13:36 -07:00
Eric Laurent
83904eb5f7 am 27a308d3: Merge "Fix issue 2667797: [Audio Effect Framework] new base class and binder interfaces for effect control." into kraken 2010-05-25 23:49:53 -07:00
Eric Laurent
27a308d309 Merge "Fix issue 2667797: [Audio Effect Framework] new base class and binder interfaces for effect control." into kraken 2010-05-25 23:48:30 -07:00
Jim Miller
92c1571f0a Fix 2584857: Reset grabbed state when SlidingTab visibility changes 
This fixes a case where the widget is hidden while the grabbed
state is set. The result is that the host of the widget is never
informed that the grabbed state changed.

Change-Id: I78b41cff0e31e982a3b46f0319260ba59815092c
 2010-05-25 19:20:36 -07:00
Mathias Agopian
eaac276160 am 64f7549b: Merge "fix [2712278] The preview buffer left some black borders in left and bottom edges" into kraken 2010-05-25 17:57:08 -07:00
Mathias Agopian
64f7549b0e Merge "fix [2712278] The preview buffer left some black borders in left and bottom edges" into kraken 2010-05-25 17:56:07 -07:00
Mathias Agopian
2ce19af45b fix [2712278] The preview buffer left some black borders in left and bottom edges 
we were incorrectly flagging push_buffer surfaces as invalid

Change-Id: I4dfd4ffbbe8a71f7e23e835db8d71966416c29bb
 2010-05-25 17:51:34 -07:00
Yu Shan Emily Lau
393f5698a0 am f35ce7f8: am 6e0967b3: am b0016e2b: Merge "Added the runtime parameters for the mediarecorder stress test. Set the total number of the stress loops of camera preview memory test to 200." into froyo 2010-05-25 17:46:46 -07:00
Yu Shan Emily Lau
f35ce7f8ee am 6e0967b3: am b0016e2b: Merge "Added the runtime parameters for the mediarecorder stress test. Set the total number of the stress loops of camera preview memory test to 200." into froyo 
Merge commit '6e0967b3c4561e188df72f478baf16c6627b12be' into kraken

* commit '6e0967b3c4561e188df72f478baf16c6627b12be':
  Added the runtime parameters for the mediarecorder stress test.
 2010-05-25 17:44:46 -07:00
Yu Shan Emily Lau
6e0967b3c4 am b0016e2b: Merge "Added the runtime parameters for the mediarecorder stress test. Set the total number of the stress loops of camera preview memory test to 200." into froyo 
Merge commit 'b0016e2b2162c916289d022f1572c0bc95158543' into froyo-plus-aosp

* commit 'b0016e2b2162c916289d022f1572c0bc95158543':
  Added the runtime parameters for the mediarecorder stress test.
 2010-05-25 17:42:29 -07:00
Yu Shan Emily Lau
b0016e2b21 Merge "Added the runtime parameters for the mediarecorder stress test. Set the total number of the stress loops of camera preview memory test to 200." into froyo 2010-05-25 17:40:51 -07:00
Jim Miller
14f56a0bd7 am b35cd7dd: Merge "Fix 2667859: change text back to default size" into kraken 2010-05-25 17:14:50 -07:00
Jim Miller
b35cd7dde5 Merge "Fix 2667859: change text back to default size" into kraken 2010-05-25 17:13:18 -07:00
Jim Miller
bae698cd54 Fix 2667859: change text back to default size 
This reverts a change described in the above bug where
the font size got changed to 22dip.

Change-Id: I42e2dc06e94aba003fa00032b265c986959ce939
 2010-05-25 16:53:45 -07:00
Yu Shan Emily Lau
48584d7b8f Added the runtime parameters for the mediarecorder stress test. 
Set the total number of the stress loops of camera preview memory test to 200.

Change-Id: I5a0278095155afd669ffee9bd599ddfffdcc42bf
 2010-05-25 16:42:57 -07:00
Robert Greenwalt
3cd6a3e353 am ac53a8a1: am 88ccecf5: am d1055a25: Make the NTP Cache max-age gservices-settable 2010-05-25 16:17:23 -07:00
Robert Greenwalt
ac53a8a135 am 88ccecf5: am d1055a25: Make the NTP Cache max-age gservices-settable 
Merge commit '88ccecf573a52648052bc9c7858f345776f76e0e' into kraken

* commit '88ccecf573a52648052bc9c7858f345776f76e0e':
  Make the NTP Cache max-age gservices-settable
 2010-05-25 16:15:37 -07:00
Robert Greenwalt
88ccecf573 am d1055a25: Make the NTP Cache max-age gservices-settable 
Merge commit 'd1055a250c00b0c2516ec406a8cf9a5ab1c0b7ae' into froyo-plus-aosp

* commit 'd1055a250c00b0c2516ec406a8cf9a5ab1c0b7ae':
  Make the NTP Cache max-age gservices-settable
 2010-05-25 16:13:22 -07:00
Robert Greenwalt
d1055a250c Make the NTP Cache max-age gservices-settable 
Trying to make Throttle polling more energy efficient.

bug:2708119
Change-Id: I2b75639e202dcbcee11047c43407a22de04ce350
 2010-05-25 15:54:52 -07:00
Daisuke Miyakawa
a14aded514 Merge "Add KDDI/Softbank to available Shift_Jis mapping." 2010-05-25 15:22:35 -07:00
Derek Sollenberger
03e4891571 Refactoring more webview zoom code into ZoomManager. 
This CL is #2 of multiple CL's to remove the zoom code
from webview and place it into webkit.ZoomManager. Each
commit is only part of the entire refactoring so there
are many ZoomManager.* variables still referenced from
WebView.

Change-Id: I21f6517dff46b65a277bc67120ffabe043098e5e
http://b/2671604
 2010-05-25 18:04:06 -04:00
Andreas Huber
5f3004c1f5 am 779b9b82: am f7617d36: Merge "Support for thumbnail extraction in the Matroska extractor." into kraken 2010-05-25 14:20:46 -07:00
Andreas Huber
779b9b82af am f7617d36: Merge "Support for thumbnail extraction in the Matroska extractor." into kraken 2010-05-25 14:19:13 -07:00
Andreas Huber
f7617d3601 Merge "Support for thumbnail extraction in the Matroska extractor." into kraken 2010-05-25 14:16:23 -07:00
Daisuke Miyakawa
df3f1cc3fe Add KDDI/Softbank to available Shift_Jis mapping. 
Bug: 2689523
Change-Id: I5140bd02a5e30b323eb19b1b0eb2dcf17027f878
 2010-05-25 14:10:09 -07:00
Andreas Huber
6bdf2edba4 Support for thumbnail extraction in the Matroska extractor. 
Change-Id: I56f13fc4868baffe0bb8c2484d2753c766a73960
related-to-bug: 2483739
 2010-05-25 13:41:40 -07:00
Eric Laurent
2bdc3e1a2f am e205dd34: am 06169761: Merge "Fix the simulator build broken by commit 5fe37c6838de9fbd959ad19ba44aa3d00d1b4e6f" into kraken 2010-05-25 12:46:12 -07:00
Eric Laurent
e205dd34a5 am 06169761: Merge "Fix the simulator build broken by commit 5fe37c6838de9fbd959ad19ba44aa3d00d1b4e6f" into kraken 2010-05-25 12:44:08 -07:00
Eric Laurent
0616976128 Merge "Fix the simulator build broken by commit 5fe37c6838de9fbd959ad19ba44aa3d00d1b4e6f" into kraken 2010-05-25 12:42:53 -07:00
Eric Laurent
a9d635d608 Fix the simulator build broken by commit 5fe37c6838de9fbd959ad19ba44aa3d00d1b4e6f 
Change-Id: Ibf6aebfec60cd7f807c3e49f0dbb5ab8e86bcdc1
 2010-05-25 12:38:34 -07:00
Kristian Monsen
521d9a7986 Display index and count when running layout tests 
Change-Id: I8b925784aead96a1be6344d654d0376dee2047eb
 2010-05-25 20:12:47 +01:00
Marco Nelissen
bb3a8c5ea2 Merge "Allow root to set the mount state as well, so that the simulator can use the fake sd card." 2010-05-25 12:04:03 -07:00
Andreas Huber
19a0913a5b am 1a777cd4: am c6c62e12: Support for ogg(vorbis) metadata in stagefright including album art. 2010-05-25 11:35:18 -07:00
Andreas Huber
1a777cd44a am c6c62e12: Support for ogg(vorbis) metadata in stagefright including album art. 2010-05-25 11:33:39 -07:00
Wink Saville
97692e6da2 Merge "Add needsOtaServiceProvisioning to Phone." 2010-05-25 11:20:30 -07:00
Andreas Huber
c6c62e12c9 Support for ogg(vorbis) metadata in stagefright including album art. 
Change-Id: I0c8c0136cebe2d2d97caabb7bc0c65be86329dbb
related-to-bug: 2713414
 2010-05-25 11:20:29 -07:00
Eric Laurent
de5a036da7 Merge "Fix issue 2641884: Bluetooth volume is dependent on in call volume." 2010-05-25 10:25:48 -07:00