3814 Commits

Author SHA1 Message Date
Dianne Hackborn
eecb5b9873 am 2983e038: am 045398e6: Merge "Fix a deadlock I ran into." into gingerbread
Merge commit '2983e038d189a257f1e5abb9c120bd1feb253773'

* commit '2983e038d189a257f1e5abb9c120bd1feb253773':
  Fix a deadlock I ran into.
2010-09-23 14:20:48 -07:00
Dianne Hackborn
2983e038d1 am 045398e6: Merge "Fix a deadlock I ran into." into gingerbread
Merge commit '045398e6243fa4e83fb6435df4e8ffc6a7487a70' into gingerbread-plus-aosp

* commit '045398e6243fa4e83fb6435df4e8ffc6a7487a70':
  Fix a deadlock I ran into.
2010-09-23 14:17:54 -07:00
Dianne Hackborn
045398e624 Merge "Fix a deadlock I ran into." into gingerbread 2010-09-23 14:15:45 -07:00
Mathias Agopian
c8be9b212f Merge "add a way to toggle the h/w composer at runtime" 2010-09-23 13:09:00 -07:00
Irfan Sheriff
c6c9a7df58 Merge "Add Wifi Protected Setup support" 2010-09-23 11:33:49 -07:00
Robert Greenwalt
35dcaece11 am 9c38a6dc: am e87ebb08: Merge "Cleanup Netd to prevent getting hung." into gingerbread
Merge commit '9c38a6dc13ba55fccb9c66f347307a1b4ae68105'

* commit '9c38a6dc13ba55fccb9c66f347307a1b4ae68105':
  Cleanup Netd to prevent getting hung.
2010-09-23 09:40:20 -07:00
Irfan Sheriff
5ee89800be Add Wifi Protected Setup support
Add WPS PBC and WPS pin method support with pin obtained
from AP

Bug: 2277571

Change-Id: I6ff8e447ab8c5e59456a55152588fd4d6386c610
2010-09-23 09:13:34 -07:00
Robert Greenwalt
9c38a6dc13 am e87ebb08: Merge "Cleanup Netd to prevent getting hung." into gingerbread
Merge commit 'e87ebb08fba88628a65eae88fc5bc7911cfa7d97' into gingerbread-plus-aosp

* commit 'e87ebb08fba88628a65eae88fc5bc7911cfa7d97':
  Cleanup Netd to prevent getting hung.
2010-09-23 08:48:14 -07:00
Robert Greenwalt
e87ebb08fb Merge "Cleanup Netd to prevent getting hung." into gingerbread 2010-09-23 08:41:21 -07:00
satok
ab751aa085 Add methods for managing subtypes
- added showInputMethodSubtypePicker to public API
-- show the selector dialog for subtypes
- added getter, setter and event handler to InputMethodManagerService
- extract InputMethodSubtype to the top level class for using it in aidl
- TODO: make an enabler for input method subtypes
- TODO: handle the event of changing an input method subtype in LatinIME

Change-Id: I49f8c6675ac4b06511635d14a37bd398738eff33
2010-09-23 16:25:07 +09:00
Dianne Hackborn
0674069aa4 Fix a deadlock I ran into.
Activity manager was calling into the backup service (and other
things) with its lock held.

Change-Id: Id55093e09cc5fe81b73b85968184816d956e0ae8
2010-09-22 22:46:21 -07:00
Mathias Agopian
6a9692424a add a way to toggle the h/w composer at runtime
to DISABLE the h/w composer:
  adb shell service call SurfaceFlinger 1008 i32 1

to ENABLE the h/w composer:
  adb shell service call SurfaceFlinger 1008 i32 0

the state is dumped in "dumpsys SurfaceFlinger"

Change-Id: I23e2242d42c6e3fd5261a83332dd900b189e38ce
2010-09-22 18:58:01 -07:00
Brad Fitzpatrick
40d073cf87 am 1c384697: am 89647b11: Don\'t do single byte writes in DropBoxManagerService
Merge commit '1c3846979a657e4e2b1f7864fa6defb65b3bbf42'

* commit '1c3846979a657e4e2b1f7864fa6defb65b3bbf42':
  Don't do single byte writes in DropBoxManagerService
2010-09-22 18:37:11 -07:00
Brad Fitzpatrick
1c3846979a am 89647b11: Don\'t do single byte writes in DropBoxManagerService
Merge commit '89647b1172cdf40a3681922150122b0bd2ea83f1' into gingerbread-plus-aosp

* commit '89647b1172cdf40a3681922150122b0bd2ea83f1':
  Don't do single byte writes in DropBoxManagerService
2010-09-22 18:33:46 -07:00
Brad Fitzpatrick
89647b1172 Don't do single byte writes in DropBoxManagerService
Bug: 3018772
Change-Id: I6990041f059aeb2a4c29e59b1a3d78d19bf9b02f
2010-09-22 17:49:16 -07:00
Amith Yamasani
483c4b1d1f am abdd2c7f: am 95f600b5: Merge "Fix NPE in PowerManagerService on boot, if some settings are corrupted." into gingerbread
Merge commit 'abdd2c7f03651e95424133c2be948238c6dc7bf6'

* commit 'abdd2c7f03651e95424133c2be948238c6dc7bf6':
  Fix NPE in PowerManagerService on boot, if some settings are corrupted.
2010-09-22 17:06:48 -07:00
Eric Laurent
ec0efd0ceb am 11746caa: am 08959c63: Merge "Request permission for global audio effects." into gingerbread
Merge commit '11746caaa852984ff186bf5b8807e2c14cd7c1bc'

* commit '11746caaa852984ff186bf5b8807e2c14cd7c1bc':
  Request permission for global audio effects.
2010-09-22 17:04:48 -07:00
Robert Greenwalt
e5c3afb292 Cleanup Netd to prevent getting hung.
If the sending of the command fails we should note it and not wait forever
for the response.

We should also not say we're ready until we actually are.

bug:2993205
Change-Id: I380f0312ac4693ad184a526b330fdfa23f6ac558
2010-09-22 16:43:23 -07:00
Amith Yamasani
abdd2c7f03 am 95f600b5: Merge "Fix NPE in PowerManagerService on boot, if some settings are corrupted." into gingerbread
Merge commit '95f600b55f617fcc94985fee07927aff48160362' into gingerbread-plus-aosp

* commit '95f600b55f617fcc94985fee07927aff48160362':
  Fix NPE in PowerManagerService on boot, if some settings are corrupted.
2010-09-22 16:35:11 -07:00
Amith Yamasani
95f600b55f Merge "Fix NPE in PowerManagerService on boot, if some settings are corrupted." into gingerbread 2010-09-22 16:29:49 -07:00
Amith Yamasani
8b61983ee8 Fix NPE in PowerManagerService on boot, if some settings are corrupted.
Bug: 2715038
Change-Id: I10c08b359ff3cde732c37eb6dff0877cdb021cd9
2010-09-22 16:11:59 -07:00
Eric Laurent
11746caaa8 am 08959c63: Merge "Request permission for global audio effects." into gingerbread
Merge commit '08959c6396b8a52194554f961ae8fd874c994e4e' into gingerbread-plus-aosp

* commit '08959c6396b8a52194554f961ae8fd874c994e4e':
  Request permission for global audio effects.
2010-09-22 16:05:37 -07:00
Eric Laurent
14beea487c Request permission for global audio effects.
Applications creating an audio effect on the output mix must
have the MODIFY_AUDIO_SETTINGS permission.

Change-Id: I57d88533f91ad0d33680107d79abcec28f7263b5
2010-09-22 15:58:38 -07:00
Mike Lockwood
00ec869403 am 6cec0dc0: am 32371695: Merge "GpsLocationProvider: Fix race condition while bringing up APN for SUPL." into gingerbread
Merge commit '6cec0dc0e47459553a3a6572abd28a8e49ce5875'

* commit '6cec0dc0e47459553a3a6572abd28a8e49ce5875':
  GpsLocationProvider: Fix race condition while bringing up APN for SUPL.
2010-09-22 10:01:48 -07:00
Mike Lockwood
6cec0dc0e4 am 32371695: Merge "GpsLocationProvider: Fix race condition while bringing up APN for SUPL." into gingerbread
Merge commit '32371695daf917701f78a86224b58bfda0381e27' into gingerbread-plus-aosp

* commit '32371695daf917701f78a86224b58bfda0381e27':
  GpsLocationProvider: Fix race condition while bringing up APN for SUPL.
2010-09-22 09:57:50 -07:00
Mike Lockwood
32371695da Merge "GpsLocationProvider: Fix race condition while bringing up APN for SUPL." into gingerbread 2010-09-22 09:54:53 -07:00
Hung-ying Tyan
bb20545669 am 8f05b5c8: am ca54cdaf: Merge "SipService: fix thread/socket leak" into gingerbread
Merge commit '8f05b5c8d3c310bc70a3eff04911ea9cf4eba87a'

* commit '8f05b5c8d3c310bc70a3eff04911ea9cf4eba87a':
  SipService: fix thread/socket leak
2010-09-22 09:45:41 -07:00
Hung-ying Tyan
8f05b5c8d3 am ca54cdaf: Merge "SipService: fix thread/socket leak" into gingerbread
Merge commit 'ca54cdaf66449cd4f81d8887ec603392b8f3779c' into gingerbread-plus-aosp

* commit 'ca54cdaf66449cd4f81d8887ec603392b8f3779c':
  SipService: fix thread/socket leak
2010-09-22 09:41:17 -07:00
Hung-ying Tyan
ca54cdaf66 Merge "SipService: fix thread/socket leak" into gingerbread 2010-09-22 09:35:35 -07:00
Mike Lockwood
2acfd34ccb GpsLocationProvider: Fix race condition while bringing up APN for SUPL.
If handleUpdateNetworkState() is called before
ConnectivityManager.startUsingNetworkFeature() returns, then we will not
call native_agps_data_conn_open() to inform the GPS that the APN is up.
So we now set mAGpsDataConnectionState to AGPS_DATA_CONNECTION_OPENING
before calling ConnectivityManager.startUsingNetworkFeature() to avoid
this problem.

Change-Id: I5e1597d6494dc8ab68e608911c546a7a04f2ea07
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-22 12:22:26 -04:00
Hung-ying Tyan
fc51f2c972 SipService: fix thread/socket leak
Should call SipSessionGroup.close() instead of closeNotToReceiveCalls() to stop
the SIP stack (which will stop the MessageProcessor thread and close its socket).

Might be related to ANR's reported by:
http://b/issue?id=3021924
http://b/issue?id=3021927

Change-Id: I4ead1d81fc9abac983f5753b825d20bc1cc79866
2010-09-23 00:02:34 +08:00
Dianne Hackborn
adaba84ad7 Merge "Work on fragments in layouts." 2010-09-21 22:17:52 -07:00
Dianne Hackborn
625ac271f8 Work on fragments in layouts.
- Change semantics if IDs associated with these fragments, to
  work correctly when placed in a container.  If the container
  has an ID or you have supplied a tag, the fragment's ID is
  optional.

- To do this, there is a new LayoutInflater API that allows code
  creating views to access the parent container that view will
  be in.

- Fix issues with state management around these fragments.  Now
  correctly retains state when switching to a layout that doesn't
  include the fragment.

Also:

- Add new simple list layouts for items that want to show an
  activated state.
- Add new Activity.dump() that can be invoked with adb shell
  dumpsys; the default implementation dumps fragment state.

Change-Id: I192f35e3ea8c53fbd26cf909095f2a994abfc1b6
2010-09-21 22:08:50 -07:00
Jeff Brown
a7553c5e33 am 77d9a5a5: am 98bcb41d: Merge "Fix race reading input configuration during system startup." into gingerbread
Merge commit '77d9a5a55fa52074f18012cf997854a82500fd59'

* commit '77d9a5a55fa52074f18012cf997854a82500fd59':
  Fix race reading input configuration during system startup.
2010-09-21 20:21:27 -07:00
Jeff Brown
77d9a5a55f am 98bcb41d: Merge "Fix race reading input configuration during system startup." into gingerbread
Merge commit '98bcb41d9b434bbe486b33681d9d091d6072d1f1' into gingerbread-plus-aosp

* commit '98bcb41d9b434bbe486b33681d9d091d6072d1f1':
  Fix race reading input configuration during system startup.
2010-09-21 18:39:39 -07:00
Jeff Brown
57c59376f4 Fix race reading input configuration during system startup.
Change-Id: I9360c4ec5c29937fce06b44ffc71fca58c8b3d5f
2010-09-21 18:22:55 -07:00
Irfan Sheriff
d404a9be14 am 0859b764: Make wifi scan async. (don\'t auto-merge)
Merge commit '0859b764719735e4b9aea5df6051ece13e212841' into gingerbread-plus-aosp

* commit '0859b764719735e4b9aea5df6051ece13e212841':
  Make wifi scan async. (don't auto-merge)
2010-09-21 12:59:34 -07:00
Irfan Sheriff
0859b76471 Make wifi scan async. (don't auto-merge)
When an entity (NLP for example) acquires
a WifiLock and initiates a scan, scan can
get blocked until driver starts.

scan returns no useful info, scan results
are broadcast when obtained.

Bug: 2964633
Change-Id: Iaefc32bb6b82f0718285a18ac600e6bbbb096e77
2010-09-21 12:38:09 -07:00
Mathias Agopian
8dba8cff4c Merge "fix [3018216] UI shrinks / stretches while using apps with IME" 2010-09-21 10:54:55 -07:00
Mathias Agopian
3dfe120e90 fix [3018216] UI shrinks / stretches while using apps with IME
Change-Id: Ie4c5d8a434b4489355ed8c52af96eb931b4d7167
2010-09-21 10:52:42 -07:00
Robert Greenwalt
19531dacfe am f532e958: am 6548f395: Merge "Inet status bug fix" into gingerbread
Merge commit 'f532e9583ec0111b1c198e895ed1b2fd83c3d5cf'

* commit 'f532e9583ec0111b1c198e895ed1b2fd83c3d5cf':
  Inet status bug fix
2010-09-21 10:44:26 -07:00
Dianne Hackborn
5e6ec0aeea am e665698f: am 6f33b65f: Merge "Fix issue #2999757: "Application Redirected" dialogue showing up erratically" into gingerbread
Merge commit 'e665698ffe539bdb99122dcf83e19844ebea92b8'

* commit 'e665698ffe539bdb99122dcf83e19844ebea92b8':
  Fix issue #2999757: "Application Redirected" dialogue showing up erratically
2010-09-21 10:44:13 -07:00
Dianne Hackborn
1bbef40e40 am 2d19a676: am 51aaab3d: Merge "Fix #2999258: ANR in Settings after every reboot" into gingerbread
Merge commit '2d19a676860bf773c984315fe03d9568913f9314'

* commit '2d19a676860bf773c984315fe03d9568913f9314':
  Fix #2999258: ANR in Settings after every reboot
2010-09-21 10:43:36 -07:00
Robert Greenwalt
4524c62448 resolved conflicts for merge of 749e6bc5 to master
Change-Id: Ica492307505d53e57863d4363b5f75abd798bcd8
2010-09-21 10:27:59 -07:00
Robert Greenwalt
f532e9583e am 6548f395: Merge "Inet status bug fix" into gingerbread
Merge commit '6548f395a974d2a8dcefe29b3a498d1ca87d8aef' into gingerbread-plus-aosp

* commit '6548f395a974d2a8dcefe29b3a498d1ca87d8aef':
  Inet status bug fix
2010-09-21 08:22:59 -07:00
Robert Greenwalt
6548f395a9 Merge "Inet status bug fix" into gingerbread 2010-09-21 08:06:15 -07:00
Robert Greenwalt
029be81302 Inet status bug fix
Don't wipe out the connected status every time we get a cellular status change.
Don't filter out disconnect event for wifi - we need them.

bug:3009923
Change-Id: I68cadac5f44d6eb4e0fe711fda7c5d218abb45bd
2010-09-21 05:38:36 -07:00
Dianne Hackborn
e665698ffe am 6f33b65f: Merge "Fix issue #2999757: "Application Redirected" dialogue showing up erratically" into gingerbread
Merge commit '6f33b65f8033cf8644eb4ba727421b90bd4c0ae9' into gingerbread-plus-aosp

* commit '6f33b65f8033cf8644eb4ba727421b90bd4c0ae9':
  Fix issue #2999757: "Application Redirected" dialogue showing up erratically
2010-09-21 00:27:06 -07:00
Dianne Hackborn
034093a4ae Fix issue #2999757: "Application Redirected" dialogue showing up erratically
Give up on this for now.

Change-Id: Ic66a36d468f8bcb313d9bde2809124cdfd74adb3
2010-09-20 22:24:38 -07:00
Dianne Hackborn
2d19a67686 am 51aaab3d: Merge "Fix #2999258: ANR in Settings after every reboot" into gingerbread
Merge commit '51aaab3d6ba01263c3e1d81ca0567e0ad5cddb2d' into gingerbread-plus-aosp

* commit '51aaab3d6ba01263c3e1d81ca0567e0ad5cddb2d':
  Fix #2999258: ANR in Settings after every reboot
2010-09-20 22:22:54 -07:00