31215 Commits

Author SHA1 Message Date
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
Chung-yih Wang
94e498332a Fixing the NPE in SipPhone
bug id: http://b/2987816

Change-Id: Iee252eee0a5243b70ff0b6f287279f92235b5b2d
2010-09-15 19:39:01 +08:00
Maksymilian Osowski
d96c5e0cb3 Added setXSSAuditorEnabled() LayoutTestController function.
Change-Id: I262e434573ee79c998f3ace5103c191fc0989bd2
2010-09-15 11:27:49 +01:00
Hung-ying Tyan
5306e0a85d Merge "SIP: add PEER_NOT_REACHABLE error feedback." into gingerbread 2010-09-14 23:10:03 -07:00
Hung-ying Tyan
096df8197b Merge "SipService: send SERVER_ERROR if server doesn't provide nonce" into gingerbread 2010-09-14 23:09:26 -07:00
Nipun Kwatra
8e02ca748b Disable shutter sound and play recording sound for still mode time lapse.
Disabling shutter sound when using still capture for time lapse recording.
We also play recording sound at the start and stop of recording as is
done for usual video recording.

Change-Id: I6a6fa0c7c867979624105eea74fc17945db1f517
2010-09-14 21:22:59 -07:00
Hung-ying Tyan
ae076d3981 SIP: add PEER_NOT_REACHABLE error feedback.
http://b/issue?id=3002033

Change-Id: Ib64b08919d214acbab89945ac19dc113a68e62ad
2010-09-15 11:30:45 +08: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
Kenny Root
79a1ee4249 am cee0b97e: Merge "Free AssetManager weak refs before unmounting" into gingerbread
Merge commit 'cee0b97eed0a460e2da58500e24d3e4dac5cb9f6' into gingerbread-plus-aosp

* commit 'cee0b97eed0a460e2da58500e24d3e4dac5cb9f6':
  Free AssetManager weak refs before unmounting
2010-09-14 18:04:53 -07:00
Kenny Root
cee0b97eed Merge "Free AssetManager weak refs before unmounting" into gingerbread 2010-09-14 18:02:39 -07:00
Steve Howard
d2de99e377 am 536ee090: Merge "Fix name shadowing bug with revoking URI permissions." into gingerbread
Merge commit '536ee090ef75add0f7244c1c22be83fe03a66010' into gingerbread-plus-aosp

* commit '536ee090ef75add0f7244c1c22be83fe03a66010':
  Fix name shadowing bug with revoking URI permissions.
2010-09-14 17:48:30 -07:00
Nipun Kwatra
4922c79582 Merge "Added command type to play recording sound." 2010-09-14 17:48:02 -07:00
Steve Howard
536ee090ef Merge "Fix name shadowing bug with revoking URI permissions." into gingerbread 2010-09-14 17:46:22 -07:00
Chris Palmer
c5e2e26b9d am 5bade703: Merge "DO NOT MERGE Correct the PackageManager.checkSignatures documentation." into gingerbread
Merge commit '5bade703fd8434ba4cd5c9d1e8e1dc0f383b32b5' into gingerbread-plus-aosp

* commit '5bade703fd8434ba4cd5c9d1e8e1dc0f383b32b5':
  DO NOT MERGE Correct the PackageManager.checkSignatures documentation.
2010-09-14 17:45:59 -07:00
Chris Palmer
5bade703fd Merge "DO NOT MERGE Correct the PackageManager.checkSignatures documentation." into gingerbread 2010-09-14 17:43:31 -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
Steve Howard
0de8ddb0cf Fix name shadowing bug with revoking URI permissions.
Change-Id: Ibfcb0dc73c6b1a111dbb8d56e6f0b78084f5e4e6
2010-09-14 16:29:26 -07:00
John Wang
8028bd5b69 am 6457a28b: Merge "Complete event registration in CallManager." into gingerbread
Merge commit '6457a28be8a0589fd027a86ebdee04a0cc6fefd5' into gingerbread-plus-aosp

* commit '6457a28be8a0589fd027a86ebdee04a0cc6fefd5':
  Complete event registration in CallManager.
2010-09-14 16:28:10 -07:00
John Wang
6457a28be8 Merge "Complete event registration in CallManager." into gingerbread 2010-09-14 16:26:14 -07:00
David Brown
f4ece2086f Mark MODIFY_PHONE_STATE permission as signatureOrSystem
This permission isn't needed right now, since there aren't actually any
public APIs that require it.  (There are a few calls in the ITelephony
interface that do, but they're all hidden.)

Since there's no good reason for 3rd party apps to declare it, let's
mark it signatureOrSystem for now.  We can bring it back -- and probably
split it apart into multiple finer-grained permissions -- once we
finally expose full telephony APIs to 3rd party apps (see bug 1043005).

Bug: 2989096
Change-Id: Idf898d5e12d648a959f622cd815e75597195aa82
2010-09-14 16:19:31 -07:00
Erik
0b46070d88 am 426ee7f2: Fixes some bugs in TimeZoneUtils
Merge commit '426ee7f22eeaa016cdbf0addbb7b2cc6b6cc3487' into gingerbread-plus-aosp

* commit '426ee7f22eeaa016cdbf0addbb7b2cc6b6cc3487':
  Fixes some bugs in TimeZoneUtils
2010-09-14 16:19:03 -07:00
Irfan Sheriff
31b62322bf Add per network static IP settings
Remove the existing global static IP settings and add support
for per network configuration

Change-Id: I5a6d8b877471b8c8ad07951c96d273893754607f
2010-09-14 16:15:22 -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
Erik
426ee7f22e Fixes some bugs in TimeZoneUtils
TimeZoneUtils was updating the db and modifying the selection. This
creates a static selection for each update type and creates new
values for each update. Also adds a method for apps to force the
local tz cache to refresh if they think another app has modified
the db.

Change-Id: Iaaade635ac8ff11bb116005a0f6b44efcd4c4056
2010-09-14 16:08:55 -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
John Wang
59f9bae81d Complete event registration in CallManager.
1. Originally CallManager registers for all phone events provided by registerFor interface,

which will cause error msg such as "registerForXXX() in PhoneBase should not be called, CDMAPhone inactive."

for CDMA only events. Register for those events only if phone is CDMA phone.

2. Add registerForPostDialCharacter().

Note, we can't use notifyRegistrants() in handler since we need send

the character that is being processed in msg.arg1.

Change-Id: I48037c8a8e225bb82e203836a041f81f2445f4d8
2010-09-14 16:01:50 -07:00
Jeff Brown
14bc6b5d06 am 09340a4b: Merge "Replace epoll() with poll() and rename PollLoop to Looper." into gingerbread
Merge commit '09340a4bb99507d9b6bfbfc68a450d4d4f354d73' into gingerbread-plus-aosp

* commit '09340a4bb99507d9b6bfbfc68a450d4d4f354d73':
  Replace epoll() with poll() and rename PollLoop to Looper.
2010-09-14 15:32:03 -07:00
Jaikumar Ganesh
4c9a5be4a3 Merge "Rework Bluetooth tethering networking configuration." 2010-09-14 15:27:47 -07:00
Jeff Brown
09340a4bb9 Merge "Replace epoll() with poll() and rename PollLoop to Looper." into gingerbread 2010-09-14 15:27:33 -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
Mathias Agopian
48a862407d am b3ffc78f: Merge "Add logging of various important graphics events" into gingerbread
Merge commit 'b3ffc78f3432344702e6f5232067ab624083cad2' into gingerbread-plus-aosp

* commit 'b3ffc78f3432344702e6f5232067ab624083cad2':
  Add logging of various important graphics events
2010-09-14 15:14:10 -07:00
Adam Powell
234a571530 Improve ListView smooth scrolling timing
Change-Id: Icbd727efd5bafa1a80d65003aead1697f6103fda
2010-09-14 15:12:11 -07:00
Mathias Agopian
b3ffc78f34 Merge "Add logging of various important graphics events" into gingerbread 2010-09-14 15:11:33 -07:00
jsh
b30f218820 am 17fe229f: Merge "Unhide GsmCellLocation.getPsc()." into gingerbread
Merge commit '17fe229fe8b5c43fe1fbd0511d6e4f1565a957d4' into gingerbread-plus-aosp

* commit '17fe229fe8b5c43fe1fbd0511d6e4f1565a957d4':
  Unhide GsmCellLocation.getPsc().
2010-09-14 15:05:53 -07:00
jsh
17fe229fe8 Merge "Unhide GsmCellLocation.getPsc()." into gingerbread 2010-09-14 15:02:46 -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
Kenny Root
aa48540222 Free AssetManager weak refs before unmounting
AssetManagers are kept in WeakReference pools so there's a change
another thread in the system_server has opened a file on the external
card. Attempt to force a garbage collection to free these references
each time we're about to unmount a volume on the external storage.

Change-Id: I6e816e8c67b179887e488dc6758b43bcdd5914fb
2010-09-14 14:49:41 -07:00
Jean-Baptiste Queru
3f6e7f4f71 Manage fonts like a true product definition
Change-Id: Ifc89c2fe9f4c2bb802dca34e9d53ae7176ff697c
2010-09-14 14:41:17 -07:00
James Dong
b5024daa6c Add some explicit error log messages
Change-Id: I8a69157b75a67f0d3c19f05775a8cb0629232299
2010-09-14 14:39:32 -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