Hmm, actually the BatteryService change should be backward compatible,
so it is just the SD door and wired headset detect that would break if
you ran the new userspace with the 2.6.25 kernel.
Mike
On Wed, Dec 10, 2008 at 7:52 AM, Mike Lockwood <[EMAIL PROTECTED]> wrote:
> On Wed, Dec 10, 2008 at 1:24 AM, Brian Swetland <[EMAIL PROTECTED]> wrote:
>>
>>
>> We changed the wakelock APIs in 2.6.27. The current userspace code is
>> not compatible with the new APIs. A large source update (as we complete
>> our perforce to git transition) is coming soon which will bring these
>> back into sync, but for the moment you may need to stick with 2.6.25.
>>
>> I believe the new userspace can work with both the old and new API.
>
> Actually there were some changes that were not backward compatible.
> So when we release the new userspace that works with 2.6.27, a few
> things won't work properly with 2.6.25.
>
> In case someone searching this list in the future needs to get the new
> userspace working with an older kernel, here are the incompatible
> userspace changes from 2.6.25 -> 2.6.27 that I know of:
>
> ---
> /tmp/g4-45541/cache/branches/cupcake/android/frameworks/base/services/java/com/android/server/BatteryService.java#1
> 2008-12-10 07:46:57.000000000 -0500
> +++
> /tmp/g4-45541/cache/branches/cupcake/android/frameworks/base/services/java/com/android/server/BatteryService.java#2
> 2008-12-10 07:46:57.000000000 -0500
> @@ -91,7 +91,7 @@
> mContext = context;
> mBatteryStats = BatteryStatsService.getService();
>
> - mUEventObserver.startObserving("DEVPATH=/class/power_supply");
> + mUEventObserver.startObserving("SUBSYSTEM=power_supply");
>
> // set initial status
> update();
> ---
> /tmp/g4-45541/cache/branches/cupcake/android/frameworks/base/services/java/com/android/server/HeadsetObserver.java#1
> 2008-12-10 07:46:57.000000000 -0500
> +++
> /tmp/g4-45541/cache/branches/cupcake/android/frameworks/base/services/java/com/android/server/HeadsetObserver.java#2
> 2008-12-10 07:46:57.000000000 -0500
> @@ -32,7 +32,7 @@
> class HeadsetObserver extends UEventObserver {
> private static final String TAG = HeadsetObserver.class.getSimpleName();
>
> - private static final String HEADSET_UEVENT_MATCH =
> "DEVPATH=/class/switch/h2w";
> + private static final String HEADSET_UEVENT_MATCH =
> "DEVPATH=/devices/virtual/switch/h2w";
> private static final String HEADSET_STATE_PATH =
> "/sys/class/switch/h2w/state";
> private static final String HEADSET_NAME_PATH =
> "/sys/class/switch/h2w/name";
>
> ---
> /tmp/g4-45541/cache/branches/cupcake/android/frameworks/base/services/java/com/android/server/MountService.java#3
> 2008-12-10 07:46:57.000000000 -0500
> +++
> /tmp/g4-45541/cache/branches/cupcake/android/frameworks/base/services/java/com/android/server/MountService.java#4
> 2008-12-10 07:46:57.000000000 -0500
> @@ -59,10 +59,11 @@
> private Notification mUsbStorageNotification;
>
> private class SdDoorListener extends UEventObserver {
> - static final String SD_DOOR_UEVENT_MATCH =
> "DEVPATH=/class/switch/sd-door";
> + static final String SD_DOOR_UEVENT_MATCH =
> "DEVPATH=/devices/virtual/switch/sd-door";
> + static final String SD_DOOR_SWITCH_NAME = "sd-door";
>
> public void onUEvent(UEvent event) {
> - if ("sd-door".equals(event.get("SWITCH_NAME"))) {
> + if (SD_DOOR_SWITCH_NAME.equals(event.get("SWITCH_NAME"))) {
> sdDoorStateChanged(event.get("SWITCH_STATE"));
> }
> }
>
> --
> Mike Lockwood
> Google android team
>
--
Mike Lockwood
Google android team
--~--~---------~--~----~------------~-------~--~----~
unsubscribe: [EMAIL PROTECTED]
website: http://groups.google.com/group/android-kernel
-~----------~----~----~----~------~----~------~--~---
