31050 Commits

Author SHA1 Message Date
Dirk Dougherty
f6a04aeeed am f9c7a3e2: am e71396cf: am 4b4af990: Doc change: update ADT 0.9.8 checksum and size.
Merge commit 'f9c7a3e25e6e83292051414246cb1fc0c5f85207'

* commit 'f9c7a3e25e6e83292051414246cb1fc0c5f85207':
  Doc change: update ADT 0.9.8 checksum and size.
2010-09-15 07:08:23 -07:00
Kenny Root
685da21c1c am 3ca26914: am 30434415: Merge "Dedupe timestamp in PackageSettings" into gingerbread
Merge commit '3ca2691446d333d52b1c0a39e6df74e03c2407cc'

* commit '3ca2691446d333d52b1c0a39e6df74e03c2407cc':
  Dedupe timestamp in PackageSettings
2010-09-15 07:08:15 -07:00
Hung-ying Tyan
b1c4a01985 am ae83faa3: am 13f6270e: SipAudioCall: use SipErrorCode instead of string in onError()
Merge commit 'ae83faa3eeb26b1983fb1b8b663eebfe1f1f61d5'

* commit 'ae83faa3eeb26b1983fb1b8b663eebfe1f1f61d5':
  SipAudioCall: use SipErrorCode instead of string in onError()
2010-09-15 07:08:04 -07:00
Hung-ying Tyan
fcc7fb8a1a am 3692af92: am 99bf4e45: SIP: remove dependency on javax.sip
Merge commit '3692af92ab290a561a927079cbf1f778f57fe5f9'

* commit '3692af92ab290a561a927079cbf1f778f57fe5f9':
  SIP: remove dependency on javax.sip
2010-09-15 07:07:56 -07:00
Chung-yih Wang
4586063969 am 316e72cb: am 5dde95b8: Merge "Fix the bug of authentication in an outgoing call." into gingerbread
Merge commit '316e72cb05637735c67ae02911dd0dbe096c71f5'

* commit '316e72cb05637735c67ae02911dd0dbe096c71f5':
  Fix the bug of authentication in an outgoing call.
2010-09-15 07:07:47 -07:00
Jaikumar Ganesh
ea8e8d7342 am b390728b: am a224f70b: Fix interaction between BluetoothEventLoop and BluetoothService.
Merge commit 'b390728b54805ecba3e0690edf2b83b60933e6a7'

* commit 'b390728b54805ecba3e0690edf2b83b60933e6a7':
  Fix interaction between BluetoothEventLoop and BluetoothService.
2010-09-15 07:07:38 -07:00
Hung-ying Tyan
074663c762 am ca83c25d: am 4565933f: Merge "SipService: deliver connectivity change to all sessions." into gingerbread
Merge commit 'ca83c25decd0d4dc9c765a2b42424c7974bd496a'

* commit 'ca83c25decd0d4dc9c765a2b42424c7974bd496a':
  SipService: deliver connectivity change to all sessions.
2010-09-15 07:07:19 -07:00
Maksymilian Osowski
d96c5e0cb3 Added setXSSAuditorEnabled() LayoutTestController function.
Change-Id: I262e434573ee79c998f3ace5103c191fc0989bd2
2010-09-15 11:27:49 +01:00
Nipun Kwatra
fb5a2d7365 Checks for auxiliary video recording.
- Check that time lapse mode is on when using auxiliary video recording.
- Check that auxiliary video size is strictly less than the main video
  size.

Change-Id: Ic49d25e6ac30f6f885ce4f5fb38dbe0cc7bc1be1
2010-09-14 18:23:57 -07:00
Nipun Kwatra
4922c79582 Merge "Added command type to play recording sound." 2010-09-14 17:48:02 -07:00
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
Vasu Nori
c62c8ae192 Merge "fix bugs in exception throwing code in native_fillwindow" 2010-09-14 16:40:24 -07:00
Vasu Nori
77267fc68f fix bugs in exception throwing code in native_fillwindow
when exceptions are thrown, they are not being handled correctly
and the end result is some random errors/exceptions.
also change LOGD to LOGD_IF(cond,...) in keeping with Android
standards

Change-Id: Ie7f5e5e4b071ca6b2a6aa899c678c81f9ccd8e71
2010-09-14 16:38:01 -07:00
Nipun Kwatra
1fec21be65 Unhiding time lapse api's, removing setTimeLapseParameters()
- Removing setTimeLapseParameters() as its functionality is taken
  over by setProfile() and setCaptureRate()
- Unhiding setCaptureRate()
- made setAuxiliaryOutputFile() public.
- Changed setAuxVideoParameters() to compute video size and bitrate
  using CamcorderProfile::QUALITY_HIGH. Also made it private as it
  now just needs to be called from setAuxiliaryOutputFile().

Change-Id: I94b8ed562579049b6b923c0fc4f3293285ef0a5b
2010-09-14 16:13:08 -07:00
Vasu Nori
b8c8dbe6d7 Merge "change TAG value from "Cursor" to "SQLiteCursor"" 2010-09-14 16:04:26 -07:00
Jason Sams
d28f5c485d Merge "Fix partial NP2 support and restrict mipmaps and clamp modes on HW that does not support proper NP2 bug 2965170" 2010-09-14 16:02:02 -07:00
Vasu Nori
071df261ed change TAG value from "Cursor" to "SQLiteCursor"
it is confusing to figure out where the debug messages are coming from.
this TAG value change helps

Change-Id: I3a6f445fbced4a962cc13dbb8dd1d7968f9aec9d
2010-09-14 16:02:02 -07:00
Jaikumar Ganesh
4c9a5be4a3 Merge "Rework Bluetooth tethering networking configuration." 2010-09-14 15:27:47 -07:00
Jaikumar Ganesh
707952ecd4 Rework Bluetooth tethering networking configuration.
Limit it to 5 for now, and store the iface.

Change-Id: Ia6044b8e8f886dcd587ab0bb57273e0c11b6cd74
2010-09-14 15:25:14 -07:00
Nipun Kwatra
22c0a58e76 Merge "Adding enable/disable option for sendCommand()" 2010-09-14 15:15:16 -07:00
Adam Powell
6fe4e3fd36 Merge "Improve ListView smooth scrolling timing" 2010-09-14 15:14:56 -07:00
Adam Powell
234a571530 Improve ListView smooth scrolling timing
Change-Id: Icbd727efd5bafa1a80d65003aead1697f6103fda
2010-09-14 15:12:11 -07:00
Jason Sams
cfc0436699 Fix partial NP2 support and restrict mipmaps and clamp
modes on HW that does not support proper NP2
bug 2965170

Change-Id: If9a3ac45264861fc75b9616e98957e12a5464411
2010-09-14 14:59:37 -07:00
Jean-Baptiste Queru
213fc950d4 Revert "Manage fonts like a true product definition"
This reverts commit 84d36a657d7954dc08f3ef9f057ff2526036e817.
2010-09-14 14:07:41 -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
Vasu Nori
a4ab724b48 Merge "revert Change-Id: Ic610a0c38e7bd7c77006a08c7b82fa01957739e5" 2010-09-14 13:37:57 -07:00
Shimeng (Simon) Wang
cbce2e7da4 Merge "Fix comment." 2010-09-14 13:37:37 -07:00
Vasu Nori
b83cb7cda3 revert Change-Id: Ic610a0c38e7bd7c77006a08c7b82fa01957739e5
can't change return type from void to int.

Change-Id: Iec3d95c731f117aca20b29c719cef7bcc6356ac0
2010-09-14 13:36:01 -07:00
Shimeng (Simon) Wang
7924a4a3a0 Fix comment.
Change-Id: I927565aadc7f4a5aac6c0a11c28210440600e8a4
2010-09-14 13:20:46 -07:00
Jean-Baptiste Queru
9912376d0c Merge "Manage fonts like a true product definition" 2010-09-14 13:17:18 -07:00
Vasu Nori
5402590f1c change return type from void to int on execSQL() methods
1. let execSQL() methods return the number of rows affected by the SQL
staement executed.
2. remove synchronized on 2 public methods. since public API is not
supposed to have synchronized, this was a mistake in previously submitted
CL

Change-Id: Ic610a0c38e7bd7c77006a08c7b82fa01957739e5
2010-09-14 12:14:26 -07:00
Vasu Nori
b729dcc8a9 Revert "caching code retooled to reduce locking + handle SMP"
This reverts commit 992f7d52fad590d90edc166cd74380e96d627605.

Change-Id: Ia5b789d1b2195d6ce43baffe24296c857f9b30f6
2010-09-14 11:55:24 -07:00
Alex Sakhartchouk
d3326231dc Merge "Shader changes to allow for more flexible constant binding." 2010-09-14 11:39:53 -07:00
Jean-Baptiste Queru
84d36a657d Manage fonts like a true product definition
Change-Id: I9635f087d69dd302e3c313073a537a8ed283bb68
2010-09-14 11:34:55 -07:00
Amith Yamasani
9322775014 Add a missing setOnCloseListener and a new setIconfied method.
Keep track of the currently iconified state as well, if the app
wants to know.
2010-09-14 10:55:10 -07:00
Maksymilian Osowski
023606abb6 Merge "Changed Summarizer to add header before printing the path in summary.txt and details.html" 2010-09-14 10:37:46 -07:00
Steve Block
8a2e55239a Merge "Implement LayoutTestController.setAppCacheMaximumSize() for DumpRenderTree2" 2010-09-14 10:21:30 -07:00
Maksymilian Osowski
75aa0d3828 Changed Summarizer to add header before printing the path in summary.txt and details.html
Change-Id: I6413e1871ede077793d49b7d4732f90d0aea352f
2010-09-14 18:13:07 +01:00
Maksymilian Osowski
ac0b599fa7 Merge "Made the run_layout_tests.py script restart the apache2 server before it starts." 2010-09-14 10:04:23 -07:00
Vasu Nori
9a68713ca0 Merge "sql statement with syntax errors can leave database lock in bad state" 2010-09-14 10:04:13 -07:00
Alex Sakhartchouk
c984dd73c6 Shader changes to allow for more flexible constant binding.
Change-Id: Ic66e6e2a371c6e3d5dce1b00f63acab8c09bd110
2010-09-14 09:50:43 -07:00
Dirk Dougherty
f9c7a3e25e am e71396cf: am 4b4af990: Doc change: update ADT 0.9.8 checksum and size.
Merge commit 'e71396cf4704ee9e26f510b511c1e793d8048d83' into gingerbread-plus-aosp

* commit 'e71396cf4704ee9e26f510b511c1e793d8048d83':
  Doc change: update ADT 0.9.8 checksum and size.
2010-09-14 09:46:44 -07:00
Kenny Root
3ca2691446 am 30434415: Merge "Dedupe timestamp in PackageSettings" into gingerbread
Merge commit '3043441511e4483d24dc6f42e1ee7f7e9dc71be2' into gingerbread-plus-aosp

* commit '3043441511e4483d24dc6f42e1ee7f7e9dc71be2':
  Dedupe timestamp in PackageSettings
2010-09-14 09:46:40 -07:00
Hung-ying Tyan
ae83faa3ee am 13f6270e: SipAudioCall: use SipErrorCode instead of string in onError()
Merge commit '13f6270eb14b409709c936b828e2a2fd40e427c4' into gingerbread-plus-aosp

* commit '13f6270eb14b409709c936b828e2a2fd40e427c4':
  SipAudioCall: use SipErrorCode instead of string in onError()
2010-09-14 09:44:03 -07:00
Hung-ying Tyan
3692af92ab am 99bf4e45: SIP: remove dependency on javax.sip
Merge commit '99bf4e45c4566172189735b34b368b76660ca57a' into gingerbread-plus-aosp

* commit '99bf4e45c4566172189735b34b368b76660ca57a':
  SIP: remove dependency on javax.sip
2010-09-14 09:43:54 -07:00
Chung-yih Wang
316e72cb05 am 5dde95b8: Merge "Fix the bug of authentication in an outgoing call." into gingerbread
Merge commit '5dde95b8fe0fea1a115a68f8acf826371da89da7' into gingerbread-plus-aosp

* commit '5dde95b8fe0fea1a115a68f8acf826371da89da7':
  Fix the bug of authentication in an outgoing call.
2010-09-14 09:43:46 -07:00
Jaikumar Ganesh
b390728b54 am a224f70b: Fix interaction between BluetoothEventLoop and BluetoothService.
Merge commit 'a224f70b1efc29d9698da5b5c143251a43838f2b' into gingerbread-plus-aosp

* commit 'a224f70b1efc29d9698da5b5c143251a43838f2b':
  Fix interaction between BluetoothEventLoop and BluetoothService.
2010-09-14 09:43:31 -07:00
Hung-ying Tyan
ca83c25dec am 4565933f: Merge "SipService: deliver connectivity change to all sessions." into gingerbread
Merge commit '4565933f03a99750a333e97e95408c404984510f' into gingerbread-plus-aosp

* commit '4565933f03a99750a333e97e95408c404984510f':
  SipService: deliver connectivity change to all sessions.
2010-09-14 09:43:17 -07:00
Dirk Dougherty
e71396cf47 am 4b4af990: Doc change: update ADT 0.9.8 checksum and size.
Merge commit '4b4af990af527c79073d546ead1850278caa7a8e' into gingerbread

* commit '4b4af990af527c79073d546ead1850278caa7a8e':
  Doc change: update ADT 0.9.8 checksum and size.
2010-09-14 09:39:59 -07:00
Kenny Root
3043441511 Merge "Dedupe timestamp in PackageSettings" into gingerbread 2010-09-14 09:29:48 -07:00