diff options
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/Intent.java | 4 | ||||
| -rw-r--r-- | core/java/android/view/IWindowManager.aidl | 4 |
2 files changed, 6 insertions, 2 deletions
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); |