29417 Commits

Author SHA1 Message Date
Hung-ying Tyan
7da1ffc9d2 am e2abd103: Merge "Set AudioGroup mode according to audio settings" into gingerbread
* commit 'e2abd103a2d311738ff1dd1e1d9b8e6c52aa870c':
  Set AudioGroup mode according to audio settings
2010-12-02 17:56:40 -08:00
Hung-ying Tyan
e2abd103a2 Merge "Set AudioGroup mode according to audio settings" into gingerbread 2010-12-02 17:50:33 -08:00
Jean-Baptiste Queru
a30c12a183 am 4a88013a: resolved conflicts for merge of bf1439c5 to stage-korg-master
* commit '4a88013a4a06a9ea80e8419f94694936e6b013f0':
  Preserve flags field of event passed to injectKeyEvent()
2010-12-02 15:21:35 -08:00
Jean-Baptiste Queru
4a88013a4a resolved conflicts for merge of bf1439c5 to stage-korg-master
Change-Id: Iab543a7ee449025f1df5d58afaa8f8fdd4809c99
2010-12-02 15:16:53 -08:00
Jean-Baptiste Queru
bf1439c513 Merge "Preserve flags field of event passed to injectKeyEvent()" 2010-12-02 14:56:13 -08:00
Xia Wang
5343f5a84e am 3591bebd: Merge "Restore Wi-Fi configuration after the test. DO NOT MERGE" into gingerbread
* commit '3591bebd5957a8547fc54659179a19440636e7f9':
  Restore Wi-Fi configuration after the test. DO NOT MERGE
2010-12-02 13:44:54 -08:00
Xia Wang
3591bebd59 Merge "Restore Wi-Fi configuration after the test. DO NOT MERGE" into gingerbread 2010-12-02 13:40:23 -08:00
James Dong
806398755f am d4c5478a: Merge "Be conservative in estimating the file size limit." into gingerbread
* commit 'd4c5478a8664f64ff66db9ae25250afac78b7a74':
  Be conservative in estimating the file size limit.
2010-12-02 10:21:06 -08:00
James Dong
d4c5478a86 Merge "Be conservative in estimating the file size limit." into gingerbread 2010-12-02 10:13:36 -08:00
Mike Playle
c6ded10dd1 Preserve flags field of event passed to injectKeyEvent()
This patch allows users of WindowManagerService.injectKeyEvent() to
set flags on the key event being injected.

In particular this allows long presses (FLAG_LONG_PRESS) to be
injected into the window manager.
2010-12-02 16:25:46 +00:00
Jean-Baptiste Queru
b087ceead7 am 40eade14: Merge from open-source master
* commit '40eade14bb87d24903588de04449fdfe2e1795cb':
  Fix crash by "adb shell pm list permissions -f|-s"
2010-12-02 07:59:52 -08:00
Jean-Baptiste Queru
5561ecff7b am 077bc4ac: Merge from open-source master
* commit '077bc4ac019ad33abd613448e11d3ad501218991':
  Fix HTTP redirect missing statuscode 303 and 307
2010-12-02 07:59:49 -08:00
Jean-Baptiste Queru
40eade14bb Merge from open-source master
Change-Id: Ie25bbfbf12fa8902d9ba82cf2d4ed4c60d439e39
2010-12-02 07:55:06 -08:00
Jean-Baptiste Queru
077bc4ac01 Merge from open-source master
Change-Id: Ie45ea6581abd02be0cd7cffed05c0a0b6e65c338
2010-12-02 07:54:57 -08:00
Eric Laurent
ed98a7c776 am 78d81851: Merge "Fix issue 2641884: Bluetooth volume is dependent on in call volume." into gingerbread
* commit '78d81851a8ef6691541215afb19e5bc690a4c3c0':
  Fix issue 2641884: Bluetooth volume is dependent on in call volume.
2010-12-01 16:04:09 -08:00
Eric Laurent
78d81851a8 Merge "Fix issue 2641884: Bluetooth volume is dependent on in call volume." into gingerbread 2010-12-01 15:59:31 -08:00
Xia Wang
fddbe98cca Restore Wi-Fi configuration after the test. DO NOT MERGE
- save Wi-Fi configuration and restore it after the test, other tests
  may need data connection
- Fix issue: reset dhcp after parsing a static IP setting.

bug: 3240713

Change-Id: I2158cab6fb6751414893b6a950d9e5bb20021645
2010-12-01 15:18:31 -08:00
Eric Laurent
e4eaa317f6 Fix issue 2641884: Bluetooth volume is dependent on in call volume.
The problem is that the code in AudioPolicyManagerBase::checkAndSetVolume() that forces
voice volume to max when setting bluetooth SCO volume is not called if the bluetooth stream
volume did not actually change. So even if we re apply volumes when switching to bluetooth
device, the volume voice volume is not changed and remains what it was when routed to earpiece
What makes things worse on Passion is that stream volumes are limited when connected to bluetooth
and their actual value does not change as soon as they exceed the limit threshold.

Change-Id: Id7c317db45b392a1c20dca2859678e3c64a371ed
2010-12-01 14:25:39 -08:00
Kenny Root
1de6ca69cc am 938d0972: Merge "Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService" into gingerbread
* commit '938d097263416ad416ee995e62dab559ea50bf0d':
  Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService
2010-12-01 14:20:49 -08:00
Kenny Root
938d097263 Merge "Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService" into gingerbread 2010-12-01 14:18:23 -08:00
Scott Main
5f9d8ecd20 am 83df6ead: am a45d6937: docs: dashboard update
* commit '83df6ead8dfd2037e4681793d439fffa5afda9fc':
  docs: dashboard update
2010-12-01 13:59:08 -08:00
Irfan Sheriff
d50ce4d7ac am f36bde82: DO NOT MERGE Dont let supplicant stay in DORMANT state
* commit 'f36bde828c0e427c0dbbe543b2465114c9aff45c':
  DO NOT MERGE Dont let supplicant stay in DORMANT state
2010-12-01 13:59:04 -08:00
Scott Main
83df6ead8d am a45d6937: docs: dashboard update
* commit 'a45d693757c14c2d97a81f1fd8faa3ba38b53021':
  docs: dashboard update
2010-12-01 12:59:42 -08:00
Scott Main
a45d693757 docs: dashboard update
Change-Id: Ia96a015dea41e32d1d2c892dddfd9a4fed5d49d0
2010-12-01 12:48:39 -08:00
Irfan Sheriff
f36bde828c DO NOT MERGE Dont let supplicant stay in DORMANT state
In some situations, the supplicant stays in a DORMANT
state. This prevents a connections to a network.

As long as the driver is started and we are not in scan-only
mode, issue a reconnect to get supplicant out of DORMANT
state.

Upon failures and network disable, supplicant should get
into an INACTIVE state.

Bug: 3236920
Change-Id: If32b5bfb7fea6c69c4a461db0b2012875b6273b5
2010-12-01 12:05:57 -08:00
Kenny Root
1de2eac9d0 Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService
Be compatible with the old DownloadProvider behavior of being able to
operate on content URIs returned from .insert()

Bug: 3242328
Change-Id: I7dad15ac0fefa867c3c8a33a579fc9899ac80262
2010-12-01 11:37:53 -08:00
Eric Laurent
0d28be6812 am e23212bc: Merge "Fix issue 3142808." into gingerbread
* commit 'e23212bc89bfcb3afbf8fdb5504556ead890e1a8':
  Fix issue 3142808.
2010-12-01 11:28:54 -08:00
Eric Laurent
e23212bc89 Merge "Fix issue 3142808." into gingerbread 2010-12-01 11:26:37 -08:00
John Wang
ae2a441911 am 4567847d: Add "canDial" check.
* commit '4567847d461afac08a80518637a0e48eff3c5247':
  Add "canDial" check.
2010-12-01 11:10:42 -08:00
Irfan Sheriff
869fa653e0 resolved conflicts for merge of 52556689 to gingerbread-plus-aosp
Change-Id: I61ed41f03b635ee760dc4c9d01935ac9fac9703a
2010-12-01 10:40:05 -08:00
John Wang
4567847d46 Add "canDial" check.
For bug #3164802.

CallManager allow a new phone call only if ALL of the following are true:

- Phone is not powered off
- There's no incoming or waiting call
- There's available call slot in either foreground or background
- The foreground call is ACTIVE or IDLE or DISCONNECTED.

Change-Id: I0124d600fd8c63b8c608301f3889b3faec47f1db
2010-12-01 10:26:49 -08:00
Irfan Sheriff
525566893b Merge "DO NOT MERGE Fix status fetch from supplicant" into gingerbread 2010-12-01 10:17:56 -08:00
Irfan Sheriff
f38b709e47 am af2d3c7c: Merge "DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver" into gingerbread
* commit 'af2d3c7ccebb009f31a92c1a87b0925a2891e1c4':
  DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver
2010-12-01 09:53:17 -08:00
Irfan Sheriff
e142eb0c24 DO NOT MERGE Fix status fetch from supplicant
Bug: 3192891
Change-Id: I2471f144494d398fe1d4572ac4d6421c100693e2
2010-12-01 09:52:32 -08:00
Irfan Sheriff
af2d3c7cce Merge "DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver" into gingerbread 2010-12-01 09:51:27 -08:00
Jean-Baptiste Queru
e1de3f390e Merge "Fix crash by "adb shell pm list permissions -f|-s"" 2010-12-01 09:47:14 -08:00
Eric Laurent
b87b53d7a8 Fix issue 3142808.
There is a bug in the way audio policy manager handles A2DP interface suspend/restore
when SCO is used. This bug is not new but has been triggered by a change in the timing
of the events received by audio policy manager when a call is setup and torn down
introduced by commit 164a8f86c7e48992691368c4895709c3bdb835a4.

The fix consists in grouping the control of A2DP suspended state in a single function
that is called systematically when conditions affecting this state are changed:
- call state change
- device connection/disconnection
- change in forced usage.

Change-Id: I46ee2399ee5547b60511fc6cfd32e2720091b0f8
2010-12-01 09:45:33 -08:00
Brad Fitzpatrick
7e5cd79683 am 981a72a1: Merge "[don\'t auto-merge] Don\'t re-read SharedPreferences unnecessarily." into gingerbread
* commit '981a72a1506f7e6e42747b9aa0be2001795c6619':
  [don't auto-merge] Don't re-read SharedPreferences unnecessarily.
2010-12-01 08:50:00 -08:00
Brad Fitzpatrick
981a72a150 Merge "[don't auto-merge] Don't re-read SharedPreferences unnecessarily." into gingerbread 2010-12-01 08:46:52 -08:00
Jean-Baptiste Queru
6cbca10893 Merge "Fix HTTP redirect missing statuscode 303 and 307" 2010-12-01 08:25:12 -08:00
Hung-ying Tyan
6034f9b266 am 06e8cdc0: Fix race between ending and answering a SIP call.
* commit '06e8cdc0f81ead604d5adf9d7b3f982e10226fd2':
  Fix race between ending and answering a SIP call.
2010-11-30 23:21:40 -08:00
Hung-ying Tyan
06e8cdc0f8 Fix race between ending and answering a SIP call.
+ Also fix race between ending and changing (holding/unholding) a SIP call.
+ Remove an unused method.

Bug : 3128233

Change-Id: Ie18d8333a88f0d9906d54988243d909b58e07e4b
2010-12-01 15:02:36 +08:00
Hung-ying Tyan
ed34b244f1 am d7116ff1: Merge "Do not suppress error feedback during a SIP call." into gingerbread
* commit 'd7116ff1f0d1a3c14992273d0b899c3b71ba6d3f':
  Do not suppress error feedback during a SIP call.
2010-11-30 22:55:37 -08:00
Hung-ying Tyan
d7116ff1f0 Merge "Do not suppress error feedback during a SIP call." into gingerbread 2010-11-30 22:53:26 -08:00
James Dong
5cdcf16ec7 Be conservative in estimating the file size limit.
bug - 3045580

Change-Id: Ifdffa354b9433639c3f246a0eb581ef14af1e797
2010-11-30 18:18:08 -08:00
David Brown
4c11eee7ec am 04639ba0: Reduce the outrageous verbosity of CallerInfo.toString().
* commit '04639ba0a939988d00131e61458807dac650f9c3':
  Reduce the outrageous verbosity of CallerInfo.toString().
2010-11-30 18:11:21 -08:00
Irfan Sheriff
f92b453a58 DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver
The worksource reporting gets blocked by the
statetracker lock which can cause system restarts when
done from broadcastreceiver thread

Bug: 3153787
Change-Id: Ie70687e7453a1c3618bac1424562be44762b2c9d
2010-11-30 16:07:05 -08:00
Mathias Agopian
3248b484a2 am b483d5cd: fix [3237242] sensormanager sensor active count gets out of sync
* commit 'b483d5cd134cda393824fd8e9c1a5443bd868ae6':
  fix [3237242] sensormanager sensor active count gets out of sync
2010-11-30 15:51:00 -08:00
David Brown
04639ba0a9 Reduce the outrageous verbosity of CallerInfo.toString().
Bug: 3121292
Change-Id: Ia8383891ef29a003acbd627b25ce87a187ef95c0
2010-11-30 15:49:48 -08:00
Mathias Agopian
be0ece6f85 am 186b68b7: Merge "allow rotation-vector to have 4 components" into gingerbread
* commit '186b68b74417e8ef73f2083769166e7785df6c30':
  allow rotation-vector to have 4 components
2010-11-30 15:41:41 -08:00