ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
18,587 Commits 2 Branches 0 Tags 54 MiB
2f334347a7
Commit Graph

18587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chet Haase
2f334347a7 Merge "Add ability to instantiate PropertyAnimator objects with single "to" value." 2010-07-28 09:06:01 -07:00
Eric Laurent
7ca608db56 am 6fa88882: am 62d83a0c: Merge "Audio effects: modified command() parameter types." into gingerbread 
Merge commit '6fa8888254deb4961dc64c6ac03dc103c9cd8bcf'

* commit '6fa8888254deb4961dc64c6ac03dc103c9cd8bcf':
  Audio effects: modified command() parameter types.
 2010-07-28 07:53:24 -07:00
Eric Laurent
78fa144626 am 62d83a0c: Merge "Audio effects: modified command() parameter types." into gingerbread 
Merge commit '62d83a0c894b72d9abda1340d278d2aeec11e0fb' into gingerbread-plus-aosp

* commit '62d83a0c894b72d9abda1340d278d2aeec11e0fb':
  Audio effects: modified command() parameter types.
 2010-07-28 07:51:02 -07:00
Eric Laurent
de63b463a5 Merge "Audio effects: modified command() parameter types." into gingerbread 2010-07-28 07:48:49 -07:00
Mike Lockwood
22e8963e0d am d5786b98: am c40d714c: Merge "Tethering: Use new ACTION_USB_STATE broadcast to monitor USB connected state" into gingerbread 
Merge commit 'd5786b982c90632a4b35fd2d984c4edc4bbdfb0b'

* commit 'd5786b982c90632a4b35fd2d984c4edc4bbdfb0b':
  Tethering: Use new ACTION_USB_STATE broadcast to monitor USB connected state
 2010-07-28 04:18:10 -07:00
Mike Lockwood
c1bab16956 am c40d714c: Merge "Tethering: Use new ACTION_USB_STATE broadcast to monitor USB connected state" into gingerbread 
Merge commit 'c40d714ca520257bcb5ef2e03e83ea3273d3a0ec' into gingerbread-plus-aosp

* commit 'c40d714ca520257bcb5ef2e03e83ea3273d3a0ec':
  Tethering: Use new ACTION_USB_STATE broadcast to monitor USB connected state
 2010-07-28 04:11:03 -07:00
Mike Lockwood
1b55aad8ef Merge "Tethering: Use new ACTION_USB_STATE broadcast to monitor USB connected state" into gingerbread 2010-07-28 04:04:18 -07:00
Romain Guy
622b85f769 Merge "Generate shaders to cover all possible cases." 2010-07-27 19:53:33 -07:00
Brad Fitzpatrick
a2a56526df 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
795c4cc84c 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
6c595a17f5 Merge "Cap the size of StrictMode buffering we do before calling DropBox." into gingerbread 2010-07-27 18:34:08 -07:00
Steve Howard
c9ef051237 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
3b4d08f9a0 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
5415b2b3d8 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
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
c58fd0f8b1 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
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
b8f4015c0a 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
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
93cbdf5b94 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
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
6fdab099d6 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
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
Maksymilian Osowski
c26f294821 Merge "Moved practically all of the prerefactoring functionality to the new design." 2010-07-27 08:17:00 -07:00
Eric Laurent
e5e11f1613 Merge "resolved conflicts for merge of d306cc81 to master" 2010-07-27 05:33:23 -07:00
Steve Block
f83d2e8fec Merge "Add some dom/xtml/level3 LayoutTests to the DumpRenderTree ignore results list" 2010-07-27 02:53:10 -07:00
Ben Murdoch
cc302f70af Merge "Merge WebKit at r63859 : Implement layoutTestController.dumpAsText(boolean) in DumpRenderTree." 2010-07-27 02:46:23 -07:00
Eric Laurent
342808f962 resolved conflicts for merge of d306cc81 to master 
Change-Id: Ib593b7719a837de12605e8c75904634843298ba1
 2010-07-27 02:41:41 -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
801e56cb5d 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
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
a9c1c6bc67 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
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
Adam Powell
27e123c3c7 Merge "Moved context modes into view, renamed to action modes" 2010-07-26 18:02:12 -07:00
Jean-Michel Trivi
12bee2eaa1 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
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