Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,375 Commits 3 Branches 0 Tags
8b67752c82a26e21fe0977cb5e201acf2e22824d
Commit Graph

27375 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad Fitzpatrick
8b67752c82 am 931ee98c: am b7304593: Merge "Cap the size of StrictMode buffering we do before calling DropBox." into gingerbread 
Merge commit '931ee98cc05aedaf0a7cdf0b7ec503a8586359f5'

* commit '931ee98cc05aedaf0a7cdf0b7ec503a8586359f5':
  Cap the size of StrictMode buffering we do before calling DropBox.
 2010-07-27 18:39:21 -07:00
Brad Fitzpatrick
931ee98cc0 am b7304593: Merge "Cap the size of StrictMode buffering we do before calling DropBox." into gingerbread 
Merge commit 'b73045935cd8ec5d1a1c5e7a7ca800448b5789ea' into gingerbread-plus-aosp

* commit 'b73045935cd8ec5d1a1c5e7a7ca800448b5789ea':
  Cap the size of StrictMode buffering we do before calling DropBox.
 2010-07-27 18:37:20 -07:00
Brad Fitzpatrick
b73045935c Merge "Cap the size of StrictMode buffering we do before calling DropBox." into gingerbread 2010-07-27 18:34:08 -07:00
Steve Howard
42d8f6f2fb am cb61d132: am 9b8e5566: Merge "One last change to current.xml for new download manager API" into gingerbread 
Merge commit 'cb61d132bc8ff26b7c81fb2fa7439808014f50b3'

* commit 'cb61d132bc8ff26b7c81fb2fa7439808014f50b3':
  One last change to current.xml for new download manager API
 2010-07-27 17:03:00 -07:00
Brad Fitzpatrick
c3a8c8a767 am a4ab2651: am 4d544376: am 86c035f0: Merge "COMMENT ONLY change to clarify ContentProvider documentation." into froyo 
Merge commit 'a4ab26513426bf86c51c3c9419efb148be3aca8e'

* commit 'a4ab26513426bf86c51c3c9419efb148be3aca8e':
  COMMENT ONLY change to clarify ContentProvider documentation.
 2010-07-27 17:02:56 -07:00
Steve Howard
82d0249f5b am 55020622: am 7feab347: Merge "Un-@hide new download manager public API." into gingerbread 
Merge commit '550206226b59ff116cc677121c82aa61eac966bc'

* commit '550206226b59ff116cc677121c82aa61eac966bc':
  Un-@hide new download manager public API.
 2010-07-27 16:59:50 -07:00
Steve Howard
cb61d132bc am 9b8e5566: Merge "One last change to current.xml for new download manager API" into gingerbread 
Merge commit '9b8e5566f99c55222db4127719440272f63a5361' into gingerbread-plus-aosp

* commit '9b8e5566f99c55222db4127719440272f63a5361':
  One last change to current.xml for new download manager API
 2010-07-27 16:56:52 -07:00
Steve Howard
9b8e5566f9 Merge "One last change to current.xml for new download manager API" into gingerbread 2010-07-27 16:55:14 -07:00
Brad Fitzpatrick
a4ab265134 am 4d544376: am 86c035f0: Merge "COMMENT ONLY change to clarify ContentProvider documentation." into froyo 
Merge commit '4d5443762bd2b44b28edc2f2f75728911d70eac1' into gingerbread-plus-aosp

* commit '4d5443762bd2b44b28edc2f2f75728911d70eac1':
  COMMENT ONLY change to clarify ContentProvider documentation.
 2010-07-27 16:54:40 -07:00
Brad Fitzpatrick
e73eb53125 Cap the size of StrictMode buffering we do before calling DropBox. 
Change-Id: I46ea767bd0153c745e9b7eff945dacf5130f8807
 2010-07-27 16:54:39 -07:00
Brad Fitzpatrick
4d5443762b am 86c035f0: Merge "COMMENT ONLY change to clarify ContentProvider documentation." into froyo 
Merge commit '86c035f0d176be9cb06b1e4f2390c25701417586' into gingerbread

* commit '86c035f0d176be9cb06b1e4f2390c25701417586':
  COMMENT ONLY change to clarify ContentProvider documentation.
 2010-07-27 16:52:12 -07:00
Steve Howard
f547d722f9 One last change to current.xml for new download manager API 
Change-Id: If88984ad64880a81e4dbb4ef9f8118cc52bb891f
 2010-07-27 16:50:07 -07:00
Brad Fitzpatrick
86c035f0d1 Merge "COMMENT ONLY change to clarify ContentProvider documentation." into froyo 2010-07-27 16:44:53 -07:00
Steve Howard
550206226b am 7feab347: Merge "Un-@hide new download manager public API." into gingerbread 
Merge commit '7feab3470156c7864fe159115d575c16f0974493' into gingerbread-plus-aosp

* commit '7feab3470156c7864fe159115d575c16f0974493':
  Un-@hide new download manager public API.
 2010-07-27 16:37:39 -07:00
Dan Egnor
6fcc0f073d COMMENT ONLY change to clarify ContentProvider documentation. 
Gets a little more specific about thread behavior, and makes
pointed comments about not doing too much work in onCreate().

Change-Id: I682f0eb7d7559babee901ed26642751a6ba0a1ea
 2010-07-27 16:32:17 -07:00
Steve Howard
7feab34701 Merge "Un-@hide new download manager public API." into gingerbread 2010-07-27 16:29:37 -07:00
Jean-Baptiste Queru
005cb6de07 Fix build 
Change-Id: Iac31df396eaadd711088c149e4f7b616ff599a29
 2010-07-27 15:38:01 -07:00
Brad Fitzpatrick
69057d0226 am f7ad0aa0: am 10f7c1b8: Merge "Explicitly mention again that startCommand() runs on the main thread." into gingerbread 
Merge commit 'f7ad0aa005d18f4d934d9b085e969841e4fbf5c1'

* commit 'f7ad0aa005d18f4d934d9b085e969841e4fbf5c1':
  Explicitly mention again that startCommand() runs on the main thread.
 2010-07-27 15:24:50 -07:00
Brad Fitzpatrick
f7ad0aa005 am 10f7c1b8: Merge "Explicitly mention again that startCommand() runs on the main thread." into gingerbread 
Merge commit '10f7c1b8ecf110fd9c646eb3fcb51e6ee74c5885' into gingerbread-plus-aosp

* commit '10f7c1b8ecf110fd9c646eb3fcb51e6ee74c5885':
  Explicitly mention again that startCommand() runs on the main thread.
 2010-07-27 15:21:30 -07:00
Brad Fitzpatrick
10f7c1b8ec Merge "Explicitly mention again that startCommand() runs on the main thread." into gingerbread 2010-07-27 15:19:08 -07:00
Brad Fitzpatrick
0166c35305 Explicitly mention again that startCommand() runs on the main thread. 
This is already mentioned at the top of Service.java's javadoc, but
I'm seeing people get confused (myself included the other day) after
getting used to incoming service stub binder calls being on their own
threads and forgetting that startCommand() didn't work that way.

Change-Id: Ib79f48d9368ac0ba2d37b7e4dc98d53804bcd59e
 2010-07-27 14:57:08 -07:00
Brad Fitzpatrick
84fabc0ce3 am 245cb784: am 84c924a6: Merge "Replace several IPCThreadState::get() lookups with one." into gingerbread 
Merge commit '245cb7846c82f7c0840e13f0b994d356846b1678'

* commit '245cb7846c82f7c0840e13f0b994d356846b1678':
  Replace several IPCThreadState::get() lookups with one.
 2010-07-27 14:04:14 -07:00
Brad Fitzpatrick
245cb7846c am 84c924a6: Merge "Replace several IPCThreadState::get() lookups with one." into gingerbread 
Merge commit '84c924a6c53cb63ca018013c9fda0077413d0005' into gingerbread-plus-aosp

* commit '84c924a6c53cb63ca018013c9fda0077413d0005':
  Replace several IPCThreadState::get() lookups with one.
 2010-07-27 14:02:01 -07:00
Brad Fitzpatrick
84c924a6c5 Merge "Replace several IPCThreadState::get() lookups with one." into gingerbread 2010-07-27 13:59:47 -07:00
Brad Fitzpatrick
7bcad8a315 Replace several IPCThreadState::get() lookups with one. 
Also, make StrictMode's ThreadLocal final.

Change-Id: I08d400ed254fa67bb7a3dae1227f205a54c00df0
 2010-07-27 12:28:57 -07:00
Jeff Hamilton
ebd19e0f48 Add LoaderTestCase that makes it easier to test Loaders. 
Change-Id: I4e91d6767cfd5cc61d7893e9cd71e963e42601a4
 2010-07-27 14:03:00 -05:00
Irfan Sheriff
a2a1b911a3 Refactor WifiStateTracker 
Implement WifiStateTracker as a HSM.

Change-Id: Ic12fd78f1f183b5c4dea8ad2301002267ceff0cb
 2010-07-27 11:59:29 -07:00
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
Steve Howard
46be2a5bb6 Un-@hide new download manager public API. 
Change-Id: Ia8433160ef40e25fb9408f05f97c7bbfa10a807e
 2010-07-26 20:44:35 -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