diff options
| author | 2018-08-09 09:13:59 -0700 | |
|---|---|---|
| committer | 2018-08-09 09:13:59 -0700 | |
| commit | eaff9b8d78498d3dbdbecdaaeb3fafcde1b10123 (patch) | |
| tree | c249ba07fbaaa9099d3cd86b81c0d07d929f2f6e | |
| parent | abe219f63583006c66ea83c58036f7e09c6d3f09 (diff) | |
| parent | 83271288ec08eb00c03e0d0e79fb37438c1b82b6 (diff) | |
Merge "Add @UnsupportedAppUsage annotations" am: 196eb1d929
am: 83271288ec
Change-Id: I4d68830f98dece9b77a4ad4cd3769172f00eb0cc
31 files changed, 259 insertions, 229 deletions
diff --git a/config/hiddenapi-light-greylist.txt b/config/hiddenapi-light-greylist.txt index aa32b89b3283..861ec97dc39b 100644 --- a/config/hiddenapi-light-greylist.txt +++ b/config/hiddenapi-light-greylist.txt @@ -1859,244 +1859,19 @@ Landroid/database/sqlite/SqliteWrapper;->update(Landroid/content/Context;Landroi Landroid/graphics/ColorMatrixColorFilter;->setColorMatrixArray([F)V Landroid/graphics/FontFamily;->mNativePtr:J Landroid/graphics/FontListParser;->parse(Ljava/io/InputStream;)Landroid/text/FontConfig; -Landroid/hardware/Camera$Parameters;->copyFrom(Landroid/hardware/Camera$Parameters;)V -Landroid/hardware/Camera$Parameters;->dump()V -Landroid/hardware/Camera$Parameters;->splitArea(Ljava/lang/String;)Ljava/util/ArrayList; -Landroid/hardware/camera2/CameraCharacteristics$Key;-><init>(Ljava/lang/String;Landroid/hardware/camera2/utils/TypeReference;)V -Landroid/hardware/camera2/CameraCharacteristics$Key;-><init>(Ljava/lang/String;Ljava/lang/Class;)V -Landroid/hardware/camera2/CameraCharacteristics$Key;-><init>(Ljava/lang/String;Ljava/lang/Class;J)V -Landroid/hardware/camera2/CameraCharacteristics$Key;->getNativeKey()Landroid/hardware/camera2/impl/CameraMetadataNative$Key; -Landroid/hardware/camera2/CameraCharacteristics;->CONTROL_AVAILABLE_HIGH_SPEED_VIDEO_CONFIGURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->CONTROL_MAX_REGIONS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->DEPTH_AVAILABLE_DEPTH_MIN_FRAME_DURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->DEPTH_AVAILABLE_DEPTH_STALL_DURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->DEPTH_AVAILABLE_DEPTH_STREAM_CONFIGURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->LED_AVAILABLE_LEDS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->LENS_INFO_SHADING_MAP_SIZE:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->LOGICAL_MULTI_CAMERA_PHYSICAL_IDS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->mProperties:Landroid/hardware/camera2/impl/CameraMetadataNative; -Landroid/hardware/camera2/CameraCharacteristics;->QUIRKS_USE_PARTIAL_RESULT:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->REQUEST_AVAILABLE_CHARACTERISTICS_KEYS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->REQUEST_AVAILABLE_PHYSICAL_CAMERA_REQUEST_KEYS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->REQUEST_AVAILABLE_REQUEST_KEYS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->REQUEST_AVAILABLE_RESULT_KEYS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->REQUEST_AVAILABLE_SESSION_KEYS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->REQUEST_MAX_NUM_OUTPUT_STREAMS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_FORMATS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_INPUT_OUTPUT_FORMATS_MAP:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_JPEG_MIN_DURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_JPEG_SIZES:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_MIN_FRAME_DURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_PROCESSED_MIN_DURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_PROCESSED_SIZES:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_STALL_DURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_STREAM_CONFIGURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CaptureRequest$Builder;->setPartOfCHSRequestList(Z)V -Landroid/hardware/camera2/CaptureRequest$Key;-><init>(Ljava/lang/String;Landroid/hardware/camera2/utils/TypeReference;)V -Landroid/hardware/camera2/CaptureRequest$Key;-><init>(Ljava/lang/String;Ljava/lang/Class;J)V -Landroid/hardware/camera2/CaptureRequest$Key;->getNativeKey()Landroid/hardware/camera2/impl/CameraMetadataNative$Key; -Landroid/hardware/camera2/CaptureRequest;->getTargets()Ljava/util/Collection; -Landroid/hardware/camera2/CaptureRequest;->JPEG_GPS_COORDINATES:Landroid/hardware/camera2/CaptureRequest$Key; -Landroid/hardware/camera2/CaptureRequest;->JPEG_GPS_PROCESSING_METHOD:Landroid/hardware/camera2/CaptureRequest$Key; -Landroid/hardware/camera2/CaptureRequest;->JPEG_GPS_TIMESTAMP:Landroid/hardware/camera2/CaptureRequest$Key; -Landroid/hardware/camera2/CaptureRequest;->LED_TRANSMIT:Landroid/hardware/camera2/CaptureRequest$Key; -Landroid/hardware/camera2/CaptureRequest;->mLogicalCameraSettings:Landroid/hardware/camera2/impl/CameraMetadataNative; -Landroid/hardware/camera2/CaptureRequest;->REQUEST_ID:Landroid/hardware/camera2/CaptureRequest$Key; -Landroid/hardware/camera2/CaptureRequest;->TONEMAP_CURVE_BLUE:Landroid/hardware/camera2/CaptureRequest$Key; -Landroid/hardware/camera2/CaptureRequest;->TONEMAP_CURVE_GREEN:Landroid/hardware/camera2/CaptureRequest$Key; -Landroid/hardware/camera2/CaptureRequest;->TONEMAP_CURVE_RED:Landroid/hardware/camera2/CaptureRequest$Key; -Landroid/hardware/camera2/CaptureResult$Key;-><init>(Ljava/lang/String;Landroid/hardware/camera2/utils/TypeReference;)V -Landroid/hardware/camera2/CaptureResult$Key;-><init>(Ljava/lang/String;Ljava/lang/Class;)V -Landroid/hardware/camera2/CaptureResult$Key;-><init>(Ljava/lang/String;Ljava/lang/Class;J)V -Landroid/hardware/camera2/CaptureResult$Key;->getNativeKey()Landroid/hardware/camera2/impl/CameraMetadataNative$Key; -Landroid/hardware/camera2/CaptureResult;->JPEG_GPS_COORDINATES:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->JPEG_GPS_PROCESSING_METHOD:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->JPEG_GPS_TIMESTAMP:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->LED_TRANSMIT:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->mResults:Landroid/hardware/camera2/impl/CameraMetadataNative; -Landroid/hardware/camera2/CaptureResult;->QUIRKS_PARTIAL_RESULT:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->REQUEST_FRAME_COUNT:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->REQUEST_ID:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->STATISTICS_FACE_IDS:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->STATISTICS_FACE_LANDMARKS:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->STATISTICS_FACE_RECTANGLES:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->STATISTICS_FACE_SCORES:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->STATISTICS_LENS_SHADING_MAP:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->STATISTICS_OIS_TIMESTAMPS:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->STATISTICS_OIS_X_SHIFTS:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->STATISTICS_OIS_Y_SHIFTS:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->STATISTICS_PREDICTED_COLOR_GAINS:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->STATISTICS_PREDICTED_COLOR_TRANSFORM:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->SYNC_FRAME_NUMBER:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->TONEMAP_CURVE_BLUE:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->TONEMAP_CURVE_GREEN:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->TONEMAP_CURVE_RED:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/impl/CameraMetadataNative$Key;->getTag()I -Landroid/hardware/camera2/impl/CameraMetadataNative;->mMetadataPtr:J -Landroid/hardware/camera2/impl/CameraMetadataNative;->nativeGetTagFromKeyLocal(Ljava/lang/String;)I -Landroid/hardware/camera2/impl/CameraMetadataNative;->nativeGetTypeFromTagLocal(I)I -Landroid/hardware/camera2/impl/CameraMetadataNative;->nativeReadValues(I)[B -Landroid/hardware/camera2/utils/SurfaceUtils;->getSurfaceSize(Landroid/view/Surface;)Landroid/util/Size; -Landroid/hardware/camera2/utils/TypeReference;-><init>()V -Landroid/hardware/camera2/utils/TypeReference;->createSpecializedTypeReference(Ljava/lang/reflect/Type;)Landroid/hardware/camera2/utils/TypeReference; -Landroid/hardware/Camera;->addCallbackBuffer([BI)V -Landroid/hardware/Camera;->addRawImageCallbackBuffer([B)V -Landroid/hardware/Camera;->CAMERA_HAL_API_VERSION_1_0:I -Landroid/hardware/Camera;->getEmptyParameters()Landroid/hardware/Camera$Parameters; -Landroid/hardware/Camera;->mNativeContext:J -Landroid/hardware/Camera;->native_getParameters()Ljava/lang/String; -Landroid/hardware/Camera;->native_setParameters(Ljava/lang/String;)V -Landroid/hardware/Camera;->native_setup(Ljava/lang/Object;IILjava/lang/String;)I -Landroid/hardware/Camera;->openLegacy(II)Landroid/hardware/Camera; -Landroid/hardware/Camera;->postEventFromNative(Ljava/lang/Object;IIILjava/lang/Object;)V -Landroid/hardware/Camera;->previewEnabled()Z -Landroid/hardware/Camera;->setPreviewSurface(Landroid/view/Surface;)V -Landroid/hardware/display/DisplayManager;->ACTION_WIFI_DISPLAY_STATUS_CHANGED:Ljava/lang/String; -Landroid/hardware/display/DisplayManager;->connectWifiDisplay(Ljava/lang/String;)V -Landroid/hardware/display/DisplayManager;->disconnectWifiDisplay()V -Landroid/hardware/display/DisplayManager;->EXTRA_WIFI_DISPLAY_STATUS:Ljava/lang/String; -Landroid/hardware/display/DisplayManager;->forgetWifiDisplay(Ljava/lang/String;)V -Landroid/hardware/display/DisplayManager;->getWifiDisplayStatus()Landroid/hardware/display/WifiDisplayStatus; -Landroid/hardware/display/DisplayManager;->pauseWifiDisplay()V -Landroid/hardware/display/DisplayManager;->renameWifiDisplay(Ljava/lang/String;Ljava/lang/String;)V -Landroid/hardware/display/DisplayManager;->resumeWifiDisplay()V -Landroid/hardware/display/DisplayManager;->startWifiDisplayScan()V -Landroid/hardware/display/DisplayManager;->stopWifiDisplayScan()V -Landroid/hardware/display/DisplayManagerGlobal;->disconnectWifiDisplay()V -Landroid/hardware/display/DisplayManagerGlobal;->getDisplayIds()[I -Landroid/hardware/display/DisplayManagerGlobal;->getDisplayInfo(I)Landroid/view/DisplayInfo; -Landroid/hardware/display/DisplayManagerGlobal;->getWifiDisplayStatus()Landroid/hardware/display/WifiDisplayStatus; -Landroid/hardware/display/DisplayManagerGlobal;->mDm:Landroid/hardware/display/IDisplayManager; -Landroid/hardware/display/DisplayManagerGlobal;->sInstance:Landroid/hardware/display/DisplayManagerGlobal; Landroid/hardware/display/IDisplayManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/hardware/display/IDisplayManager; Landroid/hardware/display/IDisplayManager;->getDisplayInfo(I)Landroid/view/DisplayInfo; -Landroid/hardware/display/WifiDisplay;->canConnect()Z -Landroid/hardware/display/WifiDisplay;->equals(Landroid/hardware/display/WifiDisplay;)Z -Landroid/hardware/display/WifiDisplay;->getDeviceAddress()Ljava/lang/String; -Landroid/hardware/display/WifiDisplay;->getDeviceAlias()Ljava/lang/String; -Landroid/hardware/display/WifiDisplay;->getDeviceName()Ljava/lang/String; -Landroid/hardware/display/WifiDisplay;->isAvailable()Z -Landroid/hardware/display/WifiDisplay;->isRemembered()Z -Landroid/hardware/display/WifiDisplayStatus;->DISPLAY_STATE_CONNECTED:I -Landroid/hardware/display/WifiDisplayStatus;->DISPLAY_STATE_CONNECTING:I -Landroid/hardware/display/WifiDisplayStatus;->DISPLAY_STATE_NOT_CONNECTED:I -Landroid/hardware/display/WifiDisplayStatus;->FEATURE_STATE_ON:I -Landroid/hardware/display/WifiDisplayStatus;->getActiveDisplay()Landroid/hardware/display/WifiDisplay; -Landroid/hardware/display/WifiDisplayStatus;->getActiveDisplayState()I -Landroid/hardware/display/WifiDisplayStatus;->getDisplays()[Landroid/hardware/display/WifiDisplay; -Landroid/hardware/display/WifiDisplayStatus;->getFeatureState()I -Landroid/hardware/display/WifiDisplayStatus;->getScanState()I -Landroid/hardware/display/WifiDisplayStatus;->mActiveDisplay:Landroid/hardware/display/WifiDisplay; -Landroid/hardware/display/WifiDisplayStatus;->mDisplays:[Landroid/hardware/display/WifiDisplay; -Landroid/hardware/display/WifiDisplayStatus;->SCAN_STATE_NOT_SCANNING:I -Landroid/hardware/fingerprint/Fingerprint;->getFingerId()I -Landroid/hardware/fingerprint/Fingerprint;->getName()Ljava/lang/CharSequence; -Landroid/hardware/fingerprint/FingerprintManager$AuthenticationResult;->getFingerprint()Landroid/hardware/fingerprint/Fingerprint; -Landroid/hardware/fingerprint/FingerprintManager;->getAuthenticatorId()J -Landroid/hardware/fingerprint/FingerprintManager;->getEnrolledFingerprints()Ljava/util/List; -Landroid/hardware/fingerprint/FingerprintManager;->getEnrolledFingerprints(I)Ljava/util/List; Landroid/hardware/fingerprint/IFingerprintService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/hardware/fingerprint/IFingerprintService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/hardware/fingerprint/IFingerprintService; -Landroid/hardware/HardwareBuffer;-><init>(J)V -Landroid/hardware/HardwareBuffer;->mNativeObject:J Landroid/hardware/ICameraService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/hardware/ICameraService; Landroid/hardware/input/IInputManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/hardware/input/IInputManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/hardware/input/IInputManager; Landroid/hardware/input/IInputManager$Stub;->TRANSACTION_injectInputEvent:I Landroid/hardware/input/IInputManager;->injectInputEvent(Landroid/view/InputEvent;I)Z -Landroid/hardware/input/InputManager;->createInputForwarder(I)Landroid/app/IInputForwarder; -Landroid/hardware/input/InputManager;->getInstance()Landroid/hardware/input/InputManager; -Landroid/hardware/input/InputManager;->injectInputEvent(Landroid/view/InputEvent;I)Z -Landroid/hardware/input/InputManager;->INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH:I -Landroid/hardware/input/InputManager;->mIm:Landroid/hardware/input/IInputManager; -Landroid/hardware/input/InputManager;->setPointerIconType(I)V Landroid/hardware/location/IActivityRecognitionHardwareClient$Stub;-><init>()V Landroid/hardware/location/IContextHubService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/hardware/location/IContextHubService; -Landroid/hardware/Sensor;->getHandle()I -Landroid/hardware/Sensor;->mFlags:I -Landroid/hardware/Sensor;->TYPE_DEVICE_ORIENTATION:I -Landroid/hardware/Sensor;->TYPE_PICK_UP_GESTURE:I -Landroid/hardware/SensorEvent;-><init>(I)V -Landroid/hardware/SensorManager;-><init>()V -Landroid/hardware/SerialManager;->getSerialPorts()[Ljava/lang/String; -Landroid/hardware/SerialManager;->openSerialPort(Ljava/lang/String;I)Landroid/hardware/SerialPort; -Landroid/hardware/SerialPort;->close()V -Landroid/hardware/SerialPort;->mNativeContext:I -Landroid/hardware/SerialPort;->write(Ljava/nio/ByteBuffer;I)V -Landroid/hardware/soundtrigger/SoundTrigger$ConfidenceLevel;-><init>(II)V -Landroid/hardware/soundtrigger/SoundTrigger$ConfidenceLevel;->confidenceLevel:I -Landroid/hardware/soundtrigger/SoundTrigger$ConfidenceLevel;->userId:I -Landroid/hardware/soundtrigger/SoundTrigger$GenericRecognitionEvent;-><init>(IIZIIIZLandroid/media/AudioFormat;[B)V -Landroid/hardware/soundtrigger/SoundTrigger$GenericSoundModel;-><init>(Ljava/util/UUID;Ljava/util/UUID;[B)V -Landroid/hardware/soundtrigger/SoundTrigger$Keyphrase;-><init>(IILjava/lang/String;Ljava/lang/String;[I)V -Landroid/hardware/soundtrigger/SoundTrigger$Keyphrase;->id:I -Landroid/hardware/soundtrigger/SoundTrigger$Keyphrase;->locale:Ljava/lang/String; -Landroid/hardware/soundtrigger/SoundTrigger$Keyphrase;->recognitionModes:I -Landroid/hardware/soundtrigger/SoundTrigger$Keyphrase;->text:Ljava/lang/String; -Landroid/hardware/soundtrigger/SoundTrigger$Keyphrase;->users:[I -Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseRecognitionEvent;-><init>(IIZIIIZLandroid/media/AudioFormat;[B[Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseRecognitionExtra;)V -Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseRecognitionEvent;->keyphraseExtras:[Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseRecognitionExtra; -Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseRecognitionExtra;-><init>(III[Landroid/hardware/soundtrigger/SoundTrigger$ConfidenceLevel;)V -Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseRecognitionExtra;->coarseConfidenceLevel:I -Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseRecognitionExtra;->confidenceLevels:[Landroid/hardware/soundtrigger/SoundTrigger$ConfidenceLevel; -Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseRecognitionExtra;->id:I -Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseRecognitionExtra;->recognitionModes:I -Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseSoundModel;-><init>(Ljava/util/UUID;Ljava/util/UUID;[B[Landroid/hardware/soundtrigger/SoundTrigger$Keyphrase;)V -Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseSoundModel;->keyphrases:[Landroid/hardware/soundtrigger/SoundTrigger$Keyphrase; -Landroid/hardware/soundtrigger/SoundTrigger$ModuleProperties;-><init>(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;IIIIIZIZIZ)V -Landroid/hardware/soundtrigger/SoundTrigger$ModuleProperties;->id:I -Landroid/hardware/soundtrigger/SoundTrigger$ModuleProperties;->maxSoundModels:I -Landroid/hardware/soundtrigger/SoundTrigger$ModuleProperties;->uuid:Ljava/util/UUID; -Landroid/hardware/soundtrigger/SoundTrigger$RecognitionConfig;-><init>(ZZ[Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseRecognitionExtra;[B)V -Landroid/hardware/soundtrigger/SoundTrigger$RecognitionConfig;->captureRequested:Z -Landroid/hardware/soundtrigger/SoundTrigger$RecognitionConfig;->data:[B -Landroid/hardware/soundtrigger/SoundTrigger$RecognitionConfig;->keyphrases:[Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseRecognitionExtra; -Landroid/hardware/soundtrigger/SoundTrigger$RecognitionEvent;-><init>(IIZIIIZLandroid/media/AudioFormat;[B)V -Landroid/hardware/soundtrigger/SoundTrigger$RecognitionEvent;->captureAvailable:Z -Landroid/hardware/soundtrigger/SoundTrigger$RecognitionEvent;->captureSession:I -Landroid/hardware/soundtrigger/SoundTrigger$RecognitionEvent;->data:[B -Landroid/hardware/soundtrigger/SoundTrigger$RecognitionEvent;->soundModelHandle:I -Landroid/hardware/soundtrigger/SoundTrigger$RecognitionEvent;->status:I -Landroid/hardware/soundtrigger/SoundTrigger$SoundModel;->data:[B -Landroid/hardware/soundtrigger/SoundTrigger$SoundModel;->uuid:Ljava/util/UUID; -Landroid/hardware/soundtrigger/SoundTrigger$SoundModel;->vendorUuid:Ljava/util/UUID; -Landroid/hardware/soundtrigger/SoundTrigger$SoundModelEvent;-><init>(II[B)V -Landroid/hardware/soundtrigger/SoundTrigger;->attachModule(ILandroid/hardware/soundtrigger/SoundTrigger$StatusListener;Landroid/os/Handler;)Landroid/hardware/soundtrigger/SoundTriggerModule; -Landroid/hardware/soundtrigger/SoundTrigger;->listModules(Ljava/util/ArrayList;)I -Landroid/hardware/soundtrigger/SoundTriggerModule;->detach()V -Landroid/hardware/soundtrigger/SoundTriggerModule;->loadSoundModel(Landroid/hardware/soundtrigger/SoundTrigger$SoundModel;[I)I -Landroid/hardware/soundtrigger/SoundTriggerModule;->mId:I -Landroid/hardware/soundtrigger/SoundTriggerModule;->mNativeContext:J -Landroid/hardware/soundtrigger/SoundTriggerModule;->postEventFromNative(Ljava/lang/Object;IIILjava/lang/Object;)V -Landroid/hardware/soundtrigger/SoundTriggerModule;->startRecognition(ILandroid/hardware/soundtrigger/SoundTrigger$RecognitionConfig;)I -Landroid/hardware/soundtrigger/SoundTriggerModule;->stopRecognition(I)I -Landroid/hardware/soundtrigger/SoundTriggerModule;->unloadSoundModel(I)I -Landroid/hardware/SystemSensorManager$BaseEventQueue;->dispatchAdditionalInfoEvent(III[F[I)V -Landroid/hardware/SystemSensorManager$BaseEventQueue;->dispatchFlushCompleteEvent(I)V -Landroid/hardware/SystemSensorManager$BaseEventQueue;->dispatchSensorEvent(I[FIJ)V Landroid/hardware/usb/IUsbManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/hardware/usb/IUsbManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/hardware/usb/IUsbManager; -Landroid/hardware/usb/UsbDevice;->mInterfaces:[Landroid/hardware/usb/UsbInterface; -Landroid/hardware/usb/UsbDeviceConnection;->mNativeContext:J -Landroid/hardware/usb/UsbManager;-><init>(Landroid/content/Context;Landroid/hardware/usb/IUsbManager;)V -Landroid/hardware/usb/UsbManager;->ACTION_USB_STATE:Ljava/lang/String; -Landroid/hardware/usb/UsbManager;->getPorts()[Landroid/hardware/usb/UsbPort; -Landroid/hardware/usb/UsbManager;->getPortStatus(Landroid/hardware/usb/UsbPort;)Landroid/hardware/usb/UsbPortStatus; -Landroid/hardware/usb/UsbManager;->isFunctionEnabled(Ljava/lang/String;)Z -Landroid/hardware/usb/UsbManager;->setCurrentFunction(Ljava/lang/String;Z)V -Landroid/hardware/usb/UsbManager;->setPortRoles(Landroid/hardware/usb/UsbPort;II)V -Landroid/hardware/usb/UsbManager;->USB_CONNECTED:Ljava/lang/String; -Landroid/hardware/usb/UsbManager;->USB_DATA_UNLOCKED:Ljava/lang/String; -Landroid/hardware/usb/UsbManager;->USB_FUNCTION_NONE:Ljava/lang/String; -Landroid/hardware/usb/UsbPortStatus;->getCurrentDataRole()I -Landroid/hardware/usb/UsbPortStatus;->getCurrentMode()I -Landroid/hardware/usb/UsbPortStatus;->getCurrentPowerRole()I -Landroid/hardware/usb/UsbPortStatus;->getSupportedRoleCombinations()I -Landroid/hardware/usb/UsbPortStatus;->isConnected()Z -Landroid/hardware/usb/UsbPortStatus;->isRoleCombinationSupported(II)Z -Landroid/hardware/usb/UsbRequest;->mBuffer:Ljava/nio/ByteBuffer; -Landroid/hardware/usb/UsbRequest;->mLength:I -Landroid/hardware/usb/UsbRequest;->mNativeContext:J Landroid/icu/impl/CurrencyData;-><init>()V Landroid/icu/text/ArabicShaping;-><init>(I)V Landroid/icu/text/ArabicShaping;->isAlefMaksouraChar(C)Z diff --git a/config/hiddenapi-vendor-list.txt b/config/hiddenapi-vendor-list.txt index 64d7a5bcd221..c1933fc46f58 100644 --- a/config/hiddenapi-vendor-list.txt +++ b/config/hiddenapi-vendor-list.txt @@ -99,10 +99,6 @@ Landroid/content/pm/IPackageManager;->getPackageInfo(Ljava/lang/String;II)Landro Landroid/content/pm/IPackageStatsObserver;->onGetStatsCompleted(Landroid/content/pm/PackageStats;Z)V Landroid/database/sqlite/SqliteWrapper;->insert(Landroid/content/Context;Landroid/content/ContentResolver;Landroid/net/Uri;Landroid/content/ContentValues;)Landroid/net/Uri; Landroid/database/sqlite/SqliteWrapper;->query(Landroid/content/Context;Landroid/content/ContentResolver;Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor; -Landroid/hardware/camera2/CaptureRequest$Key;-><init>(Ljava/lang/String;Ljava/lang/Class;)V -Landroid/hardware/display/DisplayManagerGlobal;->getInstance()Landroid/hardware/display/DisplayManagerGlobal; -Landroid/hardware/display/DisplayManagerGlobal;->getRealDisplay(I)Landroid/view/Display; -Landroid/hardware/location/GeofenceHardware;-><init>(Landroid/hardware/location/IGeofenceHardware;)V Landroid/hardware/location/IActivityRecognitionHardwareClient;->onAvailabilityChanged(ZLandroid/hardware/location/IActivityRecognitionHardware;)V Landroid/location/IGeocodeProvider;->getFromLocation(DDILandroid/location/GeocoderParams;Ljava/util/List;)Ljava/lang/String; Landroid/location/IGeocodeProvider;->getFromLocationName(Ljava/lang/String;DDDDILandroid/location/GeocoderParams;Ljava/util/List;)Ljava/lang/String; diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index 9350aab799a9..d8cdf60ad850 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -21,6 +21,7 @@ import static android.system.OsConstants.*; import android.annotation.Nullable; import android.annotation.SdkConstant; import android.annotation.SdkConstant.SdkConstantType; +import android.annotation.UnsupportedAppUsage; import android.app.ActivityThread; import android.app.AppOpsManager; import android.content.Context; @@ -164,6 +165,7 @@ public class Camera { private static final int CAMERA_MSG_PREVIEW_METADATA = 0x400; private static final int CAMERA_MSG_FOCUS_MOVE = 0x800; + @UnsupportedAppUsage private long mNativeContext; // accessed by native methods private EventHandler mEventHandler; private ShutterCallback mShutterCallback; @@ -236,6 +238,7 @@ public class Camera { * Camera HAL device API version 1.0 * @hide */ + @UnsupportedAppUsage public static final int CAMERA_HAL_API_VERSION_1_0 = 0x100; /** @@ -451,6 +454,7 @@ public class Camera { * * @hide */ + @UnsupportedAppUsage public static Camera openLegacy(int cameraId, int halVersion) { if (halVersion < CAMERA_HAL_API_VERSION_1_0) { throw new IllegalArgumentException("Invalid HAL version " + halVersion); @@ -606,6 +610,7 @@ public class Camera { release(); } + @UnsupportedAppUsage private native final int native_setup(Object camera_this, int cameraId, int halVersion, String packageName); @@ -718,6 +723,7 @@ public class Camera { /** * @hide */ + @UnsupportedAppUsage public native final void setPreviewSurface(Surface surface) throws IOException; /** @@ -841,6 +847,7 @@ public class Camera { * FIXME: Unhide before release * @hide */ + @UnsupportedAppUsage public native final boolean previewEnabled(); /** @@ -1014,11 +1021,13 @@ public class Camera { * * {@hide} */ + @UnsupportedAppUsage public final void addRawImageCallbackBuffer(byte[] callbackBuffer) { addCallbackBuffer(callbackBuffer, CAMERA_MSG_RAW_IMAGE); } + @UnsupportedAppUsage private final void addCallbackBuffer(byte[] callbackBuffer, int msgType) { // CAMERA_MSG_VIDEO_FRAME may be allowed in the future. @@ -1265,6 +1274,7 @@ public class Camera { } } + @UnsupportedAppUsage private static void postEventFromNative(Object camera_ref, int what, int arg1, int arg2, Object obj) { @@ -2077,7 +2087,9 @@ public class Camera { mDetailedErrorCallback = cb; } + @UnsupportedAppUsage private native final void native_setParameters(String params); + @UnsupportedAppUsage private native final String native_getParameters(); /** @@ -2126,6 +2138,7 @@ public class Camera { * * @hide */ + @UnsupportedAppUsage public static Parameters getEmptyParameters() { Camera camera = new Camera(); return camera.new Parameters(); @@ -2660,6 +2673,7 @@ public class Camera { * * @hide */ + @UnsupportedAppUsage public void copyFrom(Parameters other) { if (other == null) { throw new NullPointerException("other must not be null"); @@ -2691,6 +2705,7 @@ public class Camera { * @deprecated */ @Deprecated + @UnsupportedAppUsage public void dump() { Log.e(TAG, "dump: size=" + mMap.size()); for (String k : mMap.keySet()) { @@ -4409,6 +4424,7 @@ public class Camera { // Splits a comma delimited string to an ArrayList of Area objects. // Example string: "(-10,-10,0,0,300),(0,0,10,10,700)". Return null if // the passing string is null or the size is 0 or (0,0,0,0,0). + @UnsupportedAppUsage private ArrayList<Area> splitArea(String str) { if (str == null || str.charAt(0) != '(' || str.charAt(str.length() - 1) != ')') { diff --git a/core/java/android/hardware/HardwareBuffer.java b/core/java/android/hardware/HardwareBuffer.java index 9aa3f40a8f0a..c17aabb9c31d 100644 --- a/core/java/android/hardware/HardwareBuffer.java +++ b/core/java/android/hardware/HardwareBuffer.java @@ -19,6 +19,7 @@ package android.hardware; import android.annotation.IntDef; import android.annotation.LongDef; import android.annotation.NonNull; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -89,6 +90,7 @@ public final class HardwareBuffer implements Parcelable, AutoCloseable { public static final int S_UI8 = 0x35; // Note: do not rename, this field is used by native code + @UnsupportedAppUsage private long mNativeObject; // Invoked on destruction @@ -182,6 +184,7 @@ public final class HardwareBuffer implements Parcelable, AutoCloseable { * Private use only. See {@link #create(int, int, int, int, long)}. May also be * called from JNI using an already allocated native <code>HardwareBuffer</code>. */ + @UnsupportedAppUsage private HardwareBuffer(long nativeObject) { mNativeObject = nativeObject; diff --git a/core/java/android/hardware/Sensor.java b/core/java/android/hardware/Sensor.java index 7297426130ac..4aa6fabe8989 100644 --- a/core/java/android/hardware/Sensor.java +++ b/core/java/android/hardware/Sensor.java @@ -18,6 +18,7 @@ package android.hardware; import android.annotation.SystemApi; +import android.annotation.UnsupportedAppUsage; import android.os.Build; /** @@ -504,6 +505,7 @@ public final class Sensor { * * @hide Expected to be used internally for always on display. */ + @UnsupportedAppUsage public static final int TYPE_PICK_UP_GESTURE = 25; /** @@ -543,6 +545,7 @@ public final class Sensor { * @hide Expected to be used internally for auto-rotate and speaker rotation. * */ + @UnsupportedAppUsage public static final int TYPE_DEVICE_ORIENTATION = 27; /** @@ -891,6 +894,7 @@ public final class Sensor { private String mStringType; private String mRequiredPermission; private int mMaxDelay; + @UnsupportedAppUsage private int mFlags; private int mId; @@ -1014,6 +1018,7 @@ public final class Sensor { } /** @hide */ + @UnsupportedAppUsage public int getHandle() { return mHandle; } diff --git a/core/java/android/hardware/SensorEvent.java b/core/java/android/hardware/SensorEvent.java index bbd04a31f8c8..8c910b254b9c 100644 --- a/core/java/android/hardware/SensorEvent.java +++ b/core/java/android/hardware/SensorEvent.java @@ -16,6 +16,8 @@ package android.hardware; +import android.annotation.UnsupportedAppUsage; + /** * This class represents a {@link android.hardware.Sensor Sensor} event and * holds information such as the sensor's type, the time-stamp, accuracy and of @@ -649,6 +651,7 @@ public class SensorEvent { */ public long timestamp; + @UnsupportedAppUsage SensorEvent(int valueSize) { values = new float[valueSize]; } diff --git a/core/java/android/hardware/SensorManager.java b/core/java/android/hardware/SensorManager.java index 35aaf78bc3c2..3b251c9bf7ea 100644 --- a/core/java/android/hardware/SensorManager.java +++ b/core/java/android/hardware/SensorManager.java @@ -18,6 +18,7 @@ package android.hardware; import android.annotation.SystemApi; import android.annotation.SystemService; +import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.os.Build; import android.os.Handler; @@ -368,6 +369,7 @@ public abstract class SensorManager { /** * {@hide} */ + @UnsupportedAppUsage public SensorManager() { } diff --git a/core/java/android/hardware/SerialManager.java b/core/java/android/hardware/SerialManager.java index 610f6a587e51..571c3cc0451f 100644 --- a/core/java/android/hardware/SerialManager.java +++ b/core/java/android/hardware/SerialManager.java @@ -17,6 +17,7 @@ package android.hardware; import android.annotation.SystemService; +import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.os.ParcelFileDescriptor; import android.os.RemoteException; @@ -46,6 +47,7 @@ public class SerialManager { * * @return names of available serial ports */ + @UnsupportedAppUsage public String[] getSerialPorts() { try { return mService.getSerialPorts(); @@ -65,6 +67,7 @@ public class SerialManager { * @param speed at which to open the serial port * @return the serial port */ + @UnsupportedAppUsage public SerialPort openSerialPort(String name, int speed) throws IOException { try { ParcelFileDescriptor pfd = mService.openSerialPort(name); diff --git a/core/java/android/hardware/SerialPort.java b/core/java/android/hardware/SerialPort.java index 5d83d9c832c3..78ac3c007793 100644 --- a/core/java/android/hardware/SerialPort.java +++ b/core/java/android/hardware/SerialPort.java @@ -16,6 +16,7 @@ package android.hardware; +import android.annotation.UnsupportedAppUsage; import android.os.ParcelFileDescriptor; import java.io.FileDescriptor; @@ -31,6 +32,7 @@ public class SerialPort { private static final String TAG = "SerialPort"; // used by the JNI code + @UnsupportedAppUsage private int mNativeContext; private final String mName; private ParcelFileDescriptor mFileDescriptor; @@ -59,6 +61,7 @@ public class SerialPort { /** * Closes the serial port */ + @UnsupportedAppUsage public void close() throws IOException { if (mFileDescriptor != null) { mFileDescriptor.close(); @@ -102,6 +105,7 @@ public class SerialPort { * @param buffer to write * @param length number of bytes to write */ + @UnsupportedAppUsage public void write(ByteBuffer buffer, int length) throws IOException { if (buffer.isDirect()) { native_write_direct(buffer, length); diff --git a/core/java/android/hardware/SystemSensorManager.java b/core/java/android/hardware/SystemSensorManager.java index 1174cb6a2692..7abfabf4a2ac 100644 --- a/core/java/android/hardware/SystemSensorManager.java +++ b/core/java/android/hardware/SystemSensorManager.java @@ -16,6 +16,7 @@ package android.hardware; +import android.annotation.UnsupportedAppUsage; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -758,10 +759,13 @@ public class SystemSensorManager extends SensorManager { if (sensor == null) throw new NullPointerException(); return nativeDisableSensor(mNativeSensorEventQueue, sensor.getHandle()); } + @UnsupportedAppUsage protected abstract void dispatchSensorEvent(int handle, float[] values, int accuracy, long timestamp); + @UnsupportedAppUsage protected abstract void dispatchFlushCompleteEvent(int handle); + @UnsupportedAppUsage protected void dispatchAdditionalInfoEvent( int handle, int type, int serial, float[] floatValues, int[] intValues) { // default implementation is do nothing diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index 60e4ce29ab51..c88518e10513 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -18,6 +18,7 @@ package android.hardware.camera2; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.hardware.camera2.impl.CameraMetadataNative; import android.hardware.camera2.impl.PublicKey; import android.hardware.camera2.impl.SyntheticKey; @@ -72,6 +73,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * * @hide */ + @UnsupportedAppUsage public Key(String name, Class<T> type, long vendorId) { mKey = new CameraMetadataNative.Key<T>(name, type, vendorId); } @@ -90,6 +92,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * * @hide */ + @UnsupportedAppUsage public Key(String name, Class<T> type) { mKey = new CameraMetadataNative.Key<T>(name, type); } @@ -99,6 +102,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * * @hide */ + @UnsupportedAppUsage public Key(String name, TypeReference<T> typeReference) { mKey = new CameraMetadataNative.Key<T>(name, typeReference); } @@ -168,6 +172,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * * @hide */ + @UnsupportedAppUsage public CameraMetadataNative.Key<T> getNativeKey() { return mKey; } @@ -180,6 +185,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri } } + @UnsupportedAppUsage private final CameraMetadataNative mProperties; private List<CameraCharacteristics.Key<?>> mKeys; private List<CaptureRequest.Key<?>> mAvailableRequestKeys; @@ -767,6 +773,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * @see CaptureRequest#CONTROL_AWB_REGIONS * @hide */ + @UnsupportedAppUsage public static final Key<int[]> CONTROL_MAX_REGIONS = new Key<int[]>("android.control.maxRegions", int[].class); @@ -872,6 +879,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * @see CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES * @hide */ + @UnsupportedAppUsage public static final Key<android.hardware.camera2.params.HighSpeedVideoConfiguration[]> CONTROL_AVAILABLE_HIGH_SPEED_VIDEO_CONFIGURATIONS = new Key<android.hardware.camera2.params.HighSpeedVideoConfiguration[]>("android.control.availableHighSpeedVideoConfigurations", android.hardware.camera2.params.HighSpeedVideoConfiguration[].class); @@ -1140,6 +1148,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL * @hide */ + @UnsupportedAppUsage public static final Key<android.util.Size> LENS_INFO_SHADING_MAP_SIZE = new Key<android.util.Size>("android.lens.info.shadingMapSize", android.util.Size.class); @@ -1479,6 +1488,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * @hide */ @Deprecated + @UnsupportedAppUsage public static final Key<Byte> QUIRKS_USE_PARTIAL_RESULT = new Key<Byte>("android.quirks.usePartialResult", byte.class); @@ -1516,6 +1526,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL * @hide */ + @UnsupportedAppUsage public static final Key<int[]> REQUEST_MAX_NUM_OUTPUT_STREAMS = new Key<int[]>("android.request.maxNumOutputStreams", int[].class); @@ -1755,6 +1766,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * @see CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES * @hide */ + @UnsupportedAppUsage public static final Key<int[]> REQUEST_AVAILABLE_REQUEST_KEYS = new Key<int[]>("android.request.availableRequestKeys", int[].class); @@ -1780,6 +1792,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * @see CaptureRequest#STATISTICS_LENS_SHADING_MAP_MODE * @hide */ + @UnsupportedAppUsage public static final Key<int[]> REQUEST_AVAILABLE_RESULT_KEYS = new Key<int[]>("android.request.availableResultKeys", int[].class); @@ -1792,6 +1805,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * <p>This key is available on all devices.</p> * @hide */ + @UnsupportedAppUsage public static final Key<int[]> REQUEST_AVAILABLE_CHARACTERISTICS_KEYS = new Key<int[]>("android.request.availableCharacteristicsKeys", int[].class); @@ -1838,6 +1852,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * <p>This key is available on all devices.</p> * @hide */ + @UnsupportedAppUsage public static final Key<int[]> REQUEST_AVAILABLE_SESSION_KEYS = new Key<int[]>("android.request.availableSessionKeys", int[].class); @@ -1858,6 +1873,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL * @hide */ + @UnsupportedAppUsage public static final Key<int[]> REQUEST_AVAILABLE_PHYSICAL_CAMERA_REQUEST_KEYS = new Key<int[]>("android.request.availablePhysicalCameraRequestKeys", int[].class); @@ -1873,6 +1889,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * @hide */ @Deprecated + @UnsupportedAppUsage public static final Key<int[]> SCALER_AVAILABLE_FORMATS = new Key<int[]>("android.scaler.availableFormats", int[].class); @@ -1895,6 +1912,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * @hide */ @Deprecated + @UnsupportedAppUsage public static final Key<long[]> SCALER_AVAILABLE_JPEG_MIN_DURATIONS = new Key<long[]>("android.scaler.availableJpegMinDurations", long[].class); @@ -1913,6 +1931,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * @hide */ @Deprecated + @UnsupportedAppUsage public static final Key<android.util.Size[]> SCALER_AVAILABLE_JPEG_SIZES = new Key<android.util.Size[]>("android.scaler.availableJpegSizes", android.util.Size[].class); @@ -1954,6 +1973,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * @hide */ @Deprecated + @UnsupportedAppUsage public static final Key<long[]> SCALER_AVAILABLE_PROCESSED_MIN_DURATIONS = new Key<long[]>("android.scaler.availableProcessedMinDurations", long[].class); @@ -1978,6 +1998,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * @hide */ @Deprecated + @UnsupportedAppUsage public static final Key<android.util.Size[]> SCALER_AVAILABLE_PROCESSED_SIZES = new Key<android.util.Size[]>("android.scaler.availableProcessedSizes", android.util.Size[].class); @@ -2033,6 +2054,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * @see CameraCharacteristics#REQUEST_MAX_NUM_INPUT_STREAMS * @hide */ + @UnsupportedAppUsage public static final Key<android.hardware.camera2.params.ReprocessFormatsMap> SCALER_AVAILABLE_INPUT_OUTPUT_FORMATS_MAP = new Key<android.hardware.camera2.params.ReprocessFormatsMap>("android.scaler.availableInputOutputFormatsMap", android.hardware.camera2.params.ReprocessFormatsMap.class); @@ -2125,6 +2147,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE * @hide */ + @UnsupportedAppUsage public static final Key<android.hardware.camera2.params.StreamConfiguration[]> SCALER_AVAILABLE_STREAM_CONFIGURATIONS = new Key<android.hardware.camera2.params.StreamConfiguration[]>("android.scaler.availableStreamConfigurations", android.hardware.camera2.params.StreamConfiguration[].class); @@ -2147,6 +2170,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * @see CaptureRequest#SENSOR_FRAME_DURATION * @hide */ + @UnsupportedAppUsage public static final Key<android.hardware.camera2.params.StreamConfigurationDuration[]> SCALER_AVAILABLE_MIN_FRAME_DURATIONS = new Key<android.hardware.camera2.params.StreamConfigurationDuration[]>("android.scaler.availableMinFrameDurations", android.hardware.camera2.params.StreamConfigurationDuration[].class); @@ -2215,6 +2239,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * @see CaptureRequest#SENSOR_FRAME_DURATION * @hide */ + @UnsupportedAppUsage public static final Key<android.hardware.camera2.params.StreamConfigurationDuration[]> SCALER_AVAILABLE_STALL_DURATIONS = new Key<android.hardware.camera2.params.StreamConfigurationDuration[]>("android.scaler.availableStallDurations", android.hardware.camera2.params.StreamConfigurationDuration[].class); @@ -3122,6 +3147,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * @see #LED_AVAILABLE_LEDS_TRANSMIT * @hide */ + @UnsupportedAppUsage public static final Key<int[]> LED_AVAILABLE_LEDS = new Key<int[]>("android.led.availableLeds", int[].class); @@ -3308,6 +3334,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL * @hide */ + @UnsupportedAppUsage public static final Key<android.hardware.camera2.params.StreamConfiguration[]> DEPTH_AVAILABLE_DEPTH_STREAM_CONFIGURATIONS = new Key<android.hardware.camera2.params.StreamConfiguration[]>("android.depth.availableDepthStreamConfigurations", android.hardware.camera2.params.StreamConfiguration[].class); @@ -3334,6 +3361,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * @see CaptureRequest#SENSOR_FRAME_DURATION * @hide */ + @UnsupportedAppUsage public static final Key<android.hardware.camera2.params.StreamConfigurationDuration[]> DEPTH_AVAILABLE_DEPTH_MIN_FRAME_DURATIONS = new Key<android.hardware.camera2.params.StreamConfigurationDuration[]>("android.depth.availableDepthMinFrameDurations", android.hardware.camera2.params.StreamConfigurationDuration[].class); @@ -3357,6 +3385,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL * @hide */ + @UnsupportedAppUsage public static final Key<android.hardware.camera2.params.StreamConfigurationDuration[]> DEPTH_AVAILABLE_DEPTH_STALL_DURATIONS = new Key<android.hardware.camera2.params.StreamConfigurationDuration[]>("android.depth.availableDepthStallDurations", android.hardware.camera2.params.StreamConfigurationDuration[].class); @@ -3400,6 +3429,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL * @hide */ + @UnsupportedAppUsage public static final Key<byte[]> LOGICAL_MULTI_CAMERA_PHYSICAL_IDS = new Key<byte[]>("android.logicalMultiCamera.physicalIds", byte[].class); diff --git a/core/java/android/hardware/camera2/CaptureRequest.java b/core/java/android/hardware/camera2/CaptureRequest.java index aca77a5be47e..0a0db235c677 100644 --- a/core/java/android/hardware/camera2/CaptureRequest.java +++ b/core/java/android/hardware/camera2/CaptureRequest.java @@ -18,6 +18,7 @@ package android.hardware.camera2; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.hardware.camera2.impl.CameraMetadataNative; import android.hardware.camera2.impl.PublicKey; import android.hardware.camera2.impl.SyntheticKey; @@ -107,6 +108,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> * * @hide */ + @UnsupportedAppUsage public Key(String name, Class<T> type, long vendorId) { mKey = new CameraMetadataNative.Key<T>(name, type, vendorId); } @@ -116,6 +118,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> * * @hide */ + @UnsupportedAppUsage public Key(String name, Class<T> type) { mKey = new CameraMetadataNative.Key<T>(name, type); } @@ -125,6 +128,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> * * @hide */ + @UnsupportedAppUsage public Key(String name, TypeReference<T> typeReference) { mKey = new CameraMetadataNative.Key<T>(name, typeReference); } @@ -194,6 +198,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> * * @hide */ + @UnsupportedAppUsage public CameraMetadataNative.Key<T> getNativeKey() { return mKey; } @@ -223,6 +228,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> private static final ArraySet<Surface> mEmptySurfaceSet = new ArraySet<Surface>(); private String mLogicalCameraId; + @UnsupportedAppUsage private CameraMetadataNative mLogicalCameraSettings; private final HashMap<String, CameraMetadataNative> mPhysicalCameraSettings = new HashMap<String, CameraMetadataNative>(); @@ -598,6 +604,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> /** * @hide */ + @UnsupportedAppUsage public Collection<Surface> getTargets() { return Collections.unmodifiableCollection(mSurfaceSet); } @@ -886,6 +893,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> * * @hide */ + @UnsupportedAppUsage public void setPartOfCHSRequestList(boolean partOfCHSList) { mRequest.mIsPartOfCHSRequestList = partOfCHSList; } @@ -2132,6 +2140,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> * <p>This key is available on all devices.</p> * @hide */ + @UnsupportedAppUsage public static final Key<double[]> JPEG_GPS_COORDINATES = new Key<double[]>("android.jpeg.gpsCoordinates", double[].class); @@ -2142,6 +2151,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> * <p>This key is available on all devices.</p> * @hide */ + @UnsupportedAppUsage public static final Key<String> JPEG_GPS_PROCESSING_METHOD = new Key<String>("android.jpeg.gpsProcessingMethod", String.class); @@ -2152,6 +2162,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> * <p>This key is available on all devices.</p> * @hide */ + @UnsupportedAppUsage public static final Key<Long> JPEG_GPS_TIMESTAMP = new Key<Long>("android.jpeg.gpsTimestamp", long.class); @@ -2487,6 +2498,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> * <p><b>Optional</b> - This value may be {@code null} on some devices.</p> * @hide */ + @UnsupportedAppUsage public static final Key<Integer> REQUEST_ID = new Key<Integer>("android.request.id", int.class); @@ -2896,6 +2908,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> * @see CaptureRequest#TONEMAP_MODE * @hide */ + @UnsupportedAppUsage public static final Key<float[]> TONEMAP_CURVE_BLUE = new Key<float[]>("android.tonemap.curveBlue", float[].class); @@ -2913,6 +2926,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> * @see CaptureRequest#TONEMAP_MODE * @hide */ + @UnsupportedAppUsage public static final Key<float[]> TONEMAP_CURVE_GREEN = new Key<float[]>("android.tonemap.curveGreen", float[].class); @@ -2975,6 +2989,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> * @see CaptureRequest#TONEMAP_MODE * @hide */ + @UnsupportedAppUsage public static final Key<float[]> TONEMAP_CURVE_RED = new Key<float[]>("android.tonemap.curveRed", float[].class); @@ -3149,6 +3164,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> * <p><b>Optional</b> - This value may be {@code null} on some devices.</p> * @hide */ + @UnsupportedAppUsage public static final Key<Boolean> LED_TRANSMIT = new Key<Boolean>("android.led.transmit", boolean.class); diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java index 75c27f56c0a6..b03dfb67e903 100644 --- a/core/java/android/hardware/camera2/CaptureResult.java +++ b/core/java/android/hardware/camera2/CaptureResult.java @@ -18,6 +18,7 @@ package android.hardware.camera2; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.hardware.camera2.impl.CameraMetadataNative; import android.hardware.camera2.impl.CaptureResultExtras; import android.hardware.camera2.impl.PublicKey; @@ -78,6 +79,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * * @hide */ + @UnsupportedAppUsage public Key(String name, Class<T> type, long vendorId) { mKey = new CameraMetadataNative.Key<T>(name, type, vendorId); } @@ -96,6 +98,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * * @hide */ + @UnsupportedAppUsage public Key(String name, Class<T> type) { mKey = new CameraMetadataNative.Key<T>(name, type); } @@ -105,6 +108,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * * @hide */ + @UnsupportedAppUsage public Key(String name, TypeReference<T> typeReference) { mKey = new CameraMetadataNative.Key<T>(name, typeReference); } @@ -174,6 +178,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * * @hide */ + @UnsupportedAppUsage public CameraMetadataNative.Key<T> getNativeKey() { return mKey; } @@ -184,6 +189,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { } } + @UnsupportedAppUsage private final CameraMetadataNative mResults; private final CaptureRequest mRequest; private final int mSequenceId; @@ -2458,6 +2464,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * <p>This key is available on all devices.</p> * @hide */ + @UnsupportedAppUsage public static final Key<double[]> JPEG_GPS_COORDINATES = new Key<double[]>("android.jpeg.gpsCoordinates", double[].class); @@ -2468,6 +2475,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * <p>This key is available on all devices.</p> * @hide */ + @UnsupportedAppUsage public static final Key<String> JPEG_GPS_PROCESSING_METHOD = new Key<String>("android.jpeg.gpsProcessingMethod", String.class); @@ -2478,6 +2486,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * <p>This key is available on all devices.</p> * @hide */ + @UnsupportedAppUsage public static final Key<Long> JPEG_GPS_TIMESTAMP = new Key<Long>("android.jpeg.gpsTimestamp", long.class); @@ -3104,6 +3113,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * @hide */ @Deprecated + @UnsupportedAppUsage public static final Key<Boolean> QUIRKS_PARTIAL_RESULT = new Key<Boolean>("android.quirks.partialResult", boolean.class); @@ -3122,6 +3132,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * @hide */ @Deprecated + @UnsupportedAppUsage public static final Key<Integer> REQUEST_FRAME_COUNT = new Key<Integer>("android.request.frameCount", int.class); @@ -3135,6 +3146,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * <p><b>Optional</b> - This value may be {@code null} on some devices.</p> * @hide */ + @UnsupportedAppUsage public static final Key<Integer> REQUEST_ID = new Key<Integer>("android.request.id", int.class); @@ -3696,6 +3708,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * @see CaptureRequest#STATISTICS_FACE_DETECT_MODE * @hide */ + @UnsupportedAppUsage public static final Key<int[]> STATISTICS_FACE_IDS = new Key<int[]>("android.statistics.faceIds", int[].class); @@ -3722,6 +3735,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * @see CaptureRequest#STATISTICS_FACE_DETECT_MODE * @hide */ + @UnsupportedAppUsage public static final Key<int[]> STATISTICS_FACE_LANDMARKS = new Key<int[]>("android.statistics.faceLandmarks", int[].class); @@ -3748,6 +3762,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * @see CaptureRequest#STATISTICS_FACE_DETECT_MODE * @hide */ + @UnsupportedAppUsage public static final Key<android.graphics.Rect[]> STATISTICS_FACE_RECTANGLES = new Key<android.graphics.Rect[]>("android.statistics.faceRectangles", android.graphics.Rect[].class); @@ -3762,6 +3777,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * @see CaptureRequest#STATISTICS_FACE_DETECT_MODE * @hide */ + @UnsupportedAppUsage public static final Key<byte[]> STATISTICS_FACE_SCORES = new Key<byte[]>("android.statistics.faceScores", byte[].class); @@ -3921,6 +3937,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * @see CameraCharacteristics#SENSOR_INFO_LENS_SHADING_APPLIED * @hide */ + @UnsupportedAppUsage public static final Key<float[]> STATISTICS_LENS_SHADING_MAP = new Key<float[]>("android.statistics.lensShadingMap", float[].class); @@ -3944,6 +3961,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * @hide */ @Deprecated + @UnsupportedAppUsage public static final Key<float[]> STATISTICS_PREDICTED_COLOR_GAINS = new Key<float[]>("android.statistics.predictedColorGains", float[].class); @@ -3970,6 +3988,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * @hide */ @Deprecated + @UnsupportedAppUsage public static final Key<Rational[]> STATISTICS_PREDICTED_COLOR_TRANSFORM = new Key<Rational[]>("android.statistics.predictedColorTransform", Rational[].class); @@ -4106,6 +4125,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * @see CaptureResult#SENSOR_TIMESTAMP * @hide */ + @UnsupportedAppUsage public static final Key<long[]> STATISTICS_OIS_TIMESTAMPS = new Key<long[]>("android.statistics.oisTimestamps", long[].class); @@ -4121,6 +4141,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * <p><b>Optional</b> - This value may be {@code null} on some devices.</p> * @hide */ + @UnsupportedAppUsage public static final Key<float[]> STATISTICS_OIS_X_SHIFTS = new Key<float[]>("android.statistics.oisXShifts", float[].class); @@ -4136,6 +4157,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * <p><b>Optional</b> - This value may be {@code null} on some devices.</p> * @hide */ + @UnsupportedAppUsage public static final Key<float[]> STATISTICS_OIS_Y_SHIFTS = new Key<float[]>("android.statistics.oisYShifts", float[].class); @@ -4170,6 +4192,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * @see CaptureRequest#TONEMAP_MODE * @hide */ + @UnsupportedAppUsage public static final Key<float[]> TONEMAP_CURVE_BLUE = new Key<float[]>("android.tonemap.curveBlue", float[].class); @@ -4187,6 +4210,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * @see CaptureRequest#TONEMAP_MODE * @hide */ + @UnsupportedAppUsage public static final Key<float[]> TONEMAP_CURVE_GREEN = new Key<float[]>("android.tonemap.curveGreen", float[].class); @@ -4249,6 +4273,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * @see CaptureRequest#TONEMAP_MODE * @hide */ + @UnsupportedAppUsage public static final Key<float[]> TONEMAP_CURVE_RED = new Key<float[]>("android.tonemap.curveRed", float[].class); @@ -4423,6 +4448,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * <p><b>Optional</b> - This value may be {@code null} on some devices.</p> * @hide */ + @UnsupportedAppUsage public static final Key<Boolean> LED_TRANSMIT = new Key<Boolean>("android.led.transmit", boolean.class); @@ -4512,6 +4538,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * @see #SYNC_FRAME_NUMBER_UNKNOWN * @hide */ + @UnsupportedAppUsage public static final Key<Long> SYNC_FRAME_NUMBER = new Key<Long>("android.sync.frameNumber", long.class); diff --git a/core/java/android/hardware/camera2/impl/CameraMetadataNative.java b/core/java/android/hardware/camera2/impl/CameraMetadataNative.java index 86bd30c19ca3..0610d7a3746b 100644 --- a/core/java/android/hardware/camera2/impl/CameraMetadataNative.java +++ b/core/java/android/hardware/camera2/impl/CameraMetadataNative.java @@ -16,6 +16,7 @@ package android.hardware.camera2.impl; +import android.annotation.UnsupportedAppUsage; import android.graphics.ImageFormat; import android.graphics.Point; import android.graphics.Rect; @@ -231,6 +232,7 @@ public class CameraMetadataNative implements Parcelable { * * @return The tag numeric value corresponding to the string */ + @UnsupportedAppUsage public final int getTag() { if (!mHasTag) { mTag = CameraMetadataNative.getTag(mName, mVendorId); @@ -1188,6 +1190,7 @@ public class CameraMetadataNative implements Parcelable { return true; } + @UnsupportedAppUsage private long mMetadataPtr; // native CameraMetadata* private native long nativeAllocate(); @@ -1202,13 +1205,16 @@ public class CameraMetadataNative implements Parcelable { private native synchronized boolean nativeIsEmpty(); private native synchronized int nativeGetEntryCount(); + @UnsupportedAppUsage private native synchronized byte[] nativeReadValues(int tag); private native synchronized void nativeWriteValues(int tag, byte[] src); private native synchronized void nativeDump() throws IOException; // dump to ALOGD private native synchronized ArrayList nativeGetAllVendorKeys(Class keyClass); + @UnsupportedAppUsage private native synchronized int nativeGetTagFromKeyLocal(String keyName) throws IllegalArgumentException; + @UnsupportedAppUsage private native synchronized int nativeGetTypeFromTagLocal(int tag) throws IllegalArgumentException; private static native int nativeGetTagFromKey(String keyName, long vendorId) diff --git a/core/java/android/hardware/camera2/utils/SurfaceUtils.java b/core/java/android/hardware/camera2/utils/SurfaceUtils.java index 92478441aea3..d3c4505c37f0 100644 --- a/core/java/android/hardware/camera2/utils/SurfaceUtils.java +++ b/core/java/android/hardware/camera2/utils/SurfaceUtils.java @@ -16,6 +16,7 @@ package android.hardware.camera2.utils; +import android.annotation.UnsupportedAppUsage; import android.graphics.ImageFormat; import android.hardware.camera2.legacy.LegacyCameraDevice; import android.hardware.camera2.legacy.LegacyExceptionUtils.BufferQueueAbandonedException; @@ -77,6 +78,7 @@ public class SurfaceUtils { * * @throws IllegalArgumentException if the surface is already abandoned. */ + @UnsupportedAppUsage public static Size getSurfaceSize(Surface surface) { try { return LegacyCameraDevice.getSurfaceSize(surface); diff --git a/core/java/android/hardware/camera2/utils/TypeReference.java b/core/java/android/hardware/camera2/utils/TypeReference.java index 24ce12413882..d9ba31b4c6f4 100644 --- a/core/java/android/hardware/camera2/utils/TypeReference.java +++ b/core/java/android/hardware/camera2/utils/TypeReference.java @@ -16,6 +16,7 @@ package android.hardware.camera2.utils; +import android.annotation.UnsupportedAppUsage; import java.lang.reflect.Array; import java.lang.reflect.GenericArrayType; import java.lang.reflect.ParameterizedType; @@ -55,6 +56,7 @@ public abstract class TypeReference<T> { * * @see TypeReference */ + @UnsupportedAppUsage protected TypeReference() { ParameterizedType thisType = (ParameterizedType)getClass().getGenericSuperclass(); @@ -136,6 +138,7 @@ public abstract class TypeReference<T> { * * @throws IllegalArgumentException if {@code type} had any type variables */ + @UnsupportedAppUsage public static TypeReference<?> createSpecializedTypeReference(Type type) { return new SpecializedBaseTypeReference(type); } diff --git a/core/java/android/hardware/display/DisplayManager.java b/core/java/android/hardware/display/DisplayManager.java index b182fa2e8ad3..e700cac9c07a 100644 --- a/core/java/android/hardware/display/DisplayManager.java +++ b/core/java/android/hardware/display/DisplayManager.java @@ -23,6 +23,7 @@ import android.annotation.RequiresPermission; import android.annotation.SystemApi; import android.annotation.SystemService; import android.annotation.TestApi; +import android.annotation.UnsupportedAppUsage; import android.app.KeyguardManager; import android.content.Context; import android.graphics.Point; @@ -62,6 +63,7 @@ public final class DisplayManager { * </p> * @hide */ + @UnsupportedAppUsage public static final String ACTION_WIFI_DISPLAY_STATUS_CHANGED = "android.hardware.display.action.WIFI_DISPLAY_STATUS_CHANGED"; @@ -69,6 +71,7 @@ public final class DisplayManager { * Contains a {@link WifiDisplayStatus} object. * @hide */ + @UnsupportedAppUsage public static final String EXTRA_WIFI_DISPLAY_STATUS = "android.hardware.display.extra.WIFI_DISPLAY_STATUS"; @@ -437,6 +440,7 @@ public final class DisplayManager { * * @hide */ + @UnsupportedAppUsage public void startWifiDisplayScan() { mGlobal.startWifiDisplayScan(); } @@ -449,6 +453,7 @@ public final class DisplayManager { * * @hide */ + @UnsupportedAppUsage public void stopWifiDisplayScan() { mGlobal.stopWifiDisplayScan(); } @@ -466,16 +471,19 @@ public final class DisplayManager { * @param deviceAddress The MAC address of the device to which we should connect. * @hide */ + @UnsupportedAppUsage public void connectWifiDisplay(String deviceAddress) { mGlobal.connectWifiDisplay(deviceAddress); } /** @hide */ + @UnsupportedAppUsage public void pauseWifiDisplay() { mGlobal.pauseWifiDisplay(); } /** @hide */ + @UnsupportedAppUsage public void resumeWifiDisplay() { mGlobal.resumeWifiDisplay(); } @@ -485,6 +493,7 @@ public final class DisplayManager { * The results are sent as a {@link #ACTION_WIFI_DISPLAY_STATUS_CHANGED} broadcast. * @hide */ + @UnsupportedAppUsage public void disconnectWifiDisplay() { mGlobal.disconnectWifiDisplay(); } @@ -504,6 +513,7 @@ public final class DisplayManager { * or empty if no alias should be used. * @hide */ + @UnsupportedAppUsage public void renameWifiDisplay(String deviceAddress, String alias) { mGlobal.renameWifiDisplay(deviceAddress, alias); } @@ -519,6 +529,7 @@ public final class DisplayManager { * @param deviceAddress The MAC address of the device to forget. * @hide */ + @UnsupportedAppUsage public void forgetWifiDisplay(String deviceAddress) { mGlobal.forgetWifiDisplay(deviceAddress); } @@ -531,6 +542,7 @@ public final class DisplayManager { * @return The current Wifi display status. * @hide */ + @UnsupportedAppUsage public WifiDisplayStatus getWifiDisplayStatus() { return mGlobal.getWifiDisplayStatus(); } diff --git a/core/java/android/hardware/display/DisplayManagerGlobal.java b/core/java/android/hardware/display/DisplayManagerGlobal.java index d968a3e942bb..7304ab4aa1df 100644 --- a/core/java/android/hardware/display/DisplayManagerGlobal.java +++ b/core/java/android/hardware/display/DisplayManagerGlobal.java @@ -16,6 +16,7 @@ package android.hardware.display; +import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.pm.ParceledListSlice; import android.content.res.Resources; @@ -66,10 +67,12 @@ public final class DisplayManagerGlobal { public static final int EVENT_DISPLAY_CHANGED = 2; public static final int EVENT_DISPLAY_REMOVED = 3; + @UnsupportedAppUsage private static DisplayManagerGlobal sInstance; private final Object mLock = new Object(); + @UnsupportedAppUsage private final IDisplayManager mDm; private DisplayManagerCallback mCallback; @@ -91,6 +94,7 @@ public final class DisplayManagerGlobal { * @return The display manager instance, may be null early in system startup * before the display manager has been fully initialized. */ + @UnsupportedAppUsage public static DisplayManagerGlobal getInstance() { synchronized (DisplayManagerGlobal.class) { if (sInstance == null) { @@ -110,6 +114,7 @@ public final class DisplayManagerGlobal { * @return Information about the specified display, or null if it does not exist. * This object belongs to an internal cache and should be treated as if it were immutable. */ + @UnsupportedAppUsage public DisplayInfo getDisplayInfo(int displayId) { try { synchronized (mLock) { @@ -146,6 +151,7 @@ public final class DisplayManagerGlobal { * * @return An array containing all display ids. */ + @UnsupportedAppUsage public int[] getDisplayIds() { try { synchronized (mLock) { @@ -209,6 +215,7 @@ public final class DisplayManagerGlobal { * @param displayId The logical display id. * @return The display object, or null if there is no display with the given id. */ + @UnsupportedAppUsage public Display getRealDisplay(int displayId) { return getCompatibleDisplay(displayId, DisplayAdjustments.DEFAULT_DISPLAY_ADJUSTMENTS); } @@ -337,6 +344,7 @@ public final class DisplayManagerGlobal { } } + @UnsupportedAppUsage public void disconnectWifiDisplay() { try { mDm.disconnectWifiDisplay(); @@ -369,6 +377,7 @@ public final class DisplayManagerGlobal { } } + @UnsupportedAppUsage public WifiDisplayStatus getWifiDisplayStatus() { try { return mDm.getWifiDisplayStatus(); diff --git a/core/java/android/hardware/display/WifiDisplay.java b/core/java/android/hardware/display/WifiDisplay.java index bb32c199993b..12486e871c33 100644 --- a/core/java/android/hardware/display/WifiDisplay.java +++ b/core/java/android/hardware/display/WifiDisplay.java @@ -16,6 +16,7 @@ package android.hardware.display; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -76,6 +77,7 @@ public final class WifiDisplay implements Parcelable { /** * Gets the MAC address of the Wifi display device. */ + @UnsupportedAppUsage public String getDeviceAddress() { return mDeviceAddress; } @@ -83,6 +85,7 @@ public final class WifiDisplay implements Parcelable { /** * Gets the name of the Wifi display device. */ + @UnsupportedAppUsage public String getDeviceName() { return mDeviceName; } @@ -94,6 +97,7 @@ public final class WifiDisplay implements Parcelable { * provided by the user when renaming the device. * </p> */ + @UnsupportedAppUsage public String getDeviceAlias() { return mDeviceAlias; } @@ -101,6 +105,7 @@ public final class WifiDisplay implements Parcelable { /** * Returns true if device is available, false otherwise. */ + @UnsupportedAppUsage public boolean isAvailable() { return mIsAvailable; } @@ -108,6 +113,7 @@ public final class WifiDisplay implements Parcelable { /** * Returns true if device can be connected to (not in use), false otherwise. */ + @UnsupportedAppUsage public boolean canConnect() { return mCanConnect; } @@ -115,6 +121,7 @@ public final class WifiDisplay implements Parcelable { /** * Returns true if device has been remembered, false otherwise. */ + @UnsupportedAppUsage public boolean isRemembered() { return mIsRemembered; } @@ -136,6 +143,7 @@ public final class WifiDisplay implements Parcelable { * Returns true if the two displays have the same identity (address, name and alias). * This method does not compare the current status of the displays. */ + @UnsupportedAppUsage public boolean equals(WifiDisplay other) { return other != null && mDeviceAddress.equals(other.mDeviceAddress) diff --git a/core/java/android/hardware/display/WifiDisplayStatus.java b/core/java/android/hardware/display/WifiDisplayStatus.java index b645662f3095..c2678341128b 100644 --- a/core/java/android/hardware/display/WifiDisplayStatus.java +++ b/core/java/android/hardware/display/WifiDisplayStatus.java @@ -16,6 +16,7 @@ package android.hardware.display; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -34,7 +35,9 @@ public final class WifiDisplayStatus implements Parcelable { private final int mFeatureState; private final int mScanState; private final int mActiveDisplayState; + @UnsupportedAppUsage private final WifiDisplay mActiveDisplay; + @UnsupportedAppUsage private final WifiDisplay[] mDisplays; /** Session info needed for Miracast Certification */ @@ -47,18 +50,23 @@ public final class WifiDisplayStatus implements Parcelable { /** Feature state: Wifi display is turned off in settings. */ public static final int FEATURE_STATE_OFF = 2; /** Feature state: Wifi display is turned on in settings. */ + @UnsupportedAppUsage public static final int FEATURE_STATE_ON = 3; /** Scan state: Not currently scanning. */ + @UnsupportedAppUsage public static final int SCAN_STATE_NOT_SCANNING = 0; /** Scan state: Currently scanning. */ public static final int SCAN_STATE_SCANNING = 1; /** Display state: Not connected. */ + @UnsupportedAppUsage public static final int DISPLAY_STATE_NOT_CONNECTED = 0; /** Display state: Connecting to active display. */ + @UnsupportedAppUsage public static final int DISPLAY_STATE_CONNECTING = 1; /** Display state: Connected to active display. */ + @UnsupportedAppUsage public static final int DISPLAY_STATE_CONNECTED = 2; public static final Creator<WifiDisplayStatus> CREATOR = new Creator<WifiDisplayStatus>() { @@ -117,6 +125,7 @@ public final class WifiDisplayStatus implements Parcelable { * connecting to displays have been met. * </p> */ + @UnsupportedAppUsage public int getFeatureState() { return mFeatureState; } @@ -126,6 +135,7 @@ public final class WifiDisplayStatus implements Parcelable { * * @return One of: {@link #SCAN_STATE_NOT_SCANNING} or {@link #SCAN_STATE_SCANNING}. */ + @UnsupportedAppUsage public int getScanState() { return mScanState; } @@ -136,6 +146,7 @@ public final class WifiDisplayStatus implements Parcelable { * @return One of: {@link #DISPLAY_STATE_NOT_CONNECTED}, {@link #DISPLAY_STATE_CONNECTING}, * or {@link #DISPLAY_STATE_CONNECTED}. */ + @UnsupportedAppUsage public int getActiveDisplayState() { return mActiveDisplayState; } @@ -144,6 +155,7 @@ public final class WifiDisplayStatus implements Parcelable { * Gets the Wifi display that is currently active. It may be connecting or * connected. */ + @UnsupportedAppUsage public WifiDisplay getActiveDisplay() { return mActiveDisplay; } @@ -153,6 +165,7 @@ public final class WifiDisplayStatus implements Parcelable { * Wifi displays as reported by the most recent scan, and all remembered * Wifi displays (not necessarily available at the time). */ + @UnsupportedAppUsage public WifiDisplay[] getDisplays() { return mDisplays; } diff --git a/core/java/android/hardware/fingerprint/Fingerprint.java b/core/java/android/hardware/fingerprint/Fingerprint.java index c7ce8fad2543..66f43f2342e6 100644 --- a/core/java/android/hardware/fingerprint/Fingerprint.java +++ b/core/java/android/hardware/fingerprint/Fingerprint.java @@ -15,6 +15,7 @@ */ package android.hardware.fingerprint; +import android.annotation.UnsupportedAppUsage; import android.hardware.biometrics.BiometricAuthenticator; import android.os.Parcel; import android.os.Parcelable; @@ -47,6 +48,7 @@ public final class Fingerprint extends BiometricAuthenticator.BiometricIdentifie * Gets the human-readable name for the given fingerprint. * @return name given to finger */ + @UnsupportedAppUsage public CharSequence getName() { return mName; } /** @@ -55,6 +57,7 @@ public final class Fingerprint extends BiometricAuthenticator.BiometricIdentifie * @return device-specific id for this finger * @hide */ + @UnsupportedAppUsage public int getFingerId() { return mFingerId; } /** diff --git a/core/java/android/hardware/fingerprint/FingerprintManager.java b/core/java/android/hardware/fingerprint/FingerprintManager.java index ebbfe1c26a9c..74858e46ceba 100644 --- a/core/java/android/hardware/fingerprint/FingerprintManager.java +++ b/core/java/android/hardware/fingerprint/FingerprintManager.java @@ -27,6 +27,7 @@ import android.annotation.Nullable; import android.annotation.RequiresFeature; import android.annotation.RequiresPermission; import android.annotation.SystemService; +import android.annotation.UnsupportedAppUsage; import android.app.ActivityManager; import android.content.Context; import android.content.pm.PackageManager; @@ -188,6 +189,7 @@ public class FingerprintManager implements BiometricFingerprintConstants { * * @hide */ + @UnsupportedAppUsage public Fingerprint getFingerprint() { return mFingerprint; } /** @@ -718,6 +720,7 @@ public class FingerprintManager implements BiometricFingerprintConstants { * @hide */ @RequiresPermission(USE_FINGERPRINT) + @UnsupportedAppUsage public List<Fingerprint> getEnrolledFingerprints(int userId) { if (mService != null) try { return mService.getEnrolledFingerprints(userId, mContext.getOpPackageName()); @@ -734,6 +737,7 @@ public class FingerprintManager implements BiometricFingerprintConstants { * @hide */ @RequiresPermission(USE_FINGERPRINT) + @UnsupportedAppUsage public List<Fingerprint> getEnrolledFingerprints() { return getEnrolledFingerprints(mContext.getUserId()); } @@ -801,6 +805,7 @@ public class FingerprintManager implements BiometricFingerprintConstants { * * @hide */ + @UnsupportedAppUsage public long getAuthenticatorId() { if (mService != null) { try { diff --git a/core/java/android/hardware/input/InputManager.java b/core/java/android/hardware/input/InputManager.java index 6ae7a146a7b7..6ed50909a445 100644 --- a/core/java/android/hardware/input/InputManager.java +++ b/core/java/android/hardware/input/InputManager.java @@ -20,6 +20,7 @@ import android.annotation.IntDef; import android.annotation.SdkConstant; import android.annotation.SdkConstant.SdkConstantType; import android.annotation.SystemService; +import android.annotation.UnsupportedAppUsage; import android.app.IInputForwarder; import android.content.Context; import android.media.AudioAttributes; @@ -64,6 +65,7 @@ public final class InputManager { private static InputManager sInstance; + @UnsupportedAppUsage private final IInputManager mIm; // Guarded by mInputDevicesLock @@ -181,6 +183,7 @@ public final class InputManager { * Waits for the event to be delivered to the application and handled. * @hide */ + @UnsupportedAppUsage public static final int INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH = 2; // see InputDispatcher.h /** @hide */ @@ -223,6 +226,7 @@ public final class InputManager { * * @hide */ + @UnsupportedAppUsage public static InputManager getInstance() { synchronized (InputManager.class) { if (sInstance == null) { @@ -866,6 +870,7 @@ public final class InputManager { * * @hide */ + @UnsupportedAppUsage public boolean injectInputEvent(InputEvent event, int mode) { if (event == null) { throw new IllegalArgumentException("event must not be null"); @@ -891,6 +896,7 @@ public final class InputManager { * * @hide */ + @UnsupportedAppUsage public void setPointerIconType(int iconId) { try { mIm.setPointerIconType(iconId); @@ -938,6 +944,7 @@ public final class InputManager { * * @hide */ + @UnsupportedAppUsage public IInputForwarder createInputForwarder(int displayId) { try { return mIm.createInputForwarder(displayId); diff --git a/core/java/android/hardware/location/GeofenceHardware.java b/core/java/android/hardware/location/GeofenceHardware.java index 66dd9fce8fa3..23d8d01dbe9d 100644 --- a/core/java/android/hardware/location/GeofenceHardware.java +++ b/core/java/android/hardware/location/GeofenceHardware.java @@ -16,6 +16,7 @@ package android.hardware.location; import android.annotation.SystemApi; +import android.annotation.UnsupportedAppUsage; import android.location.Location; import android.os.Build; import android.os.RemoteException; @@ -168,6 +169,7 @@ public final class GeofenceHardware { GeofenceHardwareMonitorCallbackWrapper>(); /** @hide */ + @UnsupportedAppUsage public GeofenceHardware(IGeofenceHardware service) { mService = service; } diff --git a/core/java/android/hardware/soundtrigger/SoundTrigger.java b/core/java/android/hardware/soundtrigger/SoundTrigger.java index dde8a3327172..007f4bcd43fc 100644 --- a/core/java/android/hardware/soundtrigger/SoundTrigger.java +++ b/core/java/android/hardware/soundtrigger/SoundTrigger.java @@ -24,6 +24,7 @@ import static android.system.OsConstants.EPIPE; import android.annotation.Nullable; import android.annotation.SystemApi; +import android.annotation.UnsupportedAppUsage; import android.media.AudioFormat; import android.os.Handler; import android.os.Parcel; @@ -72,6 +73,7 @@ public class SoundTrigger { ****************************************************************************/ public static class ModuleProperties implements Parcelable { /** Unique module ID provided by the native service */ + @UnsupportedAppUsage public final int id; /** human readable voice detection engine implementor */ @@ -81,12 +83,14 @@ public class SoundTrigger { public final String description; /** Unique voice engine Id (changes with each version) */ + @UnsupportedAppUsage public final UUID uuid; /** Voice detection engine version */ public final int version; /** Maximum number of active sound models */ + @UnsupportedAppUsage public final int maxSoundModels; /** Maximum number of key phrases */ @@ -114,6 +118,7 @@ public class SoundTrigger { * recognition callback event */ public final boolean returnsTriggerInEvent; + @UnsupportedAppUsage ModuleProperties(int id, String implementor, String description, String uuid, int version, int maxSoundModels, int maxKeyphrases, int maxUsers, int recognitionModes, boolean supportsCaptureTransition, @@ -225,15 +230,18 @@ public class SoundTrigger { public static final int TYPE_GENERIC_SOUND = 1; /** Unique sound model identifier */ + @UnsupportedAppUsage public final UUID uuid; /** Sound model type (e.g. TYPE_KEYPHRASE); */ public final int type; /** Unique sound model vendor identifier */ + @UnsupportedAppUsage public final UUID vendorUuid; /** Opaque data. For use by vendor implementation and enrollment application */ + @UnsupportedAppUsage public final byte[] data; public SoundModel(UUID uuid, UUID vendorUuid, int type, byte[] data) { @@ -289,21 +297,27 @@ public class SoundTrigger { ****************************************************************************/ public static class Keyphrase implements Parcelable { /** Unique identifier for this keyphrase */ + @UnsupportedAppUsage public final int id; /** Recognition modes supported for this key phrase in the model */ + @UnsupportedAppUsage public final int recognitionModes; /** Locale of the keyphrase. JAVA Locale string e.g en_US */ + @UnsupportedAppUsage public final String locale; /** Key phrase text */ + @UnsupportedAppUsage public final String text; /** Users this key phrase has been trained for. countains sound trigger specific user IDs * derived from system user IDs {@link android.os.UserHandle#getIdentifier()}. */ + @UnsupportedAppUsage public final int[] users; + @UnsupportedAppUsage public Keyphrase(int id, int recognitionModes, String locale, String text, int[] users) { this.id = id; this.recognitionModes = recognitionModes; @@ -412,8 +426,10 @@ public class SoundTrigger { ****************************************************************************/ public static class KeyphraseSoundModel extends SoundModel implements Parcelable { /** Key phrases in this sound model */ + @UnsupportedAppUsage public final Keyphrase[] keyphrases; // keyword phrases in model + @UnsupportedAppUsage public KeyphraseSoundModel( UUID uuid, UUID vendorUuid, byte[] data, Keyphrase[] keyphrases) { super(uuid, vendorUuid, TYPE_KEYPHRASE, data); @@ -511,6 +527,7 @@ public class SoundTrigger { } }; + @UnsupportedAppUsage public GenericSoundModel(UUID uuid, UUID vendorUuid, byte[] data) { super(uuid, vendorUuid, TYPE_GENERIC_SOUND, data); } @@ -606,6 +623,7 @@ public class SoundTrigger { * * @hide */ + @UnsupportedAppUsage public final int status; /** * @@ -613,12 +631,14 @@ public class SoundTrigger { * * @hide */ + @UnsupportedAppUsage public final int soundModelHandle; /** * True if it is possible to capture audio from this utterance buffered by the hardware * * @hide */ + @UnsupportedAppUsage public final boolean captureAvailable; /** * Audio session ID to be used when capturing the utterance with an AudioRecord @@ -626,6 +646,7 @@ public class SoundTrigger { * * @hide */ + @UnsupportedAppUsage public final int captureSession; /** * Delay in ms between end of model detection and start of audio available for capture. @@ -659,9 +680,11 @@ public class SoundTrigger { * * @hide */ + @UnsupportedAppUsage public final byte[] data; /** @hide */ + @UnsupportedAppUsage public RecognitionEvent(int status, int soundModelHandle, boolean captureAvailable, int captureSession, int captureDelayMs, int capturePreambleMs, boolean triggerInData, AudioFormat captureFormat, byte[] data) { @@ -865,6 +888,7 @@ public class SoundTrigger { public static class RecognitionConfig implements Parcelable { /** True if the DSP should capture the trigger sound and make it available for further * capture. */ + @UnsupportedAppUsage public final boolean captureRequested; /** * True if the service should restart listening after the DSP triggers. @@ -873,11 +897,14 @@ public class SoundTrigger { public final boolean allowMultipleTriggers; /** List of all keyphrases in the sound model for which recognition should be performed with * options for each keyphrase. */ + @UnsupportedAppUsage public final KeyphraseRecognitionExtra keyphrases[]; /** Opaque data for use by system applications who know about voice engine internals, * typically during enrollment. */ + @UnsupportedAppUsage public final byte[] data; + @UnsupportedAppUsage public RecognitionConfig(boolean captureRequested, boolean allowMultipleTriggers, KeyphraseRecognitionExtra[] keyphrases, byte[] data) { this.captureRequested = captureRequested; @@ -938,9 +965,12 @@ public class SoundTrigger { * @hide */ public static class ConfidenceLevel implements Parcelable { + @UnsupportedAppUsage public final int userId; + @UnsupportedAppUsage public final int confidenceLevel; + @UnsupportedAppUsage public ConfidenceLevel(int userId, int confidenceLevel) { this.userId = userId; this.confidenceLevel = confidenceLevel; @@ -1014,19 +1044,24 @@ public class SoundTrigger { */ public static class KeyphraseRecognitionExtra implements Parcelable { /** The keyphrase ID */ + @UnsupportedAppUsage public final int id; /** Recognition modes matched for this event */ + @UnsupportedAppUsage public final int recognitionModes; /** Confidence level for mode RECOGNITION_MODE_VOICE_TRIGGER when user identification * is not performed */ + @UnsupportedAppUsage public final int coarseConfidenceLevel; /** Confidence levels for all users recognized (KeyphraseRecognitionEvent) or to * be recognized (RecognitionConfig) */ + @UnsupportedAppUsage public final ConfidenceLevel[] confidenceLevels; + @UnsupportedAppUsage public KeyphraseRecognitionExtra(int id, int recognitionModes, int coarseConfidenceLevel, ConfidenceLevel[] confidenceLevels) { this.id = id; @@ -1114,8 +1149,10 @@ public class SoundTrigger { */ public static class KeyphraseRecognitionEvent extends RecognitionEvent implements Parcelable { /** Indicates if the key phrase is present in the buffered audio available for capture */ + @UnsupportedAppUsage public final KeyphraseRecognitionExtra[] keyphraseExtras; + @UnsupportedAppUsage public KeyphraseRecognitionEvent(int status, int soundModelHandle, boolean captureAvailable, int captureSession, int captureDelayMs, int capturePreambleMs, boolean triggerInData, AudioFormat captureFormat, byte[] data, @@ -1236,6 +1273,7 @@ public class SoundTrigger { * @hide */ public static class GenericRecognitionEvent extends RecognitionEvent implements Parcelable { + @UnsupportedAppUsage public GenericRecognitionEvent(int status, int soundModelHandle, boolean captureAvailable, int captureSession, int captureDelayMs, int capturePreambleMs, boolean triggerInData, AudioFormat captureFormat, @@ -1305,6 +1343,7 @@ public class SoundTrigger { /** New sound model data */ public final byte[] data; + @UnsupportedAppUsage SoundModelEvent(int status, int soundModelHandle, byte[] data) { this.status = status; this.soundModelHandle = soundModelHandle; @@ -1405,6 +1444,7 @@ public class SoundTrigger { * * @hide */ + @UnsupportedAppUsage public static native int listModules(ArrayList <ModuleProperties> modules); /** @@ -1418,6 +1458,7 @@ public class SoundTrigger { * * @hide */ + @UnsupportedAppUsage public static SoundTriggerModule attachModule(int moduleId, StatusListener listener, Handler handler) { diff --git a/core/java/android/hardware/soundtrigger/SoundTriggerModule.java b/core/java/android/hardware/soundtrigger/SoundTriggerModule.java index e23a2bb4a214..838765b67dff 100644 --- a/core/java/android/hardware/soundtrigger/SoundTriggerModule.java +++ b/core/java/android/hardware/soundtrigger/SoundTriggerModule.java @@ -16,6 +16,7 @@ package android.hardware.soundtrigger; +import android.annotation.UnsupportedAppUsage; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -28,8 +29,10 @@ import java.lang.ref.WeakReference; * @hide */ public class SoundTriggerModule { + @UnsupportedAppUsage private long mNativeContext; + @UnsupportedAppUsage private int mId; private NativeEventHandlerDelegate mEventHandlerDelegate; @@ -56,6 +59,7 @@ public class SoundTriggerModule { * Detach from this module. The {@link SoundTrigger.StatusListener} callback will not be called * anymore and associated resources will be released. * */ + @UnsupportedAppUsage public native void detach(); /** @@ -73,6 +77,7 @@ public class SoundTriggerModule { * service fails * - {@link SoundTrigger#STATUS_INVALID_OPERATION} if the call is out of sequence */ + @UnsupportedAppUsage public native int loadSoundModel(SoundTrigger.SoundModel model, int[] soundModelHandle); /** @@ -87,6 +92,7 @@ public class SoundTriggerModule { * - {@link SoundTrigger#STATUS_DEAD_OBJECT} if the binder transaction to the native * service fails */ + @UnsupportedAppUsage public native int unloadSoundModel(int soundModelHandle); /** @@ -106,6 +112,7 @@ public class SoundTriggerModule { * service fails * - {@link SoundTrigger#STATUS_INVALID_OPERATION} if the call is out of sequence */ + @UnsupportedAppUsage public native int startRecognition(int soundModelHandle, SoundTrigger.RecognitionConfig config); /** @@ -121,6 +128,7 @@ public class SoundTriggerModule { * service fails * - {@link SoundTrigger#STATUS_INVALID_OPERATION} if the call is out of sequence */ + @UnsupportedAppUsage public native int stopRecognition(int soundModelHandle); private class NativeEventHandlerDelegate { @@ -181,6 +189,7 @@ public class SoundTriggerModule { } @SuppressWarnings("unused") + @UnsupportedAppUsage private static void postEventFromNative(Object module_ref, int what, int arg1, int arg2, Object obj) { SoundTriggerModule module = (SoundTriggerModule)((WeakReference)module_ref).get(); diff --git a/core/java/android/hardware/usb/UsbDevice.java b/core/java/android/hardware/usb/UsbDevice.java index 1e983016aef2..26c5a9597571 100644 --- a/core/java/android/hardware/usb/UsbDevice.java +++ b/core/java/android/hardware/usb/UsbDevice.java @@ -18,6 +18,7 @@ package android.hardware.usb; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; import com.android.internal.util.Preconditions; @@ -60,6 +61,7 @@ public class UsbDevice implements Parcelable { private @Nullable Parcelable[] mConfigurations; /** All interfaces on the device. Initialized on first call to getInterfaceList */ + @UnsupportedAppUsage private @Nullable UsbInterface[] mInterfaces; /** diff --git a/core/java/android/hardware/usb/UsbDeviceConnection.java b/core/java/android/hardware/usb/UsbDeviceConnection.java index 9e5174ad93a8..71297c187e5c 100644 --- a/core/java/android/hardware/usb/UsbDeviceConnection.java +++ b/core/java/android/hardware/usb/UsbDeviceConnection.java @@ -20,6 +20,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SuppressLint; import android.annotation.SystemApi; +import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.os.Build; import android.os.ParcelFileDescriptor; @@ -46,6 +47,7 @@ public class UsbDeviceConnection { private Context mContext; // used by the JNI code + @UnsupportedAppUsage private long mNativeContext; private final CloseGuard mCloseGuard = CloseGuard.get(); diff --git a/core/java/android/hardware/usb/UsbManager.java b/core/java/android/hardware/usb/UsbManager.java index 46142e35038d..3141be4e9e97 100644 --- a/core/java/android/hardware/usb/UsbManager.java +++ b/core/java/android/hardware/usb/UsbManager.java @@ -25,6 +25,7 @@ import android.annotation.SdkConstant; import android.annotation.SdkConstant.SdkConstantType; import android.annotation.SystemApi; import android.annotation.SystemService; +import android.annotation.UnsupportedAppUsage; import android.app.PendingIntent; import android.content.ComponentName; import android.content.Context; @@ -87,6 +88,7 @@ public class UsbManager { * * {@hide} */ + @UnsupportedAppUsage public static final String ACTION_USB_STATE = "android.hardware.usb.action.USB_STATE"; @@ -163,6 +165,7 @@ public class UsbManager { * * {@hide} */ + @UnsupportedAppUsage public static final String USB_CONNECTED = "connected"; /** @@ -189,6 +192,7 @@ public class UsbManager { * * {@hide} */ + @UnsupportedAppUsage public static final String USB_DATA_UNLOCKED = "unlocked"; /** @@ -197,6 +201,7 @@ public class UsbManager { * * {@hide} */ + @UnsupportedAppUsage public static final String USB_FUNCTION_NONE = "none"; /** @@ -363,6 +368,7 @@ public class UsbManager { /** * {@hide} */ + @UnsupportedAppUsage public UsbManager(Context context, IUsbManager service) { mContext = context; mService = service; @@ -645,6 +651,7 @@ public class UsbManager { * {@hide} */ @Deprecated + @UnsupportedAppUsage public boolean isFunctionEnabled(String function) { try { return mService.isFunctionEnabled(function); @@ -693,6 +700,7 @@ public class UsbManager { * {@hide} */ @Deprecated + @UnsupportedAppUsage public void setCurrentFunction(String functions, boolean usbDataUnlocked) { try { mService.setCurrentFunction(functions, usbDataUnlocked); @@ -774,6 +782,7 @@ public class UsbManager { * * @hide */ + @UnsupportedAppUsage public UsbPort[] getPorts() { if (mService == null) { return null; @@ -793,6 +802,7 @@ public class UsbManager { * * @hide */ + @UnsupportedAppUsage public UsbPortStatus getPortStatus(UsbPort port) { Preconditions.checkNotNull(port, "port must not be null"); @@ -822,6 +832,7 @@ public class UsbManager { * * @hide */ + @UnsupportedAppUsage public void setPortRoles(UsbPort port, int powerRole, int dataRole) { Preconditions.checkNotNull(port, "port must not be null"); UsbPort.checkRoles(powerRole, dataRole); diff --git a/core/java/android/hardware/usb/UsbPortStatus.java b/core/java/android/hardware/usb/UsbPortStatus.java index 5c0e81ad0b27..2cd8209fccda 100644 --- a/core/java/android/hardware/usb/UsbPortStatus.java +++ b/core/java/android/hardware/usb/UsbPortStatus.java @@ -16,6 +16,7 @@ package android.hardware.usb; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -47,6 +48,7 @@ public final class UsbPortStatus implements Parcelable { * * @return True if there is anything connected to the port. */ + @UnsupportedAppUsage public boolean isConnected() { return mCurrentMode != 0; } @@ -57,6 +59,7 @@ public final class UsbPortStatus implements Parcelable { * @return The current mode: {@link UsbPort#MODE_DFP}, {@link UsbPort#MODE_UFP}, * or 0 if nothing is connected. */ + @UnsupportedAppUsage public int getCurrentMode() { return mCurrentMode; } @@ -67,6 +70,7 @@ public final class UsbPortStatus implements Parcelable { * @return The current power role: {@link UsbPort#POWER_ROLE_SOURCE}, * {@link UsbPort#POWER_ROLE_SINK}, or 0 if nothing is connected. */ + @UnsupportedAppUsage public int getCurrentPowerRole() { return mCurrentPowerRole; } @@ -77,6 +81,7 @@ public final class UsbPortStatus implements Parcelable { * @return The current data role: {@link UsbPort#DATA_ROLE_HOST}, * {@link UsbPort#DATA_ROLE_DEVICE}, or 0 if nothing is connected. */ + @UnsupportedAppUsage public int getCurrentDataRole() { return mCurrentDataRole; } @@ -90,12 +95,14 @@ public final class UsbPortStatus implements Parcelable { * @param dataRole The data role to check: either {@link UsbPort#DATA_ROLE_HOST} * or {@link UsbPort#DATA_ROLE_DEVICE}, or 0 if no data role. */ + @UnsupportedAppUsage public boolean isRoleCombinationSupported(int powerRole, int dataRole) { return (mSupportedRoleCombinations & UsbPort.combineRolesAsBit(powerRole, dataRole)) != 0; } /** @hide */ + @UnsupportedAppUsage public int getSupportedRoleCombinations() { return mSupportedRoleCombinations; } diff --git a/core/java/android/hardware/usb/UsbRequest.java b/core/java/android/hardware/usb/UsbRequest.java index f59c87eecfcb..7abf3e9bcc7a 100644 --- a/core/java/android/hardware/usb/UsbRequest.java +++ b/core/java/android/hardware/usb/UsbRequest.java @@ -17,6 +17,7 @@ package android.hardware.usb; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.os.Build; import android.util.Log; @@ -47,14 +48,17 @@ public class UsbRequest { static final int MAX_USBFS_BUFFER_SIZE = 16384; // used by the JNI code + @UnsupportedAppUsage private long mNativeContext; private UsbEndpoint mEndpoint; /** The buffer that is currently being read / written */ + @UnsupportedAppUsage private ByteBuffer mBuffer; /** The amount of data to read / write when using {@link #queue} */ + @UnsupportedAppUsage private int mLength; // for client use |