27436 Commits

Author SHA1 Message Date
James Dong
16edf317cd am 8ddb8f81: am bc1daf01: Merge "Eliminate the linear cost associated with mSampleSizes.size()" into gingerbread
Merge commit '8ddb8f81902045ec8a53ec14b8fb936fd42517e0'

* commit '8ddb8f81902045ec8a53ec14b8fb936fd42517e0':
  Eliminate the linear cost associated with mSampleSizes.size()
2010-07-28 15:33:56 -07:00
James Dong
8ddb8f8190 am bc1daf01: Merge "Eliminate the linear cost associated with mSampleSizes.size()" into gingerbread
Merge commit 'bc1daf016020ce022ceb971f09e862da5ee82b1d' into gingerbread-plus-aosp

* commit 'bc1daf016020ce022ceb971f09e862da5ee82b1d':
  Eliminate the linear cost associated with mSampleSizes.size()
2010-07-28 15:31:09 -07:00
James Dong
bc1daf0160 Merge "Eliminate the linear cost associated with mSampleSizes.size()" into gingerbread 2010-07-28 15:28:54 -07:00
James Dong
e991e5f334 Eliminate the linear cost associated with mSampleSizes.size()
- The linear cost associated with mSampleSizes.size() call causes the
  CPU load to increase overtime as more and more audio/video samples
  are recorded.

- Other Lists used in the MP4 file writer may have similar issues, but
  the size() call is not made for each output audio/video output sample,
  or the size of the list is bounded (not linear to the total number
  of audio/video output samples). As for now, we can live with the small
  cost (tested with 30 minutes long recording).

Change-Id: I23bd93ea4256cb0be0c1649760e39e6809eb4946
2010-07-28 15:21:59 -07:00
Mike Lockwood
03a545e5ed Merge changes I00d6980a,I814221b4,Id88603a5
* changes:
  CameraBrowser: Launch itself when a camera is attached to USB.
  Send Intents when PTP compatible devices are connected/disconnected to USB
  Give system server permission to access USB.
2010-07-28 14:59:45 -07:00
Kenny Root
048391511e am bba1eede: am f369a9b5: Remove stale temporary ASEC containers
Merge commit 'bba1eede35b356a50dfe12692c2ff30cd5de152d'

* commit 'bba1eede35b356a50dfe12692c2ff30cd5de152d':
  Remove stale temporary ASEC containers
2010-07-28 14:54:21 -07:00
Kenny Root
a8ec0459ab am 4b812738: am 56c02dc3: Merge "Fix getTempContainerId()" into gingerbread
Merge commit '4b812738c70be53e79ba8a6b9c93de14388d1311'

* commit '4b812738c70be53e79ba8a6b9c93de14388d1311':
  Fix getTempContainerId()
2010-07-28 14:54:16 -07:00
Kenny Root
bba1eede35 am f369a9b5: Remove stale temporary ASEC containers
Merge commit 'f369a9b5f7b2ae75875753caf90ec68fd9dbc144' into gingerbread-plus-aosp

* commit 'f369a9b5f7b2ae75875753caf90ec68fd9dbc144':
  Remove stale temporary ASEC containers
2010-07-28 14:51:33 -07:00
Kenny Root
4b812738c7 am 56c02dc3: Merge "Fix getTempContainerId()" into gingerbread
Merge commit '56c02dc3d325bab8549ec34b9d6aa7c62ef742d0' into gingerbread-plus-aosp

* commit '56c02dc3d325bab8549ec34b9d6aa7c62ef742d0':
  Fix getTempContainerId()
2010-07-28 14:51:29 -07:00
Kenny Root
f369a9b5f7 Remove stale temporary ASEC containers
When a temporary container is created, its existence should be
ephemeral. However, if there is an error that causes system_server to be
killed during the process of creating a finalized ASEC, delete the stale
containers on the next start-up of system_server.

Change-Id: I7be8f94638a824295474c9a95960594848cb726b
2010-07-28 14:48:58 -07:00
Kenny Root
56c02dc3d3 Merge "Fix getTempContainerId()" into gingerbread 2010-07-28 14:48:40 -07:00
Kenny Root
c78a807974 Fix getTempContainerId()
getTempContainerId() would always return "smdl2tmp1" unless you had
MAX_CONTAINERS number of SD card SDKs, because of an array sort that put
all the zeros at the beginning.

Switch from trying to find a hole in the series of numbers to just
getting a number that's one larger than the previous. This reduces the
algorithmic complexity and the memory requirements.

Bug: 2832580
Change-Id: I32dc75ef5a6645f594ea47b032d7402e8860ebcd
2010-07-28 14:45:14 -07:00
Scott Main
ffdfd992e5 am 4e235622: am b1bb7180: am 3bf5c4cd: Merge "fix markup error bug:2871538" into froyo
Merge commit '4e235622bc37e54208b88a18251f3682495af41f'

* commit '4e235622bc37e54208b88a18251f3682495af41f':
  fix markup error
2010-07-28 14:30:21 -07:00
Jeff Brown
2279971b6f am 9795a25d: am 6d0fec2d: Refactor input reader to support new device types more easily.
Merge commit '9795a25da060f9a7df87da8ab43fb1086d4322a5'

* commit '9795a25da060f9a7df87da8ab43fb1086d4322a5':
  Refactor input reader to support new device types more easily.
2010-07-28 14:27:55 -07:00
Scott Main
4e235622bc am b1bb7180: am 3bf5c4cd: Merge "fix markup error bug:2871538" into froyo
Merge commit 'b1bb7180ec3446208ea717d96f6a507ea9955a13' into gingerbread-plus-aosp

* commit 'b1bb7180ec3446208ea717d96f6a507ea9955a13':
  fix markup error
2010-07-28 14:27:13 -07:00
Jeff Brown
9795a25da0 am 6d0fec2d: Refactor input reader to support new device types more easily.
Merge commit '6d0fec2de3601821f4f44eeb7d7deedebb2b7117' into gingerbread-plus-aosp

* commit '6d0fec2de3601821f4f44eeb7d7deedebb2b7117':
  Refactor input reader to support new device types more easily.
2010-07-28 14:25:05 -07:00
Scott Main
b1bb7180ec am 3bf5c4cd: Merge "fix markup error bug:2871538" into froyo
Merge commit '3bf5c4cd30f8bd598842d8ded5f1655406b5c27a' into gingerbread

* commit '3bf5c4cd30f8bd598842d8ded5f1655406b5c27a':
  fix markup error
2010-07-28 14:23:16 -07:00
Scott Main
3bf5c4cd30 Merge "fix markup error bug:2871538" into froyo 2010-07-28 14:20:18 -07:00
Jeff Brown
6d0fec2de3 Refactor input reader to support new device types more easily.
Refactored the input reader so that each raw input protocol is handled
by a separate subclass of the new InputMapper type.  This way, behaviors
pertaining to keyboard, trackballs, touchscreens, switches and other
devices are clearly distinguished for improved maintainability.

Added partial support for describing capabilities of input devices
(incomplete and untested for now, will be fleshed out in later commits).

Simplified EventHub interface somewhat since InputReader is taking over
more of the work.

Cleaned up some of the interactions between InputManager and
WindowManagerService related to reading input state.

Fixed swiping finger from screen edge into display area.

Added logging of device information to 'dumpsys window'.

Change-Id: I17faffc33e3aec3a0f33f0b37e81a70609378612
2010-07-28 14:16:15 -07:00
Scott Main
8a52f3d683 fix markup error
bug:2871538

Change-Id: I7ab4a9bb722ee8b3e5d740f79143776be8b56a6f
2010-07-28 14:15:26 -07:00
Jason Sams
5193a5bab1 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
127fe81448 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
8190f48553 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
b350bec514 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
Dan Egnor
17876aa586 Minor changes to ContentProvider javadoc to improve consistency.
Change-Id: I710f618c94ffd5d6368ef04a39ac08f675bec11b
2010-07-28 12:28:04 -07:00
Irfan Sheriff
cc49988be4 Merge "sticky broadcasts dont need system ready check" 2010-07-28 12:22:38 -07:00
James Dong
a5e0330db0 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
84665f6dc2 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
733bfae99b 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
7e397842d5 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

TODO:
1. Reduce CPU load by elimnating the list cost associated with List.size() call.

Change-Id: I590bc17176596a65952c982574b82ee3b15b7d1c
2010-07-28 12:02:57 -07:00
James Dong
cb51115cca 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
5587bb7e37 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
28d32cd16a Merge "Wait for broadcast even if the network state has been changed. bug: 2863356" 2010-07-28 11:34:18 -07:00
Irfan Sheriff
22c2b25ad7 sticky broadcasts dont need system ready check
Fix an issue where checking for system ready status
for sticky broadcasts can lead to boot up with wifi
turned on and settings showing incorrect status.

Bug: 2876746
Change-Id: Iae39855c255513e28a13bd819b3d14d81fbaba43
2010-07-28 11:19:54 -07:00
Jason Sams
17966517a1 Cleanup sendToClient and add rsGetDt().
Remove legacy implemtation of matrix calls which were moved to llvm bc.

Change-Id: I527740590067db3bcb2147233ef41fb057f1d2a8
2010-07-28 11:17:53 -07:00
Michael Kolb
48a16ce36e 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
17350886d0 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
ff0aff1914 Merge "Add new system service CountryDetector" 2010-07-28 11:04:18 -07:00
Joe Onorato
d3f6c1fa45 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
James Dong
63299c0387 Interleave the audio and video by default
- default interleave duration is set to 1 second

This can dramatically reduce the memory usage
by the MP4 file writer.

Change-Id: Ia3ff202cabfcd2d3f183065d31e4596617c2dded
2010-07-28 10:08:03 -07:00
Joe Onorato
0c39b6c65b 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
0809854580 Merge "Add ability to instantiate PropertyAnimator objects with single "to" value." 2010-07-28 09:06:01 -07:00
Eric Laurent
ba2709583d 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
6fa8888254 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
62d83a0c89 Merge "Audio effects: modified command() parameter types." into gingerbread 2010-07-28 07:48:49 -07:00
Eric Laurent
a4c72acfbc Audio effects: modified command() parameter types.
The type of the cmd, cmdSize and *pReplySize parameters of the effect control interface command()
function have been modified from int to uint32_t. This is more consistent with their role.

Change-Id: I84d289fc262d6753747910f06f485597dfee6591
2010-07-28 05:49:21 -07:00
Mike Lockwood
d8aad91d8c 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
d5786b982c 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
c40d714ca5 Merge "Tethering: Use new ACTION_USB_STATE broadcast to monitor USB connected state" into gingerbread 2010-07-28 04:04:18 -07:00
Adam Powell
5d27977f9d Action modes without action bar
Change-Id: I0367ab35e598a17980bd373b30828175f6283acc
2010-07-27 21:04:52 -07:00