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

27333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Laurent
69bcec0a10 Merge "resolved conflicts for merge of d306cc81 to master" 2010-07-27 05:33:23 -07:00
Steve Block
3f617506c1 Merge "Add some dom/xtml/level3 LayoutTests to the DumpRenderTree ignore results list" 2010-07-27 02:53:10 -07:00
Ben Murdoch
acd17c0ad0 Merge "Merge WebKit at r63859 : Implement layoutTestController.dumpAsText(boolean) in DumpRenderTree." 2010-07-27 02:46:23 -07:00
Eric Laurent
b008e9b128 resolved conflicts for merge of d306cc81 to master 
Change-Id: Ib593b7719a837de12605e8c75904634843298ba1
 2010-07-27 02:41:41 -07:00
Eric Laurent
d306cc8192 am ca57d1cc: Audio Effects: added methods to effects java classes to store and load current effect settings in a single call. 
Merge commit 'ca57d1cc89d65dfbd59c749c5736574cd08c7bd3' into gingerbread-plus-aosp

* commit 'ca57d1cc89d65dfbd59c749c5736574cd08c7bd3':
  Audio Effects: added methods to effects java classes to store and load current effect settings in
 2010-07-27 01:54:30 -07:00
Eric Laurent
ca57d1cc89 Audio Effects: added methods to effects java classes to store and load current effect settings in 
a single call.

Addional changes:
- Fixed simulator build
- Use effect interface UUIDs from OpenSL ES includes when available
- Added cleanspec rules to remove now obsolete test effect libraries
- Fixed bug in AudioEffect JNI setParameter function.

Change-Id: Ic25ddb135e2cec5a68c181d727321f5ac7a1ab6b
 2010-07-27 00:41:31 -07:00
Dirk Dougherty
84aa506685 am 68344ba8: am 2b989e1f: am 0ac8ac30: Doc change: Add docs for licensing service. 
Merge commit '68344ba8a8833f50b06c02349bc5d5fcb63c242f'

* commit '68344ba8a8833f50b06c02349bc5d5fcb63c242f':
  Doc change: Add docs for licensing service.
 2010-07-26 20:06:28 -07:00
Dirk Dougherty
68344ba8a8 am 2b989e1f: am 0ac8ac30: Doc change: Add docs for licensing service. 
Merge commit '2b989e1f7d08efd51652b56b1cb1fef76a1e8ab1' into gingerbread-plus-aosp

* commit '2b989e1f7d08efd51652b56b1cb1fef76a1e8ab1':
  Doc change: Add docs for licensing service.
 2010-07-26 20:04:28 -07:00
Dirk Dougherty
2b989e1f7d am 0ac8ac30: Doc change: Add docs for licensing service. 
Merge commit '0ac8ac301d056604485aeca9ffe5ce8d1e63ef19' into gingerbread

* commit '0ac8ac301d056604485aeca9ffe5ce8d1e63ef19':
  Doc change: Add docs for licensing service.
 2010-07-26 20:01:12 -07:00
Brad Fitzpatrick
19bc67e806 am b5daea8a: am eacf0ecd: Merge "Fix StrictMode for Binder.dump()" into gingerbread 
Merge commit 'b5daea8a9f98a7c04377e3f5ad6742add1b925d5'

* commit 'b5daea8a9f98a7c04377e3f5ad6742add1b925d5':
  Fix StrictMode for Binder.dump()
 2010-07-26 19:51:04 -07:00
Brad Fitzpatrick
b5daea8a9f am eacf0ecd: Merge "Fix StrictMode for Binder.dump()" into gingerbread 
Merge commit 'eacf0ecd00f77718ac4570077d729e33b6c320f4' into gingerbread-plus-aosp

* commit 'eacf0ecd00f77718ac4570077d729e33b6c320f4':
  Fix StrictMode for Binder.dump()
 2010-07-26 19:46:45 -07:00
Brad Fitzpatrick
eacf0ecd00 Merge "Fix StrictMode for Binder.dump()" into gingerbread 2010-07-26 19:44:50 -07:00
Adam Powell
6b164fe048 Merge "Moved context modes into view, renamed to action modes" 2010-07-26 18:02:12 -07:00
Jean-Michel Trivi
808616f9cc am fa95b474: am 4a60d618: Fix NPE in TextToSpeech with setLanguage(null) 
Merge commit 'fa95b474fc75849470546b0f18e58b2ca1ed2129'

* commit 'fa95b474fc75849470546b0f18e58b2ca1ed2129':
  Fix NPE in TextToSpeech with setLanguage(null)
 2010-07-26 17:56:20 -07:00
Jean-Michel Trivi
fa95b474fc am 4a60d618: Fix NPE in TextToSpeech with setLanguage(null) 
Merge commit '4a60d61887a20d349e5eb38900dfbcaab06630fc' into gingerbread-plus-aosp

* commit '4a60d61887a20d349e5eb38900dfbcaab06630fc':
  Fix NPE in TextToSpeech with setLanguage(null)
 2010-07-26 17:53:57 -07:00
Mike Lockwood
133dfe7e98 Merge "Simple command line test tool for MTP host." 2010-07-26 17:51:16 -07:00
Mike Lockwood
1979628e1e Merge "CameraBrowser: Add support for copying files from camera to internal storage." 2010-07-26 17:51:02 -07:00
Mike Lockwood
2f493f0ff1 Merge "MTP host: Add support for reading files from an MTP device via ParcelFileDescriptor" 2010-07-26 17:50:13 -07:00
Mike Lockwood
f7785521bf Merge "MTP: Don't request thumbnails for folder objects in MtpCursor" 2010-07-26 17:49:28 -07:00
Mike Lockwood
bc55034ef9 Merge "MTP: Add hard coded support to recognize a couple MTP music players for testing purposes." 2010-07-26 17:49:04 -07:00
Brad Fitzpatrick
eb75888e64 Fix StrictMode for Binder.dump() 
Change-Id: I378f5e3d6512d06b46248b9bb6d9c727e3f6bf1d
 2010-07-26 17:47:45 -07:00
Mike Lockwood
5fd1ff0aa3 Simple command line test tool for MTP host. 
Change-Id: Ifd13e1ca5d49a5477a9850d94d443a50bbc32ff1
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-07-26 20:47:35 -04:00
Mike Lockwood
ad0643a330 CameraBrowser: Add support for copying files from camera to internal storage. 
Change-Id: I00b765afec0558dfe27961bd0b2e01473c29fc22
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-07-26 20:43:26 -04:00
Mike Lockwood
bc4cb0bc79 MTP host: Add support for reading files from an MTP device via ParcelFileDescriptor 
Also added some support for sending files to the device that hasn't been debugged yet.
Add locking to MtpDevice to prevent it from attempting multiple transactions simultaneously.

Change-Id: I2b995ba0af086cc6920bd6b8c869f540ad78560a
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-07-26 20:40:45 -04:00
Mike Lockwood
f78b26a572 MTP: Don't request thumbnails for folder objects in MtpCursor 
Change-Id: I75a0a834ab746bed0a35883539c8dbc104789157
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-07-26 20:36:32 -04:00
Mike Lockwood
86187098ce MTP: Add hard coded support to recognize a couple MTP music players for testing purposes. 
Change-Id: I2d09d78e83d13cfb3edff02372a6fc34b1e4d8b1
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-07-26 20:33:02 -04:00
Adam Powell
6e34636749 Moved context modes into view, renamed to action modes 
ContextualMode renamed to ActionMode. Adds a reference to the action
bar and reduces confusion around things named "Context".

Change-Id: Ia5098b1d0799a0ece0810c34e6696eda039fb005
 2010-07-26 17:28:45 -07:00
Jason Sams
4687373078 Merge "Query the CPU count and use the result to determine if and how many worker threads we use." 2010-07-26 17:15:00 -07:00
Jason Sams
7f4d0c9705 Query the CPU count and use the result to determine 
if and how many worker threads we use.

Change-Id: I8fc1fb17aff835cfe8ed7c474287bccd532cbb29
 2010-07-26 17:12:55 -07:00
Wink Saville
fed1722ec8 Merge "Initial MockRilUnitTest." 2010-07-26 17:09:59 -07:00
Wink Saville
50dd565568 Initial MockRilUnitTest. 
Change-Id: I87d992b789f6fc28777f609b93497eed3053f560
 2010-07-26 17:01:10 -07:00
Jean-Michel Trivi
4a60d61887 Fix NPE in TextToSpeech with setLanguage(null) 
getLanguage() can return null, and pass it to setLanguage()
  in TextToSpeech.initTts()

Change-Id: I8046e94959404bd63b0a90bcc2dbf4018f77c110
 2010-07-26 16:11:58 -07:00
John Wang
78339f5f62 Merge "Add register methods in CallManager." 2010-07-26 14:02:03 -07:00
John Wang
cd35cb98a5 Add register methods in CallManager. 
Add register methods used by PhoneApp into CallManager class.

For most register methods, CallManager acts as an pass-through

register to handle register and unregister phone case.

Change-Id: I74ce4e6d8e66f49c12b43bae1b0def0c7597a449
 2010-07-26 13:49:48 -07:00
Alex Sakhartchouk
a51c2445a9 Merge "When font cache still has empty space, precache some commonly used characters to reduce studder." 2010-07-26 13:48:32 -07:00
Vasu Nori
fb16cbd9b2 add new API in SQLiteStatement to deprecate another. 
1. SQLIteStatement.executeUpdateDelete() replaces execute() - and returns the
number of rows changed.
2. let SQLiteDatabase.execSQL() call the above new API - which
means all CRUD statements by execSQL() are stored in prepared statement cache.
3. remove the following from SQLiteDatabase
     lastrowId
     lastchangecount()
     native_execSQL()

Change-Id: I4e93a09dc381f425c3ae6ccc331a7bf227491e22
 2010-07-26 13:00:07 -07:00
Eric Laurent
037644fbe4 am e80c30c6: am 00de7218: Merge "Fixed bug in vlm effect bunde wrapper effect init function." into gingerbread 
Merge commit 'e80c30c6b557fab2f5fc7a87c51018f5a8074338'

* commit 'e80c30c6b557fab2f5fc7a87c51018f5a8074338':
  Fixed bug in vlm effect bunde wrapper effect init function.
 2010-07-26 12:30:49 -07:00
Mike Lockwood
9765211b90 am 64f04a64: am 70736a6d: Merge "Avoid starting multiple threads in ShutdownThread" into gingerbread 
Merge commit '64f04a645ea4fd81cfb41fba23d9ba9e1279d416'

* commit '64f04a645ea4fd81cfb41fba23d9ba9e1279d416':
  Avoid starting multiple threads in ShutdownThread
 2010-07-26 12:30:28 -07:00
Eric Laurent
f4d9a21a4c am df5c3b50: am 739bf285: Merge "LVM release 1.04." into gingerbread 
Merge commit 'df5c3b5024276af8b44d00bb28ce620ab31e2365'

* commit 'df5c3b5024276af8b44d00bb28ce620ab31e2365':
  LVM release 1.04.
 2010-07-26 12:30:23 -07:00
Dianne Hackborn
9fb0bb8292 am b6022e3d: am 14bfa398: Infrastructure to report running services to developer. 
Merge commit 'b6022e3d500f248cf1abe94e8f1509e27ab25736'

* commit 'b6022e3d500f248cf1abe94e8f1509e27ab25736':
  Infrastructure to report running services to developer.
 2010-07-26 12:30:19 -07:00
Dianne Hackborn
fd1fbcad58 am ef1b9c6a: am 3ac8eb72: Update app label. 
Merge commit 'ef1b9c6aa7a9a4dd79823e47829a9ca894c06a0f'

* commit 'ef1b9c6aa7a9a4dd79823e47829a9ca894c06a0f':
  Update app label.
 2010-07-26 12:30:15 -07:00
Dianne Hackborn
4cca89c042 am 3a2ff74f: am 46730fc7: Fix handling of application disabled state. 
Merge commit '3a2ff74fa4c3f014555ec64fccc16e1b9f6d0111'

* commit '3a2ff74fa4c3f014555ec64fccc16e1b9f6d0111':
  Fix handling of application disabled state.
 2010-07-26 12:30:10 -07:00
Dianne Hackborn
48b9cbb046 am 443d884e: am 3bee5af8: Battery stats: start removing last stats, keep total discharge. 
Merge commit '443d884e16fad2e01a97aa788d4b30de53c94048'

* commit '443d884e16fad2e01a97aa788d4b30de53c94048':
  Battery stats: start removing last stats, keep total discharge.
 2010-07-26 12:30:06 -07:00
Mathias Agopian
bf23832acc am fed3c364: am eab07e5c: Merge "Report sensor events to BatteryStats service" into gingerbread 
Merge commit 'fed3c364e6fc6acc5e5836bd1370c3c278f8a248'

* commit 'fed3c364e6fc6acc5e5836bd1370c3c278f8a248':
  Report sensor events to BatteryStats service
 2010-07-26 12:30:01 -07:00
Mathias Agopian
be199f3e11 am 02c06410: am f88ed6c2: Merge "SensorService handles last known state properly" into gingerbread 
Merge commit '02c06410461e3880c6ad2c0d15637438113adb4e'

* commit '02c06410461e3880c6ad2c0d15637438113adb4e':
  SensorService handles last known state properly
 2010-07-26 12:29:56 -07:00
Steve Howard
a272756431 am a08a0a7b: am a13a02cd: New permission for non-purgeable cache downloads. 
Merge commit 'a08a0a7bee7ba09917b94e41c705a643c8e06a1a'

* commit 'a08a0a7bee7ba09917b94e41c705a643c8e06a1a':
  New permission for non-purgeable cache downloads.
 2010-07-26 12:29:49 -07:00
Eric Laurent
e80c30c6b5 am 00de7218: Merge "Fixed bug in vlm effect bunde wrapper effect init function." into gingerbread 
Merge commit '00de721859ca291d0e212a6970f0bd8b3a2f8428' into gingerbread-plus-aosp

* commit '00de721859ca291d0e212a6970f0bd8b3a2f8428':
  Fixed bug in vlm effect bunde wrapper effect init function.
 2010-07-26 12:25:37 -07:00
Mike Lockwood
64f04a645e am 70736a6d: Merge "Avoid starting multiple threads in ShutdownThread" into gingerbread 
Merge commit '70736a6d92767258543bb03ac22a705535d86341' into gingerbread-plus-aosp

* commit '70736a6d92767258543bb03ac22a705535d86341':
  Avoid starting multiple threads in ShutdownThread
 2010-07-26 12:25:31 -07:00
Eric Laurent
df5c3b5024 am 739bf285: Merge "LVM release 1.04." into gingerbread 
Merge commit '739bf285be7a154b92e74b069dff7dc8f7ffc2f3' into gingerbread-plus-aosp

* commit '739bf285be7a154b92e74b069dff7dc8f7ffc2f3':
  LVM release 1.04.
 2010-07-26 12:25:24 -07:00
Dianne Hackborn
b6022e3d50 am 14bfa398: Infrastructure to report running services to developer. 
Merge commit '14bfa398a4e8697ce5822861a684b7d1245e4a85' into gingerbread-plus-aosp

* commit '14bfa398a4e8697ce5822861a684b7d1245e4a85':
  Infrastructure to report running services to developer.
 2010-07-26 12:24:57 -07:00