From 1d62ea9d8c2646d198b6967e2c6ae3dad5c18f9e Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Tue, 17 Nov 2009 12:49:50 -0800 Subject: Fix issue #2249821: Unable to start passion in safe mode Holding down the trackball now works. Also fix a little API check warning from Intent. Change-Id: Icb1f901535cb521917bf7f847a93c4ff7861d20e --- core/java/android/content/Intent.java | 4 ++-- core/java/android/view/IWindowManager.aidl | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'core/java/android') diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 0085f26..6ba79b4 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -2105,10 +2105,10 @@ public class Intent implements Parcelable { "android.intent.extra.remote_intent_token"; /** - * @Deprecated See {@link #EXTRA_CHANGED_COMPONENT_NAME_LIST}; this field + * @deprecated See {@link #EXTRA_CHANGED_COMPONENT_NAME_LIST}; this field * will contain only the first name in the list. */ - public static final String EXTRA_CHANGED_COMPONENT_NAME = + @Deprecated public static final String EXTRA_CHANGED_COMPONENT_NAME = "android.intent.extra.changed_component_name"; /** diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl index 23e7fb7..0ebe360 100644 --- a/core/java/android/view/IWindowManager.aidl +++ b/core/java/android/view/IWindowManager.aidl @@ -104,8 +104,12 @@ interface IWindowManager int getSwitchStateForDevice(int devid, int sw); int getScancodeState(int sw); int getScancodeStateForDevice(int devid, int sw); + int getTrackballScancodeState(int sw); + int getDPadScancodeState(int sw); int getKeycodeState(int sw); int getKeycodeStateForDevice(int devid, int sw); + int getTrackballKeycodeState(int sw); + int getDPadKeycodeState(int sw); // Report whether the hardware supports the given keys; returns true if successful boolean hasKeys(in int[] keycodes, inout boolean[] keyExists); -- cgit v1.1