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

27347 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Egnor
7d72e5ad7c am b9a8509a: am 499bee34: Merge "Remove a log message Jason doesn\'t like" into gingerbread 
Merge commit 'b9a8509a6fd768f9be6de897e0a945197b64e7cf'

* commit 'b9a8509a6fd768f9be6de897e0a945197b64e7cf':
  Remove a log message Jason doesn't like
 2010-07-27 10:32:54 -07:00
Dan Egnor
b9a8509a6f am 499bee34: Merge "Remove a log message Jason doesn\'t like" into gingerbread 
Merge commit '499bee34c40945f898b7561ca7792ded5b974852' into gingerbread-plus-aosp

* commit '499bee34c40945f898b7561ca7792ded5b974852':
  Remove a log message Jason doesn't like
 2010-07-27 10:28:38 -07:00
Dan Egnor
499bee34c4 Merge "Remove a log message Jason doesn't like" into gingerbread 2010-07-27 10:22:58 -07:00
Mike Lockwood
bb2b2a996b MTP host: Reduce buffer size for readObject so we don't clog our pipe. 
Change-Id: I24d2b1551af5843e48c0a63b84925b3a6451e36a
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-07-27 12:38:33 -04:00
Mike Lockwood
456d8e6e67 MTP: Turn off excessive logging 
Change-Id: Ib0dd8cb99efa324d0b4e742bffeb913d6122ace2
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-07-27 12:38:29 -04:00
Joe Onorato
d596d5115c am 070433ed: am 76d9bf52: am 8c65ee2d: Merge "Add a method to let a properly permissioned app directly manipulate the user activity timeout. We should come up with a better API for this, but this is for a last minute power manager hack to turn off the screen sooner a 
Merge commit '070433edee72de5fd9b93ddf055f74277f0deff4'

* commit '070433edee72de5fd9b93ddf055f74277f0deff4':
  Add a method to let a properly permissioned app directly
 2010-07-27 09:26:26 -07:00
Joe Onorato
070433edee am 76d9bf52: am 8c65ee2d: Merge "Add a method to let a properly permissioned app directly manipulate the user activity timeout. We should come up with a better API for this, but this is for a last minute power manager hack to turn off the screen sooner after a phone 
Merge commit '76d9bf52f31b8f31f64348b736422861c90ab463' into gingerbread-plus-aosp

* commit '76d9bf52f31b8f31f64348b736422861c90ab463':
  Add a method to let a properly permissioned app directly
 2010-07-27 09:19:48 -07:00
Joe Onorato
76d9bf52f3 am 8c65ee2d: Merge "Add a method to let a properly permissioned app directly manipulate the user activity timeout. We should come up with a better API for this, but this is for a last minute power manager hack to turn off the screen sooner after a phone call ends." i 
Merge commit '8c65ee2d509db7dcb50ce4530d52eb5bdca3f917' into gingerbread

* commit '8c65ee2d509db7dcb50ce4530d52eb5bdca3f917':
  Add a method to let a properly permissioned app directly
 2010-07-27 09:14:42 -07:00
Joe Onorato
8c65ee2d50 Merge "Add a method to let a properly permissioned app directly manipulate the user activity timeout. We should come up with a better API for this, but this is for a last minute power manager hack to turn off the screen sooner after a phone call ends." into froyo 2010-07-27 09:05:05 -07:00
Maksymilian Osowski
6688214f7f Merge "Moved practically all of the prerefactoring functionality to the new design." 2010-07-27 08:17:00 -07:00
Maksymilian Osowski
5f0ccd76a8 Moved practically all of the prerefactoring functionality to the new design. 
Renamed LayoutTestsRunner activity to TestsListActivity. It will be responsible for restrating the Executer after the crash. Now it only starts
it.
Renamed LayoutTestsRunnerThread to TestsListPreloaderThread. It only preloads tests now.
LayoutTest class is no longer needed, its functionality is in LayoutTestsExecuter.
Most of the functionality from LayoutTestsRunnerThread is now in ManagerService.

Change-Id: I08924d949ceb9f8816888bc8e795256d0542fa99
 2010-07-27 16:15:35 +01:00
Mike Lockwood
1a987b8e45 Try to fix the sim build. 
Change-Id: I6e94c938263b2fd1931ed60c26af1134ff035455
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-07-27 10:55:26 -04:00
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
Dan Egnor
c13978afe3 Remove a log message Jason doesn't like 
Bug: 2856942
Change-Id: Ifc5cfc076bfed0918bb203ed9c82a42092ac3939
 2010-07-26 15:32:00 -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