ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
16,907 Commits 2 Branches 0 Tags 54 MiB
022ed1dece
Commit Graph

16907 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve Howard
022ed1dece 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
38fa7eccc1 Merge "One last change to current.xml for new download manager API" into gingerbread 2010-07-27 16:55:14 -07:00
Brad Fitzpatrick
3b54d4533a 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
928b1c94a5 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
Brad Fitzpatrick
be2ec77f92 Merge "COMMENT ONLY change to clarify ContentProvider documentation." into froyo 2010-07-27 16:44:53 -07:00
Steve Howard
5c7efd4e0e 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
Steve Howard
1faba30b39 Merge "Un-@hide new download manager public API." into gingerbread 2010-07-27 16:29:37 -07:00
Brad Fitzpatrick
9a63af4ad6 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
55fcdbc397 Merge "Explicitly mention again that startCommand() runs on the main thread." into gingerbread 2010-07-27 15:19:08 -07:00
Brad Fitzpatrick
53456e51ce 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
834772c15b Merge "Replace several IPCThreadState::get() lookups with one." into gingerbread 2010-07-27 13:59:47 -07:00
Brad Fitzpatrick
70081a1511 Replace several IPCThreadState::get() lookups with one. 
Also, make StrictMode's ThreadLocal final.

Change-Id: I08d400ed254fa67bb7a3dae1227f205a54c00df0
 2010-07-27 12:28:57 -07:00
Dan Egnor
78e3a74069 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
38e04ae4f9 Merge "Remove a log message Jason doesn't like" into gingerbread 2010-07-27 10:22:58 -07:00
Joe Onorato
55578bc652 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
385adbdbe3 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
38723b069c 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
Eric Laurent
48f5248621 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
Dirk Dougherty
eab0bb1098 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
5cf8fa8046 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
cc41e06ef9 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
f17bc88c60 Merge "Fix StrictMode for Binder.dump()" into gingerbread 2010-07-26 19:44:50 -07:00
Jean-Michel Trivi
125bc5dde1 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
Eric Laurent
2dce5547f7 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
8c335a50b8 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
f087436b0c 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
b7ed8acac1 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
Dianne Hackborn
370ea7364a am 3ac8eb72: Update app label. 
Merge commit '3ac8eb7278e3603d1a35fdbd2fff540a235da2ab' into gingerbread-plus-aosp

* commit '3ac8eb7278e3603d1a35fdbd2fff540a235da2ab':
  Update app label.
 2010-07-26 12:24:39 -07:00
Dianne Hackborn
aec5d77fbe am 46730fc7: Fix handling of application disabled state. 
Merge commit '46730fc78388607fd562044cbaaa26ffc9f65337' into gingerbread-plus-aosp

* commit '46730fc78388607fd562044cbaaa26ffc9f65337':
  Fix handling of application disabled state.
 2010-07-26 12:24:21 -07:00
Dianne Hackborn
7cd6017314 am 3bee5af8: Battery stats: start removing last stats, keep total discharge. 
Merge commit '3bee5af8162c177f8c8f4199489a401058ab26a9' into gingerbread-plus-aosp

* commit '3bee5af8162c177f8c8f4199489a401058ab26a9':
  Battery stats: start removing last stats, keep total discharge.
 2010-07-26 12:24:16 -07:00
Mathias Agopian
c57be7f300 am eab07e5c: Merge "Report sensor events to BatteryStats service" into gingerbread 
Merge commit 'eab07e5c1d48d45f76ac2dd4a45c8a3457aa290d' into gingerbread-plus-aosp

* commit 'eab07e5c1d48d45f76ac2dd4a45c8a3457aa290d':
  Report sensor events to BatteryStats service
 2010-07-26 12:24:00 -07:00
Mathias Agopian
33b0a2c40a am f88ed6c2: Merge "SensorService handles last known state properly" into gingerbread 
Merge commit 'f88ed6c2ce750fcf7fb23778286e15557de758f9' into gingerbread-plus-aosp

* commit 'f88ed6c2ce750fcf7fb23778286e15557de758f9':
  SensorService handles last known state properly
 2010-07-26 12:23:55 -07:00
Steve Howard
9a63ac7889 am a13a02cd: New permission for non-purgeable cache downloads. 
Merge commit 'a13a02cd0ec6c0584fc2423feb974d77d0945964' into gingerbread-plus-aosp

* commit 'a13a02cd0ec6c0584fc2423feb974d77d0945964':
  New permission for non-purgeable cache downloads.
 2010-07-26 12:23:48 -07:00
Xavier Ducrohet
6f936f73b4 am f72181c6: Fix hosttests to use the new ddmlib API. 
Merge commit 'f72181c60943dcfb642aac1dc5fa5416c1bb566e' into gingerbread-plus-aosp

* commit 'f72181c60943dcfb642aac1dc5fa5416c1bb566e':
  Fix hosttests to use the new ddmlib API.
 2010-07-26 11:43:07 -07:00
Gilles Debunne
ea8db98aab am 8cd48574: Fixed bug in BitmapFactory.decodeStream 
Merge commit '8cd48574a755bea86243e9f9eabaee341ecf9c60' into gingerbread-plus-aosp

* commit '8cd48574a755bea86243e9f9eabaee341ecf9c60':
  Fixed bug in BitmapFactory.decodeStream
 2010-07-26 11:41:46 -07:00
Jean-Baptiste Queru
a0410b4b68 resolved conflicts for merge of b237bdb6 to gingerbread-plus-aosp 
Change-Id: Ibd9f488a0331c472a852054af5db06f8e7d35e76
 2010-07-26 10:22:58 -07:00
Eric Laurent
23abef82b6 Merge "Fixed bug in vlm effect bunde wrapper effect init function." into gingerbread 2010-07-26 10:09:54 -07:00
Jean-Baptiste Queru
8bdc24e308 am c7ab09ed: Merge "Fix build." 
Merge commit 'c7ab09ede5426f1ca7f1215aa4d7ac95a2b6109b' into gingerbread-plus-aosp

* commit 'c7ab09ede5426f1ca7f1215aa4d7ac95a2b6109b':
  Fix build.
 2010-07-26 10:05:23 -07:00
Jean-Baptiste Queru
91d4d71a04 Merge "move native services under services/" 2010-07-26 10:01:19 -07:00
Jean-Baptiste Queru
9e4acbb6dd Merge "Fix build." 2010-07-26 09:56:10 -07:00
Mike Lockwood
d6499d8b3f Merge "Avoid starting multiple threads in ShutdownThread" into gingerbread 2010-07-26 08:11:54 -07:00
Eric Laurent
6862484713 Merge "LVM release 1.04." into gingerbread 2010-07-26 02:17:52 -07:00
Jean-Baptiste Queru
c2c0f38d81 am 7cdd26ce: Merge "Enables writing to USIM phonebook (fixes issue 8976)." 
Merge commit '7cdd26ce30e61a108e4def932b96aca9f031e5d2' into gingerbread-plus-aosp

* commit '7cdd26ce30e61a108e4def932b96aca9f031e5d2':
  Enables writing to USIM phonebook (fixes issue 8976).
 2010-07-23 17:48:11 -07:00
Jean-Baptiste Queru
ec5506e87a Merge "Enables writing to USIM phonebook (fixes issue 8976)." 2010-07-23 17:35:13 -07:00
Mathias Agopian
5767cf62a4 Merge "Report sensor events to BatteryStats service" into gingerbread 2010-07-23 17:03:43 -07:00
Mathias Agopian
148b25a2a6 Merge "SensorService handles last known state properly" into gingerbread 2010-07-23 16:39:34 -07:00
Jean-Baptiste Queru
71f592ceca am f5c73101: Merge "dependent change for "parse instrumentation result bundles" in sdk" 
Merge commit 'f5c7310152cf5537be6997412c1a42dde9fe9ecf' into gingerbread-plus-aosp

* commit 'f5c7310152cf5537be6997412c1a42dde9fe9ecf':
  dependent change for "parse instrumentation result bundles" in sdk
 2010-07-23 15:32:45 -07:00
Jean-Baptiste Queru
0e81e1b726 Merge "dependent change for "parse instrumentation result bundles" in sdk" 2010-07-23 15:24:55 -07:00
Jean-Baptiste Queru
66282a6a09 resolved conflicts for merge of a9b1e01a to gingerbread-plus-aosp 
Change-Id: Ief79eaa532b583d9608701d48464b7afdc493bac
 2010-07-23 14:15:01 -07:00
Romain Guy
410d0ea5a4 Merge "Remove compilation warnings by removing illegal characters" 2010-07-23 14:05:40 -07:00