diff options
| author | 2019-02-11 15:53:30 +0000 | |
|---|---|---|
| committer | 2019-02-11 15:53:30 +0000 | |
| commit | 0f5d4fe9069287149e200182c9b99ba9cac74894 (patch) | |
| tree | 3ca25594bd93cb78572a34178a8ab87834bc48f3 | |
| parent | ed4edf29c11e8979e4516295ccc7f42ac06717f1 (diff) | |
| parent | acec88441f7ee1380ad44c050de1a5d7f49bcbb0 (diff) | |
Merge "Make InputDevice.isExternal() public"
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/view/InputDevice.java | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index 09e6da0f6cfa..18274a2a4c62 100644 --- a/api/current.txt +++ b/api/current.txt @@ -48997,6 +48997,7 @@ package android.view { method public boolean[] hasKeys(int...); method public boolean hasMicrophone(); method public boolean isEnabled(); + method public boolean isExternal(); method public boolean isVirtual(); method public boolean supportsSource(int); method public void writeToParcel(android.os.Parcel, int); diff --git a/core/java/android/view/InputDevice.java b/core/java/android/view/InputDevice.java index 7295259a0f89..868a9de93972 100644 --- a/core/java/android/view/InputDevice.java +++ b/core/java/android/view/InputDevice.java @@ -22,6 +22,7 @@ import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.hardware.input.InputDeviceIdentifier; import android.hardware.input.InputManager; +import android.os.Build; import android.os.NullVibrator; import android.os.Parcel; import android.os.Parcelable; @@ -54,7 +55,7 @@ public final class InputDevice implements Parcelable { private final int mProductId; private final String mDescriptor; private final InputDeviceIdentifier mIdentifier; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) private final boolean mIsExternal; private final int mSources; private final int mKeyboardType; @@ -608,10 +609,7 @@ public final class InputDevice implements Parcelable { * peripheral bus), otherwise it is built-in. * * @return True if the device is external. - * - * @hide */ - @UnsupportedAppUsage public boolean isExternal() { return mIsExternal; } |