6432 Commits

Author SHA1 Message Date
Mathias Agopian
8f5af58265 am 0ef135d5: Merge change 21537 into eclair
Merge commit '0ef135d5c79ff5b443b43f8743250044700a8bb5'

* commit '0ef135d5c79ff5b443b43f8743250044700a8bb5':
  really be more friendly with C
2009-08-17 12:40:41 -07:00
Android (Google) Code Review
0ef135d5c7 Merge change 21537 into eclair
* changes:
  really be more friendly with C
2009-08-17 12:37:25 -07:00
Mathias Agopian
2b8954809e really be more friendly with C 2009-08-17 12:33:20 -07:00
Dan Murphy
13e934daac am 921831b4: Merge change 21522 into eclair
Merge commit '921831b4dcad1898c265889430a32367e99ef6c1'

* commit '921831b4dcad1898c265889430a32367e99ef6c1':
  Dock changes:Docking station intents
2009-08-17 12:31:44 -07:00
Android (Google) Code Review
921831b4dc Merge change 21522 into eclair
* changes:
  Dock changes:Docking station intents
2009-08-17 12:27:06 -07:00
Dan Murphy
c9f4eaf438 Dock changes:Docking station intents
Docking station intents for dock switch driver.
Add DockObserver and updated Intent.java and systemserver.jave

Signed-off-by: Dan Murphy <D.Murphy@motorola.com>

	modified:   core/java/android/content/Intent.java
	new file:   services/java/com/android/server/DockObserver.java
	modified:   services/java/com/android/server/SystemServer.java

Docking station updates

Add constants for the dock

Signed-off-by: Dan Murphy <D.Murphy@motorola.com>
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-17 15:23:24 -04:00
Dianne Hackborn
160e4facf6 am 1a797546: Merge change 21380 into eclair
Merge commit '1a797546d75d2c85d6fefeefdc55de051aa66018'

* commit '1a797546d75d2c85d6fefeefdc55de051aa66018':
  More work on wallpapers.
2009-08-17 11:52:06 -07:00
Android (Google) Code Review
1a797546d7 Merge change 21380 into eclair
* changes:
  More work on wallpapers.
2009-08-17 11:46:57 -07:00
Romain Guy
75229368c2 am 54ba86f0: Merge change 21512 into eclair
Merge commit '54ba86f0e236a55fb4dc3aabbd81078f586321a5'

* commit '54ba86f0e236a55fb4dc3aabbd81078f586321a5':
  Honor the clickable and enabled properties in ListView.
2009-08-17 11:09:21 -07:00
Android (Google) Code Review
54ba86f0e2 Merge change 21512 into eclair
* changes:
  Honor the clickable and enabled properties in ListView.
2009-08-17 11:07:08 -07:00
Mike Lockwood
cd47012ff3 am 9dc2355b: Merge change 21492 into eclair
Merge commit '9dc2355b9bdfdaadb72936b5ad865193a2af58c8'

* commit '9dc2355b9bdfdaadb72936b5ad865193a2af58c8':
  WifiService: Hash based on both SSID and BSSID in scan result cache.
2009-08-17 10:59:49 -07:00
Mike Lockwood
2b79ed839c am 56e7ba29: Merge change 21510 into eclair
Merge commit '56e7ba2928bce62283a62ad1c9d9f1ec7b54c24c'

* commit '56e7ba2928bce62283a62ad1c9d9f1ec7b54c24c':
  LocationManagerService: Add NullPointerException to avoid change in behavior.
2009-08-17 10:59:46 -07:00
Andreas Huber
d6ba4c24aa am ffbd2426: Merge change 21340 into eclair
Merge commit 'ffbd2426f07474a95fefa3b2f4fe7eb4d4329af5'

* commit 'ffbd2426f07474a95fefa3b2f4fe7eb4d4329af5':
  Squashed commit of the following:
2009-08-17 10:59:41 -07:00
Jeff Sharkey
32b72f7a53 am fd0d6275: Fix ExpandableListView context menus when has header views.
Merge commit 'fd0d627569cb250f7060a83161cc845b9616e5a1'

* commit 'fd0d627569cb250f7060a83161cc845b9616e5a1':
  Fix ExpandableListView context menus when has header views.
2009-08-17 10:59:35 -07:00
Amith Yamasani
4a1035508f am 7d68dae9: Merge change 21494 into eclair
Merge commit '7d68dae99ff2bb3c3aa066efc5b4b1d5c0cd332e'

* commit '7d68dae99ff2bb3c3aa066efc5b4b1d5c0cd332e':
  Allow animation styles to be applied to popup windows.
2009-08-17 10:59:30 -07:00
Grace Kloba
78eab1b141 am 86192c61: Merge change 21442 into eclair
Merge commit '86192c614c317b428e10c2dc9052a07304aa6c3f'

* commit '86192c614c317b428e10c2dc9052a07304aa6c3f':
  Fix a cookie bug. If "secure" is in the end of the string, it was ignored.
2009-08-17 10:59:21 -07:00
Mike Lockwood
5dd98cc0c3 am 6ba7ae1e: LocationManagerService: Fix null pointer check in sendExtraCommand().
Merge commit '6ba7ae1e4c3c04f6a71380b913ad79f83b00a628'

* commit '6ba7ae1e4c3c04f6a71380b913ad79f83b00a628':
  LocationManagerService: Fix null pointer check in sendExtraCommand().
2009-08-17 10:59:12 -07:00
Chih-Chung Chang
f4f266cb60 am 0ff7a463: Merge change 21473 into eclair
Merge commit '0ff7a463ad7fe6ca7b0ab3afcf566bfdc69a00f0'

* commit '0ff7a463ad7fe6ca7b0ab3afcf566bfdc69a00f0':
  Fix 1860351: Put datetime in jpeg exif to datetaken field.
2009-08-17 10:59:05 -07:00
Mike Lockwood
eb6ed4b4fd am 06952d92: (-s ours) DO NOT MERGE - cherry-picked from master:
Merge commit '06952d9299c23ee15df0825e75934971cfecf2ba'

* commit '06952d9299c23ee15df0825e75934971cfecf2ba':
  DO NOT MERGE - cherry-picked from master:
2009-08-17 10:59:02 -07:00
Romain Guy
621d0beb96 am 8af2d225: Merge change 21471 into eclair
Merge commit '8af2d22552c61d8d4e09e52287f056428172ab05'

* commit '8af2d22552c61d8d4e09e52287f056428172ab05':
  Add Galaxy wallpaper
2009-08-17 10:58:55 -07:00
Android (Google) Code Review
9dc2355b9b Merge change 21492 into eclair
* changes:
  WifiService: Hash based on both SSID and BSSID in scan result cache.
2009-08-17 10:47:06 -07:00
Dianne Hackborn
7341d7a104 More work on wallpapers.
- Do better about figuring out when to stop them and other related window
  management.
- Fix problem where we were not redrawing the surface when the orientation
  changed.  This was the cause of the device hang.
2009-08-17 10:42:59 -07:00
Romain Guy
dd753ae611 Honor the clickable and enabled properties in ListView. 2009-08-17 10:36:23 -07:00
Android (Google) Code Review
56e7ba2928 Merge change 21510 into eclair
* changes:
  LocationManagerService: Add NullPointerException to avoid change in behavior.
2009-08-17 10:29:23 -07:00
Android (Google) Code Review
ffbd2426f0 Merge change 21340 into eclair
* changes:
  Squashed commit of the following:
2009-08-17 10:27:41 -07:00
Andreas Huber
be06d26cdc Squashed commit of the following:
commit 5bb012f0065f7ffaaeb4f569d71f0e3a8d6b19c3
Author: Andreas Huber <andih@google.com>
Date:   Fri Aug 14 10:40:08 2009 -0700

    An attempt at fixing export using the qcom encoders. More quirks.

commit 0690e76bfa48118a68287ccf1bbfa82febaa620c
Author: Andreas Huber <andih@google.com>
Date:   Fri Aug 14 09:08:28 2009 -0700

    Callbacks are now dispatched from a separate thread in OMX.

commit c6571a039526df29b6343f9a1971dbc019088c61
Author: Andreas Huber <andih@google.com>
Date:   Thu Aug 13 15:42:25 2009 -0700

    Massive API changes throughout stagefright, smart pointers everywhere.

commit 900612af6a0555664d9ba195112cd859491265f4
Author: Andreas Huber <andih@google.com>
Date:   Thu Aug 13 13:33:12 2009 -0700

    OMXCodecs now properly shutdown.

commit 96732f05e1b0603dcd1b11f16a23512592eeb4f5
Author: Andreas Huber <andih@google.com>
Date:   Thu Aug 13 12:04:04 2009 -0700

    More work on JPEG decoding using the hardware OMX component.

commit 63839a073ac393e3a130434ba467969053b694ad
Author: Andreas Huber <andih@google.com>
Date:   Wed Aug 12 13:13:31 2009 -0700

    An attempt to drive the JPEG decoder OMX node.

commit 3ac2fe5ab2926eda81b2123610b2434c645294ff
Author: Andreas Huber <andih@google.com>
Date:   Tue Aug 11 16:38:21 2009 -0700

    Renamed StateMachine to OMXCodec and put it in its proper place.

commit 247da75a96bf8881956413023dd49a84d5b4f5b2
Author: Andreas Huber <andih@google.com>
Date:   Tue Aug 11 16:06:19 2009 -0700

    Statemachine is now a full-fledged MediaSource.

commit 045244f6771fa0b9b329495c953afda900a84b71
Author: Andreas Huber <andih@google.com>
Date:   Fri Aug 7 09:16:54 2009 -0700

    Properly setup the input format when exporting to AMR audio.

commit 271b984cb32c5cd9e46e3f90ae121f334e4b8da9
Author: Andreas Huber <andih@google.com>
Date:   Thu Aug 6 09:59:38 2009 -0700

    Added some code to test audio encoding to the OMX harness.

commit 79af4748e4af33bd66d3fbac606e332a69741cf4
Author: Andreas Huber <andih@google.com>
Date:   Wed Aug 5 14:36:22 2009 -0700

    Merge the old OMXDecoder and the new, shiny, StateMachine code.

commit 91cf5dd77a8762bc10a0b2ffce35e3bbeb262231
Author: Andreas Huber <andih@google.com>
Date:   Tue Aug 4 17:41:43 2009 -0700

    A new harness to test OMX node compliance (and quirks).
2009-08-17 10:24:50 -07:00
Mike Lockwood
c6cc836f88 LocationManagerService: Add NullPointerException to avoid change in behavior.
After fixing a null pointer check we were no longer throwing NullPointerExceptions
which caused a CTS test to fail.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-17 13:16:08 -04:00
Jeff Sharkey
fd0d627569 Fix ExpandableListView context menus when has header views.
createContextMenuInfo() should have been subtracting any
header views, similar to performItemClick().  Previously,
this caused getUnflattenedPos() to return invalid positions.

This fixes http://b/issue?id=1778239
2009-08-17 09:53:17 -07:00
Android (Google) Code Review
7d68dae99f Merge change 21494 into eclair
* changes:
  Allow animation styles to be applied to popup windows.
2009-08-17 09:48:55 -07:00
Android (Google) Code Review
86192c614c Merge change 21442 into eclair
* changes:
  Fix a cookie bug. If "secure" is in the end of the string, it was ignored.
2009-08-17 09:19:23 -07:00
Amith Yamasani
d034856ab9 Allow animation styles to be applied to popup windows.
Window params were not carrying the package name required for loading
animation styles from outside of the android package.
2009-08-17 08:08:32 -07:00
Mike Lockwood
00717e2d04 WifiService: Hash based on both SSID and BSSID in scan result cache.
Fixes problem with base stations that have multiple SSIDs.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-17 10:09:36 -04:00
Mike Lockwood
6ba7ae1e4c LocationManagerService: Fix null pointer check in sendExtraCommand().
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-17 08:39:12 -04:00
Android (Google) Code Review
0ff7a463ad Merge change 21473 into eclair
* changes:
  Fix 1860351: Put datetime in jpeg exif to datetaken field.
2009-08-17 05:16:14 -07:00
Chih-Chung Chang
099397cbd0 Fix 1860351: Put datetime in jpeg exif to datetaken field. 2009-08-17 19:43:24 +08:00
Mike Lockwood
06952d9299 DO NOT MERGE - cherry-picked from master:
PowerManager: Fix problem waking screen from negative proximity sensor events.

Fixes bug b/2048591

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-17 06:56:43 -04:00
Android (Google) Code Review
8af2d22552 Merge change 21471 into eclair
* changes:
  Add Galaxy wallpaper
2009-08-16 23:24:12 -07:00
Romain Guy
81e4640d18 Add Galaxy wallpaper 2009-08-16 23:22:44 -07:00
Fred Quintana
db7dd6b508 am 106278c4: (-s ours) Merge change 21432 into eclair
Merge commit '106278c40271fec941a86e5eac66ae5c8477a56a'

* commit '106278c40271fec941a86e5eac66ae5c8477a56a':
  do not merge: cherrypicked 3710f390968e683a0ad3adf0b517dfcade3564ce from master branch
2009-08-16 17:20:21 -07:00
Android (Google) Code Review
106278c402 Merge change 21432 into eclair
* changes:
  do not merge: cherrypicked 3710f390968e683a0ad3adf0b517dfcade3564ce from master branch
2009-08-16 17:14:20 -07:00
Jeff Sharkey
bdf0259f83 am 403d7ac7: Bring back SHOULD_SYNC flag so sync groups can be edited.
Merge commit '403d7ac7d14e87ecc7df25a1fbb79649ec5ada90'

* commit '403d7ac7d14e87ecc7df25a1fbb79649ec5ada90':
  Bring back SHOULD_SYNC flag so sync groups can be edited.
2009-08-16 16:39:35 -07:00
Jeff Sharkey
403d7ac7d1 Bring back SHOULD_SYNC flag so sync groups can be edited. 2009-08-16 16:34:35 -07:00
Grace Kloba
dbdad99813 Fix a cookie bug. If "secure" is in the end of the string, it was ignored. 2009-08-16 00:05:01 -07:00
Fred Quintana
ffd0cb04f9 do not merge: cherrypicked 3710f390968e683a0ad3adf0b517dfcade3564ce from master branch 2009-08-15 22:40:25 -07:00
Yong Zhang
d9f532fbf3 am fa2944d9: Replace loop-delay in setPowerStateToDesired() with async approach
Merge commit 'fa2944d93f4c5050fb4a99d90006791c2995b31c'

* commit 'fa2944d93f4c5050fb4a99d90006791c2995b31c':
  Replace loop-delay in setPowerStateToDesired() with async approach
2009-08-15 15:32:21 -07:00
Yong Zhang
fa2944d93f Replace loop-delay in setPowerStateToDesired() with async approach
Issues to be addressed:
The method setPowerStateToDesired() in CdmaServiceStateTracker class sends
a msg to CdmaDataConnectionTracker class to deactive data call, and then starts
a loop which calls SystemClock.sleep() to wait for several seconds.The purpose
of this is to wait for data-disconnection before sending RADIO_POWER off request.
However, the CdmaServiceStateTracker and CdmaDataConnectionTracker are running in
the same process so that the CdmaDataConnectionTracker is not able to process the
message to deactive data before the loop ends.

The patch includes the following changes:
1) In setPowerStateToDesired() in CdmaServiceStateTracker, replace implementation
   of loop-delay by sending a delayed msg to set RADIO_POWER off.

2) In CdmaDataConnectionTracker, when getting EVENT_DISCONNECT_DONE, call a new
   method in CdmaServiceStateTracker to process pending request to turn RADIO_POWER
   off.
2009-08-15 13:01:52 -07:00
Wink Saville
f5e008f0b7 am e6a9bcb7: A hack that when restartRadio is called the CdmaDataConnectionTracker to retry a connection and possibly reconnect after a temporary data loss.
Merge commit 'e6a9bcb7e8280512b0f68230fb72a004f86c8ae1'

* commit 'e6a9bcb7e8280512b0f68230fb72a004f86c8ae1':
  A hack that when restartRadio is called the CdmaDataConnectionTracker
2009-08-15 11:21:41 -07:00
Wink Saville
e6a9bcb7e8 A hack that when restartRadio is called the CdmaDataConnectionTracker
to retry a connection and possibly reconnect after a temporary data loss.

The root cause appears to be because DEACTIVATE and POWER_RADIO_OFF are
sent back to back and POWER_RADIO_OFF completes before DEACTIVATE.
When this happens CdmaDataConnectionTracker won't attempt to reestablish
a data connection until a voice call terminates.

At this time it appears the better solution is have CdmaDataConnectionTracker
wait for DEACTIVATE to complete before issuing POWER_RADIO_OFF, this fix
will be implemented in the near future.
2009-08-15 11:17:18 -07:00
Wink Saville
e2494119f9 am ad4d9e5b: Allow CdmaDataConnectionTracker to handle RIL_UNSOL_OTA_PROVISION_STATUS and when data roaming is enabled reset the retry manager.
Merge commit 'ad4d9e5bebb5a9ba01c1459d941019887f4a7d6d'

* commit 'ad4d9e5bebb5a9ba01c1459d941019887f4a7d6d':
  Allow CdmaDataConnectionTracker to handle RIL_UNSOL_OTA_PROVISION_STATUS
2009-08-15 09:51:29 -07:00
Wink Saville
ad4d9e5beb Allow CdmaDataConnectionTracker to handle RIL_UNSOL_OTA_PROVISION_STATUS
and when data roaming is enabled reset the retry manager.

This change also refactors mRetryMgr to DataConnectionTracker
removing it from Cdma and Gsm data connection trackers child classes.
2009-08-15 08:40:30 -07:00