26189 Commits

Author SHA1 Message Date
Nipun Kwatra
d26920ada0 Adding timelapse capture from videocamera.
Current implementation looks at the timestamps of all incoming frames in
CameraSource::dataCallbackTimestamp().
It drops all frames until enough time has elapsed to get the next time lapse frame.
When enough time has passed to capture the next time lapse frame, the frame is no longer dropped
and the timestamp of this frame is modified to be one frame time (1/framerate) ahead of the
last encoded frame's time stamp.

Change-Id: I82b9d5e96113dffa6901aac3b8a8ef999ffc1d0b
2010-07-01 14:54:36 -07:00
James Dong
3bf8430e05 am d6ec2175: am 65c83b90: Merge "Refactor Stagefright::StartMPEG4Recording()" into gingerbread
Merge commit 'd6ec21751b26a35fc8c912940a2c4720bdbf1083'

* commit 'd6ec21751b26a35fc8c912940a2c4720bdbf1083':
  Refactor Stagefright::StartMPEG4Recording()
2010-07-01 14:15:00 -07:00
James Dong
d6ec21751b am 65c83b90: Merge "Refactor Stagefright::StartMPEG4Recording()" into gingerbread
Merge commit '65c83b906d01c3c1493d0547757dbb16d4c3722a' into gingerbread-plus-aosp

* commit '65c83b906d01c3c1493d0547757dbb16d4c3722a':
  Refactor Stagefright::StartMPEG4Recording()
2010-07-01 14:12:47 -07:00
James Dong
65c83b906d Merge "Refactor Stagefright::StartMPEG4Recording()" into gingerbread 2010-07-01 14:11:01 -07:00
Amith Yamasani
69fc43d495 am 2cc2c75d: (-s ours) am c7dacb73: Merge "DO NOT MERGE: Add a battery capacity value to the power profile." into gingerbread
Merge commit '2cc2c75dccc08ecbffb44a47463df9a139e2786e'

* commit '2cc2c75dccc08ecbffb44a47463df9a139e2786e':
  DO NOT MERGE: Add a battery capacity value to the power profile.
2010-07-01 13:55:26 -07:00
Amith Yamasani
2cc2c75dcc am c7dacb73: Merge "DO NOT MERGE: Add a battery capacity value to the power profile." into gingerbread
Merge commit 'c7dacb7374e04c003b0764e7c348765b629c18cb' into gingerbread-plus-aosp

* commit 'c7dacb7374e04c003b0764e7c348765b629c18cb':
  DO NOT MERGE: Add a battery capacity value to the power profile.
2010-07-01 13:53:08 -07:00
Amith Yamasani
c7dacb7374 Merge "DO NOT MERGE: Add a battery capacity value to the power profile." into gingerbread 2010-07-01 13:51:27 -07:00
Adam Powell
85e39f64e8 Merge "Add AbsListView#smoothScrollToPositionFromTop" 2010-07-01 13:45:58 -07:00
Amith Yamasani
169741b708 DO NOT MERGE: Add a battery capacity value to the power profile.
Can be accessed through PowerProfile.getBatteryCapacity()

Individual device profiles need to be updated with their capacities.

(merged from master)

Change-Id: Ie76ab6de47c44807a46934331665e077a7226566
2010-07-01 13:42:59 -07:00
Jason Parks
2ed26c4e5c Merge "Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument." 2010-07-01 13:37:13 -07:00
satok
adfb59907a Merge "Remove EditStyledText from the framekwork" 2010-07-01 13:24:26 -07:00
Adam Powell
e44afae7ff Add AbsListView#smoothScrollToPositionFromTop
Change-Id: I4dec9cdcf63b1075264c772faf1303c7281d0efe
2010-07-01 13:04:34 -07:00
Jason Parks
4b08d3e437 Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument.
Not closing the cursors was a bit of a bug since the documenation explicitly says that it would close the cursors. This will get rid of all the warnings that are printed out in the finalizer about the cursor not being closed.

Change-Id: I8dcedbdf7378cea7407502445269b5b0bded1a3d
2010-07-01 14:38:02 -05:00
Eric Laurent
e822c99511 am eba857d1: am a0c2b539: Merge "Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call." into gingerbread
Merge commit 'eba857d126e2b76a368f41d3169a56fe28029674'

* commit 'eba857d126e2b76a368f41d3169a56fe28029674':
  Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
2010-07-01 11:59:10 -07:00
Andreas Huber
2d3dcac183 am d51c2cac: am 45bac57a: Support for writing the extracted data to an .mp4 file in the stagefright commandline tool.
Merge commit 'd51c2cacce4ad945bea4c00cea4326cf76b49cd2'

* commit 'd51c2cacce4ad945bea4c00cea4326cf76b49cd2':
  Support for writing the extracted data to an .mp4 file in the stagefright commandline tool.
2010-07-01 11:56:16 -07:00
Eric Laurent
eba857d126 am a0c2b539: Merge "Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call." into gingerbread
Merge commit 'a0c2b53966238125143dec01d3f2598a8b9e33a2' into gingerbread-plus-aosp

* commit 'a0c2b53966238125143dec01d3f2598a8b9e33a2':
  Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
2010-07-01 11:56:11 -07:00
Joe Onorato
06abd91d7a am 393e1459: am a2dd4c17: put the status bar back in the system process
Merge commit '393e1459340effdb8bdc6531e22c0976d0aea026'

* commit '393e1459340effdb8bdc6531e22c0976d0aea026':
  put the status bar back in the system process
2010-07-01 11:55:46 -07:00
Joe Onorato
b3066ee5f7 am 6fd470fb: am 6be4739e: quiet noisy debug spew
Merge commit '6fd470fbdc46777d7dc201bd6f475becc7976014'

* commit '6fd470fbdc46777d7dc201bd6f475becc7976014':
  quiet noisy debug spew
2010-07-01 11:55:42 -07:00
Chih-Chung Chang
4024ddcf66 am bda93c4c: am 09b90057: Add multiple camera support for in MediaProfiles.
Merge commit 'bda93c4cb94b47c86251d22df16e46a514c191ef'

* commit 'bda93c4cb94b47c86251d22df16e46a514c191ef':
  Add multiple camera support for in MediaProfiles.
2010-07-01 11:55:27 -07:00
Eric Laurent
a0c2b53966 Merge "Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call." into gingerbread 2010-07-01 11:54:00 -07:00
Christopher Tate
8dfabd9c6f resolved conflicts for merge of d3233ae9 to master
Change-Id: I59ecf8f2d3bd253f51457c11ec15f022ac5fdeb6
2010-07-01 11:49:41 -07:00
Grace Kloba
9a9fd64ab7 Remove the TODO as it has been fixed with changes
for http://b/issue?id=2666473.
2010-07-01 11:07:22 -07:00
James Dong
7b06de6d5a Refactor Stagefright::StartMPEG4Recording()
- Also, better error handling

Change-Id: Ic18d08dc6489adf92c6a588efa4baca66429b175
2010-07-01 10:28:38 -07:00
Andreas Huber
d51c2cacce am 45bac57a: Support for writing the extracted data to an .mp4 file in the stagefright commandline tool.
Merge commit '45bac57aa00281e6b45756c691c588bdaf762521' into gingerbread-plus-aosp

* commit '45bac57aa00281e6b45756c691c588bdaf762521':
  Support for writing the extracted data to an .mp4 file in the stagefright commandline tool.
2010-07-01 10:07:17 -07:00
Andreas Huber
45bac57aa0 Support for writing the extracted data to an .mp4 file in the stagefright commandline tool.
Change-Id: I972324a8fc9757e6e8116b0270ec0882106f8733
2010-07-01 09:08:38 -07:00
Mike Lockwood
1a3e1056db Merge "MTP: Remove an unnecessary thread from the MtpClient class." 2010-07-01 08:40:24 -07:00
Mike Lockwood
d0e1a9f40e MTP: Remove an unnecessary thread from the MtpClient class.
Now a single thread is used for passing USB host events up to MtpClient.

Change-Id: I0e3a277956cb3d1036da122ea10acb03a27844d6
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-01 11:39:42 -04:00
Joe Malin
7ff3ba8c99 Merge "Javadoc for test case classes" 2010-07-01 08:31:12 -07:00
Jeff Hamilton
8b53429e55 Merge "More cleanup after removing the Cursor update logic." 2010-07-01 08:29:52 -07:00
Steve Block
a378fa246f Merge "Add a class to represent the set of sensitive features of a web application" 2010-07-01 08:08:11 -07:00
Joe Onorato
393e145934 am a2dd4c17: put the status bar back in the system process
Merge commit 'a2dd4c17bbe47876b909b09f54505deda379d2b4' into gingerbread-plus-aosp

* commit 'a2dd4c17bbe47876b909b09f54505deda379d2b4':
  put the status bar back in the system process
2010-07-01 05:01:52 -07:00
Joe Onorato
6fd470fbdc am 6be4739e: quiet noisy debug spew
Merge commit '6be4739e1b302eb447dee195eaecbfcf82317310' into gingerbread-plus-aosp

* commit '6be4739e1b302eb447dee195eaecbfcf82317310':
  quiet noisy debug spew
2010-07-01 05:01:48 -07:00
Joe Onorato
a2dd4c17bb put the status bar back in the system process
Change-Id: I401b0ac8e3c96b61e787eb18341d18be75b3761d
2010-07-01 07:51:04 -04:00
Joe Onorato
6be4739e1b quiet noisy debug spew
Change-Id: I55c3b16f58bbe0ec4c6547c525863a7d16f8263d
2010-07-01 07:47:08 -04:00
Steve Block
a08491a08b Add a class to represent the set of sensitive features of a web application
This class is used to store the set of sensitive features for which the web app
is authorised. The data for which is passed as meta data with the intent. The
data is then used to set the security policy for features such as Geolocation
which request permission through the browser chrome.

Bug: 2766920
Change-Id: I2ff259dfd3b50d39bb05fbc187d4943c448d08d6
2010-07-01 10:37:02 +01:00
Steve Block
f96d23ae1a Merge "Pass the WebView context to the GeolocationService from WebKit" 2010-07-01 02:18:24 -07:00
satok
fa57523b60 Remove EditStyledText from the framekwork
Change-Id: Idad87a61b0a64c9ba0a70a2d576188ad5e560cb7
2010-07-01 15:23:45 +09:00
Chih-Chung Chang
bda93c4cb9 am 09b90057: Add multiple camera support for in MediaProfiles.
Merge commit '09b9005769f2b717f637131578ce6cfa6bd62bd9' into gingerbread-plus-aosp

* commit '09b9005769f2b717f637131578ce6cfa6bd62bd9':
  Add multiple camera support for in MediaProfiles.
2010-06-30 20:22:40 -07:00
Chih-Chung Chang
09b9005769 Add multiple camera support for in MediaProfiles.
Change-Id: Ie89568a0f5f5fd08ede77e33f9a559215d6bed9a
2010-07-01 10:57:15 +08:00
Eric Laurent
e2dd8c4592 Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
Problem:
When the bluetooth device is removed, the AudioService clears all active SCO connections
and unlinks from the client application's binder interface death.
The problem is that the unlinking is done even if no more connections are active for a given client,
which throws a runtime exception that is not catched causing the system server to crash.

The fix consists in calling unlinkToDeath() in ScoClient.clearCount() only if the number of
active SCO connections for this client is not 0. The NoSuchElementException exception is also
catched when calling unlinkToDeath()

Change-Id: I29a28fcce1a579217cea271956a55778e05d3e37
2010-06-30 19:41:56 -07:00
Mike Lockwood
7c32c0dfb4 Merge "Try to fix the simulator build." 2010-06-30 19:23:42 -07:00
Romain Guy
c18a9f2051 Merge "Add implementation for drawBitmap(Bitmap, Rect, Rect, Paint)" 2010-06-30 19:23:08 -07:00
Romain Guy
8ba548f81d Add implementation for drawBitmap(Bitmap, Rect, Rect, Paint)
Change-Id: I10904d2325a5431d15801aebcec1048715678e8c
2010-06-30 19:21:21 -07:00
Mike Lockwood
0723394051 Try to fix the simulator build.
Change-Id: I3640e9eba433e711e23af1c6182e38c86c5b60bb
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-30 22:19:24 -04:00
Christopher Tate
d3233ae902 am 160edb36: Add ability to guard a thread against setting its own prio to bg
Merge commit '160edb3645f8b7012bab70ae6e6e8c4a5733082b' into gingerbread-plus-aosp

* commit '160edb3645f8b7012bab70ae6e6e8c4a5733082b':
  Add ability to guard a thread against setting its own prio to bg
2010-06-30 18:28:08 -07:00
Christopher Tate
160edb3645 Add ability to guard a thread against setting its own prio to bg
The guard is compiled out by default because it adds overhead to
android.os.Process.setPriority().

Change-Id: Ibb2a648c6349b381abb7ae62a358888b04fba871
2010-06-30 18:25:01 -07:00
Shimeng (Simon) Wang
7940e8472b Merge "Fix the initial reflow width when switch between basic pages." 2010-06-30 18:03:53 -07:00
Romain Guy
e07f6eeb3a Merge "Add implementation for drawBitmap()." 2010-06-30 17:58:12 -07:00
Romain Guy
c1396e93b6 Add implementation for drawBitmap().
Change-Id: Iada9325f3c5642b61c2e0c4cd80bcfbc92cb491e
2010-06-30 17:56:19 -07:00
Shimeng (Simon) Wang
0a4a70daba Fix the initial reflow width when switch between basic pages.
issue: 2778976
Change-Id: Ib77c91628792258db8197459656b8f42bf787c9c
2010-06-30 17:28:12 -07:00