30952 Commits

Author SHA1 Message Date
Nipun Kwatra
4e94c30ed5 Added command type to play recording sound.
Added CAMERA_CMD_PLAY_RECORDING_SOUND command type to play recording
sound through sendCommand. This is currently needed by time lapse
recording using still mode capture, which disables the shutter sound
but needs to play the recording sound.

Change-Id: I376aa40f45b6064fd862abc065456b06fc338020
2010-09-14 16:49:08 -07:00
Nipun Kwatra
088146a421 Adding enable/disable option for sendCommand()
- Added enum CAMERA_CMD_ENABLE_SHUTTER_SOUND which corresponds to
  command type for enabling/disabling shutter sound.
- The implementation checks if it is legal to disable shutter sound.
  If it is, then any process can disable the sound. If not, then only
  the mediaserver process is allowed to do this. Currently time lapse
  capture needs this functionality to disable shutter sound when still
  mode is used to capture time lapse video.

Change-Id: Id147a3bcc6a345c2c6a6d52bf98fd8292386bb19
2010-09-14 13:57:59 -07:00
Jaikumar Ganesh
1510770165 Add missing return statement.
Change-Id: Iee4ee8a62c5c85176c457bd674ac25acdf978ae9
2010-09-13 15:24:01 -07:00
Jaikumar Ganesh
20c8f47330 resolved conflicts for merge of 0522f5e9 to master
Change-Id: Ie0a7ece33dced1042948087053e49665f6235fc2
2010-09-13 14:57:59 -07:00
Shimeng (Simon) Wang
b6b81f5f39 am 4de4f09e: (-s ours) am fbd26467: Merge "DO NOT MERGE" into gingerbread
Merge commit '4de4f09e8ed95255c1077cfbbaf018877221455d'

* commit '4de4f09e8ed95255c1077cfbbaf018877221455d':
  DO NOT MERGE
2010-09-13 14:43:16 -07:00
Eric Laurent
e931c68f53 am 4d987850: am bd2e9ec6: Merge "Fix volume problems with insert revert" into gingerbread
Merge commit '4d9878502f7661ed34540a485a5942d859e209c7'

* commit '4d9878502f7661ed34540a485a5942d859e209c7':
  Fix volume problems with insert revert
2010-09-13 14:42:59 -07:00
Vasu Nori
992f7d52fa caching code retooled to reduce locking + handle SMP
1. Moved all code related to compiled-sql statement cache to SQLiteCache.java
Removed all caching related code from everywhere else.
2. Moved all code related to compiling a sql statement and caching it to
SQLiteCompiledSql.java. There was some code in SQLiteProgram.java
releated to this. moved it out.
3. Added state to SQLiteCompiledSql. This is to help in debugging.
Change-Id: I63ab0c9c4419e964eb9796d284dd389985763d83
2010-09-13 14:38:24 -07:00
Romain Guy
f4cae9f944 Merge "Forces windows to draw the first time they show." 2010-09-13 12:53:21 -07:00
Romain Guy
58ef7fbf16 Forces windows to draw the first time they show.
Change-Id: I239572ee49bc60f30d957f548104e75844859a93
2010-09-13 12:52:37 -07:00
Nipun Kwatra
5195e615b0 Merge "Enabling time lapse in setProfile, added setCaptureRate" 2010-09-13 12:22:35 -07:00
Nipun Kwatra
4f6bf17407 Enabling time lapse in setProfile, added setCaptureRate
- Time lapse is automatically enabled in setProfile() if a time lapse
  profile is selected. Also audio setup is skipped for time lapse.
- Added setCaptureRate() to set the frame capture rate, which may be
  different from the video playback rate.
- Getting rid of enableTimeLapse() since setProfile() and
  setFrameCaptureDelay() do its job now.

Change-Id: Ifd9f89cea0d05ffbefc22eac4ea5d34147cc1fbe
2010-09-13 12:19:05 -07:00
Jaikumar Ganesh
0522f5e9b7 am cc5494c9: Out Of Band API for Secure Simple Pairing.
Merge commit 'cc5494c9996f809e36539b24e8b6b67683383d29' into gingerbread-plus-aosp

* commit 'cc5494c9996f809e36539b24e8b6b67683383d29':
  Out Of Band API for Secure Simple Pairing.
2010-09-13 11:52:19 -07:00
Shimeng (Simon) Wang
4de4f09e8e am fbd26467: Merge "DO NOT MERGE" into gingerbread
Merge commit 'fbd2646705c52c111f041b16d7cb34cb922a2a64' into gingerbread-plus-aosp

* commit 'fbd2646705c52c111f041b16d7cb34cb922a2a64':
  DO NOT MERGE
2010-09-13 11:51:55 -07:00
Eric Laurent
4d9878502f am bd2e9ec6: Merge "Fix volume problems with insert revert" into gingerbread
Merge commit 'bd2e9ec64d9a292a1309504c6c5fe33e1bc2333a' into gingerbread-plus-aosp

* commit 'bd2e9ec64d9a292a1309504c6c5fe33e1bc2333a':
  Fix volume problems with insert revert
2010-09-13 11:51:46 -07:00
Chris Palmer
f5aafff485 Unbreak the build.
Just a quick fix. Will properly re-add @deprecated and update-api next, and
then get API approval.

Change-Id: Idf57a33dc97bc2619cf48509f74d9e0de935124b
2010-09-13 11:40:44 -07:00
Jaikumar Ganesh
cc5494c999 Out Of Band API for Secure Simple Pairing.
Change-Id: I54ded27ab85d46eef3d2cca84f2394b1ffe88ced
2010-09-13 11:40:21 -07:00
Shimeng (Simon) Wang
ba15633a22 Merge "Accessibility support for WebViews" 2010-09-13 11:06:33 -07:00
Shimeng (Simon) Wang
fbd2646705 Merge "DO NOT MERGE" into gingerbread 2010-09-13 11:00:16 -07:00
Maksymilian Osowski
8e0835c08e Merge "Added overridePreference() layoutTestsController function." 2010-09-13 10:54:28 -07:00
Maksymilian Osowski
5e689a7486 Added overridePreference() layoutTestsController function.
Change-Id: I99fbf7490c3c6eb063bf5ed0bbd2bced0f10a967
2010-09-13 18:49:59 +01:00
Shimeng (Simon) Wang
dc9f2b6668 DO NOT MERGE
Use a static variable and methods for the current WebView.

sJavaBridge may not exist by the time onWindowFocusChanged is called.
To avoid an NPE, just static methods that modify a global field.
JWebCoreJavaBridge is a global object anyway so using a static field
will be fine.  To avoid any garbage collection issues, store the
WebView in a WeakReference.

Bug: 2908023
Change-Id: I05e9261f2c3d13c10c73c9b34f3aeea1d12a08a6
2010-09-13 10:47:58 -07:00
Chris Palmer
ed35d0ee85 Merge "Correct the PackageManager.checkSignatures documentation." 2010-09-13 10:39:04 -07:00
Steve Block
20f380771e Merge "Update DumpRenderTree2 to only calculate the WebKit revision once per test run" 2010-09-13 10:29:36 -07:00
Svetoslav Ganov
585f13f8de Accessibility support for WebViews
Change-Id: Ibb139192bae4d60fd53a7872b19c06312bb41558
2010-09-13 10:21:34 -07:00
Eric Fischer
569a57dc01 Merge "Import revised translations." 2010-09-13 10:04:58 -07:00
Steve Block
ab87db4ad8 Update DumpRenderTree2 to only calculate the WebKit revision once per test run
This is obtained by a HTTP request to ThirdPartyProject.prop

Change-Id: I34e310cf52fbcef24bb2a76e64aab5263b3052f1
2010-09-13 17:32:16 +01:00
Eric Laurent
bd2e9ec64d Merge "Fix volume problems with insert revert" into gingerbread 2010-09-13 09:14:39 -07:00
Eric Laurent
27a2fdfb8a Fix volume problems with insert revert
- Use a constant input level to the reverb engine and implement volume control in the
insert reverb. This avoids the volume spikes when an effect that was inserted after
the reverb is disabled or removed.
- Fix clicks (one silent buffer) at the end of the reverb disable period.
- Modified volume management in audioflinger so that the volume ramp is also done by
the insert effect if present when the track is paused (avoids clicks).
- Increased room level for all presets.

Also fixed problems with output stage session (-1):
- effect bundle wrapper was not designed to support session -1
- the permission check in audioflinger for using session -1 failed due to a wrong usage of
getCallingPid()

Change-Id: Id1ff51327263364bf71d3f2668fa5cde4311d84f
2010-09-13 09:08:28 -07:00
Steve Block
c54df24fa9 Remove superfluous FileFilter from DumpRenderTree2 DirListActivity.java
Change-Id: I5e7d86fc4e05ac512ce1b2c55660d3b7f0de2750
2010-09-13 16:04:18 +01:00
Steve Block
5c27bc1c64 When running DumpRenderTree2 from script, remove old results files
This makes sure that should we fail to get a new results file from
the device, we won't ever show an old results file to the user.

Change-Id: Ib00ae391a6b2b43a336370ef23af2d6c95589918
2010-09-13 16:00:42 +01:00
Steve Block
bdebd0621b Update DumpRenderTree2 to store results in /sdcard/layout-test-results
This more closely follows other WebKit platforms, which use
/tmp/layout-test-results.

Change-Id: Ice702b73d7425250d595e8321e14ff3becb66ed5
2010-09-13 15:55:13 +01:00
Steve Block
34c68912be Remove the last remnants in DumpRenderTree2 of the absolute path to the tests
This is no longer required.

Change-Id: I27db10e8c723162b319d9a714b086f508db706e0
2010-09-13 15:51:11 +01:00
Steve Block
7438b53487 Update DumpRenderTree2 text results output to better match HTML version
Always print number of crashes and line things up nicely.

Change-Id: I79a72056ba5ce007fdd4154f1518b9535b595317
2010-09-13 14:28:46 +01:00
Maksymilian Osowski
d96f3360f9 Merge "Updated the AdbUtils class to better manage opening and closing the resources." 2010-09-13 02:52:54 -07:00
Maksymilian Osowski
5af84db492 Updated the AdbUtils class to better manage opening and closing the resources.
Change-Id: I83ebc6409d57a28f9015ec9726f797417ec03212
2010-09-13 10:51:08 +01:00
Hung-ying Tyan
0b5a8bd579 am a5dce0c1: am 3d7606aa: SIP: enhance timeout and registration status feedback.
Merge commit 'a5dce0c15ac05724b4595d62d521a481c7e1f86a'

* commit 'a5dce0c15ac05724b4595d62d521a481c7e1f86a':
  SIP: enhance timeout and registration status feedback.
2010-09-13 02:50:26 -07:00
Maksymilian Osowski
741fdc8088 Merge "Updated FsUtils to use apache HttpClient instead of java.net UrlConnection." 2010-09-13 02:49:09 -07:00
Hung-ying Tyan
a5dce0c15a am 3d7606aa: SIP: enhance timeout and registration status feedback.
Merge commit '3d7606aa607b24817e37c264f2141ed7b2d50be0' into gingerbread-plus-aosp

* commit '3d7606aa607b24817e37c264f2141ed7b2d50be0':
  SIP: enhance timeout and registration status feedback.
2010-09-13 02:48:22 -07:00
Maksymilian Osowski
ce2ef18c8f Updated FsUtils to use apache HttpClient instead of java.net UrlConnection.
It fixed sockets leaking during readDataFromUrl() invocations.

Change-Id: Ifb1aeb32fe9bb4ffa353cf521b5174a83de270db
2010-09-13 10:47:50 +01:00
Hung-ying Tyan
3d7606aa60 SIP: enhance timeout and registration status feedback.
http://b/issue?id=2984419
http://b/issue?id=2991065

Change-Id: I2d3b1dd3a70079ff347f7256f4684aea07847f4e
2010-09-13 17:45:39 +08:00
Hung-ying Tyan
e765994831 am 38dc67f4: am 25b52a2f: SIP: remove dependency on javax.sip.SipException.
Merge commit '38dc67f49ec77d34c858777144323960c37d045e'

* commit '38dc67f49ec77d34c858777144323960c37d045e':
  SIP: remove dependency on javax.sip.SipException.
2010-09-13 02:21:09 -07:00
Hung-ying Tyan
38dc67f49e am 25b52a2f: SIP: remove dependency on javax.sip.SipException.
Merge commit '25b52a2f97df112c2836972d0b6d9a4c7a9c4a4e' into gingerbread-plus-aosp

* commit '25b52a2f97df112c2836972d0b6d9a4c7a9c4a4e':
  SIP: remove dependency on javax.sip.SipException.
2010-09-13 02:16:52 -07:00
Hung-ying Tyan
25b52a2f97 SIP: remove dependency on javax.sip.SipException.
Change-Id: I77d289bef1b5e7f1ec0c0408d0bbf96c21085cd7
2010-09-13 16:50:12 +08:00
Jeff Brown
19c9c7cc6d am fb8116f7: am c891d2b3: Merge "Fix PointerLocationView when pointer ids are not zero-based." into gingerbread
Merge commit 'fb8116f736f2df6d1b2f8044541390a9fd9953cb'

* commit 'fb8116f736f2df6d1b2f8044541390a9fd9953cb':
  Fix PointerLocationView when pointer ids are not zero-based.
2010-09-12 20:50:16 -07:00
Jeff Brown
fb8116f736 am c891d2b3: Merge "Fix PointerLocationView when pointer ids are not zero-based." into gingerbread
Merge commit 'c891d2b3529b9cf24ef4781a585cd4784815e711' into gingerbread-plus-aosp

* commit 'c891d2b3529b9cf24ef4781a585cd4784815e711':
  Fix PointerLocationView when pointer ids are not zero-based.
2010-09-12 20:47:50 -07:00
Jeff Brown
c891d2b352 Merge "Fix PointerLocationView when pointer ids are not zero-based." into gingerbread 2010-09-12 20:45:31 -07:00
Mike Lockwood
0c7d077e9a Merge changes I68379740,I9053218f
* changes:
  MediaFile: Add support for some popular non-media file types.
  Media scanner support for tracking files of arbitrary type.
2010-09-12 20:41:07 -07:00
Jeff Brown
d1e0c371a6 Fix PointerLocationView when pointer ids are not zero-based.
Since we support using driver-provided pointer ids (ABS_MT_TRACKING_ID)
there is no guarantee that pointer ids will necessarily start from 0
or be contiguous.

Change-Id: I9609b7a3bb238d7edbcbd68cc839dd6d14baf9df
2010-09-12 20:40:51 -07:00
Mike Lockwood
fde2ca180e MediaFile: Add support for some popular non-media file types.
Change-Id: I68379740b535b08e707158f357e4e58a9c4d74ec
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-12 23:21:54 -04:00
Mike Lockwood
c37255d5d0 Media scanner support for tracking files of arbitrary type.
The native media scanner no longer filters files based on file extension.
Audio, video, image and playlist files are handled as before, but non-media
files are now inserted into the "files" table, which was originally added
to support MTP.

Change-Id: I9053218fb6d2671a3bb181405c34442b94678afc
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-12 23:21:44 -04:00