summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorAndrei-Valentin Onea <andreionea@google.com>2019-03-08 06:00:20 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-03-08 06:00:20 -0800
commitf63b6157a15239daa8e9df99546e4713cc751a7b (patch)
treeb0bd0a21910650d4c227a747e5d8fa0126d676af /core/java
parent42f62d86b54a2135f156dc523a9405df3609da56 (diff)
parent10c573ff852309894b383ae9aa13dca0d64f8d3e (diff)
Merge "Add @UnsupportedAppUsage annotations"
am: 10c573ff85 Change-Id: I394e53a553e4c054c52fb3e991b4f81f3c152a94
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/database/BulkCursorNative.java2
-rw-r--r--core/java/android/hardware/display/IDisplayManager.aidl1
-rw-r--r--core/java/android/hardware/input/IInputManager.aidl1
-rw-r--r--core/java/android/hardware/location/IActivityRecognitionHardwareClient.aidl1
4 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/database/BulkCursorNative.java b/core/java/android/database/BulkCursorNative.java
index d3c11e785d7f..77a13cf80073 100644
--- a/core/java/android/database/BulkCursorNative.java
+++ b/core/java/android/database/BulkCursorNative.java
@@ -16,6 +16,7 @@
package android.database;
+import android.annotation.UnsupportedAppUsage;
import android.os.Binder;
import android.os.Bundle;
import android.os.IBinder;
@@ -138,6 +139,7 @@ public abstract class BulkCursorNative extends Binder implements IBulkCursor
final class BulkCursorProxy implements IBulkCursor {
+ @UnsupportedAppUsage
private IBinder mRemote;
private Bundle mExtras;
diff --git a/core/java/android/hardware/display/IDisplayManager.aidl b/core/java/android/hardware/display/IDisplayManager.aidl
index b57599724ad5..37d93e7c5e25 100644
--- a/core/java/android/hardware/display/IDisplayManager.aidl
+++ b/core/java/android/hardware/display/IDisplayManager.aidl
@@ -30,6 +30,7 @@ import android.view.Surface;
/** @hide */
interface IDisplayManager {
+ @UnsupportedAppUsage
DisplayInfo getDisplayInfo(int displayId);
int[] getDisplayIds();
diff --git a/core/java/android/hardware/input/IInputManager.aidl b/core/java/android/hardware/input/IInputManager.aidl
index 97868fa268ad..cd17a3efbd71 100644
--- a/core/java/android/hardware/input/IInputManager.aidl
+++ b/core/java/android/hardware/input/IInputManager.aidl
@@ -46,6 +46,7 @@ interface IInputManager {
// Injects an input event into the system. To inject into windows owned by other
// applications, the caller must have the INJECT_EVENTS permission.
+ @UnsupportedAppUsage
boolean injectInputEvent(in InputEvent ev, int mode);
// Calibrate input device position
diff --git a/core/java/android/hardware/location/IActivityRecognitionHardwareClient.aidl b/core/java/android/hardware/location/IActivityRecognitionHardwareClient.aidl
index 3fe645c59a30..2dfaf601c6f5 100644
--- a/core/java/android/hardware/location/IActivityRecognitionHardwareClient.aidl
+++ b/core/java/android/hardware/location/IActivityRecognitionHardwareClient.aidl
@@ -32,5 +32,6 @@ oneway interface IActivityRecognitionHardwareClient {
* @param isSupported whether the platform has hardware support for the feature
* @param instance the available instance to provide access to the feature
*/
+ @UnsupportedAppUsage
void onAvailabilityChanged(in boolean isSupported, in IActivityRecognitionHardware instance);
}