26764 Commits

Author SHA1 Message Date
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
Hung-ying Tyan
99bf4e45c4 SIP: remove dependency on javax.sip
and change errorCodeString to errorCode in
SipRegistrationListener.onRegistrationFailed().

Change-Id: Id9618f5a4b0effaed04f8b0dc60347499d9e4501
2010-09-14 20:29:02 +08:00
Chung-yih Wang
5dde95b8fe Merge "Fix the bug of authentication in an outgoing call." into gingerbread 2010-09-13 23:31:18 -07:00
Chung-yih Wang
7d137e40cd Fix the bug of authentication in an outgoing call.
Since we missed the check of another challenge header in the
proxy authentication response.

Change-Id: Ie5b9d22c6c55b4d65619d2194c88845e7dd59f15
2010-09-14 14:17:02 +08:00
Jaikumar Ganesh
a224f70b1e Fix interaction between BluetoothEventLoop and BluetoothService.
BluetoothEventLoop primarily handles event notifications from Bluez.
It should know innards of Bonding and especially BondState.
BondState class and BluetoothService call into each other.
When BluetoothEvent loop gets the handle to BondState it leads
to deadlocks and ANRs.

Change-Id: I785c57f6246c1288350d26d4acb87d879b27a5f9
2010-09-13 21:58:10 -07:00
Hung-ying Tyan
4565933f03 Merge "SipService: deliver connectivity change to all sessions." into gingerbread 2010-09-13 19:53:58 -07:00
Dianne Hackborn
6421ae7eff am 5251c800: Merge "Fix potential crash in sync." into gingerbread
Merge commit '5251c800c93c6f6fd473475c36b8ab3b360c1e4d' into gingerbread-plus-aosp

* commit '5251c800c93c6f6fd473475c36b8ab3b360c1e4d':
  Fix potential crash in sync.
2010-09-13 17:26:34 -07:00
Dianne Hackborn
5251c800c9 Merge "Fix potential crash in sync." into gingerbread 2010-09-13 17:21:04 -07:00
Dianne Hackborn
527c02838b am a0eb56ac: Merge "Work on issue #2991868: A toast pops up informing users..." into gingerbread
Merge commit 'a0eb56ac59751ab7fb060980e14edcacca439635' into gingerbread-plus-aosp

* commit 'a0eb56ac59751ab7fb060980e14edcacca439635':
  Work on issue #2991868: A toast pops up informing users...
2010-09-13 17:17:19 -07:00
Dianne Hackborn
a0eb56ac59 Merge "Work on issue #2991868: A toast pops up informing users..." into gingerbread 2010-09-13 17:14:00 -07:00
Dianne Hackborn
50addddba5 Fix potential crash in sync.
Change-Id: I523d8faa24b7ba57dcc09cbe91b5cb91d9f6f262
2010-09-13 17:12:51 -07:00
Hung-ying Tyan
d231aa880a SipService: deliver connectivity change to all sessions.
+ add DATA_CONNECTION_LOST to SipErrorCode
+ convert it to Connection.DisconnectCause.LOST_SIGNAL in SipPhone

http://b/issue?id=2992548

Change-Id: Ie8983c1b81077b21f46304cf60b8e61df1ffd241
2010-09-14 08:00:09 +08:00
Dianne Hackborn
8c5755aab5 Work on issue #2991868: A toast pops up informing users...
...that Market took over the screen after signing into a Google account

Don't warn the user about a new activity coming up on an activity that
is finishing.

Change-Id: I573073139d42a485473d0c8a7df450c1a23c35c3
2010-09-13 16:58:59 -07:00
Adam Powell
59a29f4a6c am b07c0789: Merge "DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue" into gingerbread
Merge commit 'b07c078921fb917d33075a63d77fdf98221e2bac' into gingerbread-plus-aosp

* commit 'b07c078921fb917d33075a63d77fdf98221e2bac':
  DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue
2010-09-13 16:11:55 -07:00
Adam Powell
b07c078921 Merge "DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue" into gingerbread 2010-09-13 16:09:51 -07:00
Adam Powell
57361ef001 DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue
Change-Id: I03cc18616dec05eb9e0383dc02371366c70cc12b
2010-09-13 16:08:35 -07:00
Irfan Sheriff
b62bc96322 am ab2ac887: Merge "Fix statusbar display of wifi signalstrength" into gingerbread
Merge commit 'ab2ac887751c41ddb34daa97ea4da07b08cc2ba8' into gingerbread-plus-aosp

* commit 'ab2ac887751c41ddb34daa97ea4da07b08cc2ba8':
  Fix statusbar display of wifi signalstrength
2010-09-13 16:08:12 -07:00
Irfan Sheriff
ab2ac88775 Merge "Fix statusbar display of wifi signalstrength" into gingerbread 2010-09-13 16:05:06 -07:00
Robert Greenwalt
fa974c5909 Fix statusbar display of wifi signalstrength
When turning a 1d array into a 2d, be sure and adjust length-checks.
bug:2995809

Change-Id: I9ff53f75958ea7808eb9f44bc05497e86f1807a2
2010-09-13 15:53:26 -07:00
Dianne Hackborn
53686433a9 am 7e9f4eb2: Track client requests through location manager.
Merge commit '7e9f4eb2608148436cef36c9969bf8a599b39e72' into gingerbread-plus-aosp

* commit '7e9f4eb2608148436cef36c9969bf8a599b39e72':
  Track client requests through location manager.
2010-09-13 14:34:22 -07:00
Dianne Hackborn
7e9f4eb260 Track client requests through location manager.
This fixes a problem where applications could ask the location
manager to do very heavy-weight things (like...  say... update
location every minute), which would get accounted against the
system instead of the application because ultimately it is the
system making the heavy calls (wake locks, etc).

To solve this, we introduce a new class WorkSource representing
the source of some work.  Wake locks and Wifi locks allow you
to set the source to use (but only if you are system code and thus
can get the permission to do so), which is what will be reported
to the battery stats until the actual caller.

For the initial implementation, the location manager keeps track
of all clients requesting periodic updates, and tells its providers
about them as a WorkSource param when setting their min update time.
The network location provider uses this to set the source on the
wake and wifi locks it acquires, when doing work because of the
update period.

This should also be used elsewhere, such as in the GPS provider,
but this is a good start.

Change-Id: I2b6ffafad9e90ecf15d7c502e2db675fd52ae3cf
2010-09-13 14:20:48 -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
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
fbd2646705 Merge "DO NOT MERGE" into gingerbread 2010-09-13 11:00:16 -07: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
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
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
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
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
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
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
Kenny Root
8b11f30cb2 am 1bece432: Make nativeLibraryDir visible in the API
Merge commit '1bece4320c1d2308b4a5b5aeda47b065312b3053' into gingerbread-plus-aosp

* commit '1bece4320c1d2308b4a5b5aeda47b065312b3053':
  Make nativeLibraryDir visible in the API
2010-09-12 19:31:45 -07:00
Kenny Root
1bece4320c Make nativeLibraryDir visible in the API
Change-Id: Ic88e76a85b0041e97b4c29c42dfa09db0356391c
2010-09-12 19:20:32 -07:00
Steve Howard
f353daa03a am 90fb15a7: Support UI visibility and restarting in download manager.
Merge commit '90fb15a7e52b1208b8d4f7518a61efb99580b5b0' into gingerbread-plus-aosp

* commit '90fb15a7e52b1208b8d4f7518a61efb99580b5b0':
  Support UI visibility and restarting in download manager.
2010-09-12 19:11:08 -07:00
Steve Howard
90fb15a7e5 Support UI visibility and restarting in download manager.
First, this change adds a column to the downloads table specifying
whether a download should be displayed in the system downloads UI.  It
adds a public method to set this parameter when requesting a download,
and a hidden method to filter queries based on this paramter (such
filtering could be made public later, but it's not strictly necessary
right now).

Second, this change adds support for restarting a completed/failed
download as a hidden method on DownloadManager.  Currently it only
works from the download manager's process - it'll be used by the new
download manager UI.

Change-Id: I15eda1a6e3717d1ce947a810b25ad3540cce809e
2010-09-12 18:58:55 -07:00
Jeff Brown
40e3af61dc am 8abc9e9b: Merge "Don\'t play a sound if a volume key press is canceled." into gingerbread
Merge commit '8abc9e9b9917760a63cc38a030e64f207aeef86d' into gingerbread-plus-aosp

* commit '8abc9e9b9917760a63cc38a030e64f207aeef86d':
  Don't play a sound if a volume key press is canceled.
2010-09-12 18:13:47 -07:00
Jeff Brown
89b4cb1e98 am ff38e38d: Merge "Undo API patch due to field pulled up to superclass." into gingerbread
Merge commit 'ff38e38d05a39584650c7c37b4b528334529ec0f' into gingerbread-plus-aosp

* commit 'ff38e38d05a39584650c7c37b4b528334529ec0f':
  Undo API patch due to field pulled up to superclass.
2010-09-12 18:13:42 -07:00
Jeff Brown
8abc9e9b99 Merge "Don't play a sound if a volume key press is canceled." into gingerbread 2010-09-12 18:11:42 -07:00
Jeff Brown
ff38e38d05 Merge "Undo API patch due to field pulled up to superclass." into gingerbread 2010-09-12 18:11:05 -07:00
Jeff Brown
8b7a982d29 Don't play a sound if a volume key press is canceled.
Change-Id: I8e45af20ec83a81565e10be3648b95686fa897af
2010-09-12 18:09:11 -07:00
Kenny Root
1361a5bd1e am 07a9e8d3: Merge changes Ie3648509,I53db73c3 into gingerbread
Merge commit '07a9e8d39f818e54f0feccff10c99b9629007a64' into gingerbread-plus-aosp

* commit '07a9e8d39f818e54f0feccff10c99b9629007a64':
  Move native library removal function to helper
  Initialize native library path in PackageSetting
2010-09-12 18:02:47 -07:00
Jeff Brown
abeea05b30 Undo API patch due to field pulled up to superclass.
Earlier we extracted a common superclass InputEvent from KeyEvent
and MotionEvent.  During this process, getDeviceId() and mDeviceId
were moved to the superclass.  The API change tracking was unable
to automatically figure out that the method had just been moved up
to the superclass (still binary compatible) so we patched up 9.xml
manually to fool it.  Unfortunately mDeviceId slipped in there
when it should not have since it should have been marked with @hide.
This change just removes mDeviceId.

Change-Id: I5fca14c8dc6f98952b8afbdb6e034824a22bdb1d
2010-09-12 18:01:28 -07:00