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

18603 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Sams
af18ab7c0b Merge "Cleanup sendToClient and add rsGetDt(). Remove legacy implemtation of matrix calls which were moved to llvm bc." 2010-07-28 14:14:48 -07:00
Dan Egnor
a024fac5ec am 8190f485: am b350bec5: am 17876aa5: Minor changes to ContentProvider javadoc to improve consistency. 
Merge commit '8190f485539c36803489dcf5f198d03ed87ae8f9'

* commit '8190f485539c36803489dcf5f198d03ed87ae8f9':
  Minor changes to ContentProvider javadoc to improve consistency.
 2010-07-28 12:44:22 -07:00
Dan Egnor
0a419c7179 am b350bec5: am 17876aa5: Minor changes to ContentProvider javadoc to improve consistency. 
Merge commit 'b350bec514eb9fee473e4ef62680c53e992dc49b' into gingerbread-plus-aosp

* commit 'b350bec514eb9fee473e4ef62680c53e992dc49b':
  Minor changes to ContentProvider javadoc to improve consistency.
 2010-07-28 12:42:16 -07:00
Dan Egnor
43d71c5805 am 17876aa5: Minor changes to ContentProvider javadoc to improve consistency. 
Merge commit '17876aa586cc9acfb3e5b909c14b9e73537a1a8d' into gingerbread

* commit '17876aa586cc9acfb3e5b909c14b9e73537a1a8d':
  Minor changes to ContentProvider javadoc to improve consistency.
 2010-07-28 12:40:16 -07:00
Irfan Sheriff
4e21e60520 Merge "sticky broadcasts dont need system ready check" 2010-07-28 12:22:38 -07:00
James Dong
e5a4c8f1f7 am 84665f6d: am 7e397842: Reduce memory usage by the MP4 file writer - Don\'t store timestamp for each output sample - Don\'t store timestamp for statistical data collection if the collection of statistical data is not requested 
Merge commit '84665f6dc2d0b5dfa6a46463677c51f2b670e511'

* commit '84665f6dc2d0b5dfa6a46463677c51f2b670e511':
  Reduce memory usage by the MP4 file writer
 2010-07-28 12:21:37 -07:00
James Dong
a4fd3232e2 am 7e397842: Reduce memory usage by the MP4 file writer - Don\'t store timestamp for each output sample - Don\'t store timestamp for statistical data collection if the collection of statistical data is not requested 
Merge commit '7e397842d53a4242a019daa4b234910273121c30' into gingerbread-plus-aosp

* commit '7e397842d53a4242a019daa4b234910273121c30':
  Reduce memory usage by the MP4 file writer
 2010-07-28 12:19:33 -07:00
James Dong
5e8416b3d1 am cb51115c: am 5587bb7e: Merge "Interleave the audio and video by default - default interleave duration is set to 1 second" into gingerbread 
Merge commit 'cb51115cca81ba47d00aa344f6ed16d1056b056b'

* commit 'cb51115cca81ba47d00aa344f6ed16d1056b056b':
  Interleave the audio and video by default
 2010-07-28 12:02:59 -07:00
James Dong
ea38955670 am 5587bb7e: Merge "Interleave the audio and video by default - default interleave duration is set to 1 second" into gingerbread 
Merge commit '5587bb7e375c17c1320918e6f473625af1f5e5ac' into gingerbread-plus-aosp

* commit '5587bb7e375c17c1320918e6f473625af1f5e5ac':
  Interleave the audio and video by default
 2010-07-28 12:00:58 -07:00
James Dong
41af3d253e Merge "Interleave the audio and video by default - default interleave duration is set to 1 second" into gingerbread 2010-07-28 11:58:12 -07:00
Xia Wang
c3b6dea724 Merge "Wait for broadcast even if the network state has been changed. bug: 2863356" 2010-07-28 11:34:18 -07:00
Michael Kolb
10b6c9ff6e Merge "moved target_content user agent parameter to strings added target content parameter for xlarge screen configuration" 2010-07-28 11:06:50 -07:00
Joe Onorato
6692b0d47b am d3f6c1fa: am 0c39b6c6: Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into gingerbread 
Merge commit 'd3f6c1fa45d0b9aaf467159953ee4bea2ea89188'

* commit 'd3f6c1fa45d0b9aaf467159953ee4bea2ea89188':
  Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
 2010-07-28 11:05:29 -07:00
Mike Lockwood
10bdb59d41 Merge "Add new system service CountryDetector" 2010-07-28 11:04:18 -07:00
Joe Onorato
eaa8fbd0bd am 0c39b6c6: Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into gingerbread 
Merge commit '0c39b6c65bcb96ed6438c7d792a67708409d8f0f' into gingerbread-plus-aosp

* commit '0c39b6c65bcb96ed6438c7d792a67708409d8f0f':
  Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
 2010-07-28 10:16:39 -07:00
Joe Onorato
9996342da5 Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into gingerbread 2010-07-28 09:53:12 -07:00
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