From e58209a65f9ee781aebaffa1136e808ed9004154 Mon Sep 17 00:00:00 2001 From: magekkkk Date: Sat, 26 Mar 2022 09:12:38 +0000 Subject: [PATCH] add missing permission and fix permission format Signed-off-by: magekkkk --- api/@ohos.multimedia.camera.d.ts | 4 ++++ api/@ohos.multimedia.media.d.ts | 4 +++- api/@ohos.multimedia.mediaLibrary.d.ts | 32 +++++++++++++------------- 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/api/@ohos.multimedia.camera.d.ts b/api/@ohos.multimedia.camera.d.ts index 3f5c1c8b57..18c9ad1114 100644 --- a/api/@ohos.multimedia.camera.d.ts +++ b/api/@ohos.multimedia.camera.d.ts @@ -102,6 +102,7 @@ declare namespace camera { * @param callback Callback used to return the CameraInput instance. * @since 9 * @syscap SystemCapability.Multimedia.Camera.Core + * @permission ohos.permission.CAMERA */ createCameraInput(cameraId: string, callback: AsyncCallback): void; @@ -111,6 +112,7 @@ declare namespace camera { * @return Promise used to return the CameraInput instance. * @since 9 * @syscap SystemCapability.Multimedia.Camera.Core + * @permission ohos.permission.CAMERA */ createCameraInput(cameraId: string): Promise; @@ -121,6 +123,7 @@ declare namespace camera { * @param callback Callback used to return the CameraInput instance. * @since 9 * @syscap SystemCapability.Multimedia.Camera.Core + * @permission ohos.permission.CAMERA */ createCameraInput(position: CameraPosition, type: CameraType, callback: AsyncCallback): void; @@ -131,6 +134,7 @@ declare namespace camera { * @return Promise used to return the CameraInput instance. * @since 9 * @syscap SystemCapability.Multimedia.Camera.Core + * @permission ohos.permission.CAMERA */ createCameraInput(position: CameraPosition, type: CameraType): Promise; diff --git a/api/@ohos.multimedia.media.d.ts b/api/@ohos.multimedia.media.d.ts index 8a2e185b7c..b39c129aef 100644 --- a/api/@ohos.multimedia.media.d.ts +++ b/api/@ohos.multimedia.media.d.ts @@ -282,7 +282,7 @@ declare namespace media { * local:fd://XXX, file://XXX. network:http://xxx * @since 6 * @syscap SystemCapability.Multimedia.Media.AudioPlayer - * @permission ohos.permission.READ_MEDIA, ohos.permission.INTERNET + * @permission ohos.permission.READ_MEDIA or ohos.permission.INTERNET */ src: string; @@ -626,6 +626,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @param config Recording parameters. * @param callback A callback instance used to return when prepare completed. + * @permission ohos.permission.MICROPHONE */ prepare(config: VideoRecorderConfig, callback: AsyncCallback): void; /** @@ -634,6 +635,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @param config Recording parameters. * @return A Promise instance used to return when prepare completed. + * @permission ohos.permission.MICROPHONE */ prepare(config: VideoRecorderConfig): Promise; /** diff --git a/api/@ohos.multimedia.mediaLibrary.d.ts b/api/@ohos.multimedia.mediaLibrary.d.ts index 5c9b1822bd..769161ea30 100644 --- a/api/@ohos.multimedia.mediaLibrary.d.ts +++ b/api/@ohos.multimedia.mediaLibrary.d.ts @@ -277,7 +277,7 @@ declare namespace mediaLibrary { * Modify meta data where the file is located. * @since 8 * @syscap SystemCapability.Multimedia.MediaLibrary.Core - * @permission ohos.permission.READ_MEDIA, ohos.permission.WRITE_MEDIA + * @permission ohos.permission.READ_MEDIA and ohos.permission.WRITE_MEDIA * @param callback no value will be returned. */ commitModify(callback: AsyncCallback): void; @@ -285,14 +285,14 @@ declare namespace mediaLibrary { * Modify meta data where the file is located. * @since 8 * @syscap SystemCapability.Multimedia.MediaLibrary.Core - * @permission ohos.permission.READ_MEDIA, ohos.permission.WRITE_MEDIA + * @permission ohos.permission.READ_MEDIA and ohos.permission.WRITE_MEDIA */ commitModify(): Promise; /** * Open the file is located. * @since 8 * @syscap SystemCapability.Multimedia.MediaLibrary.Core - * @permission ohos.permission.READ_MEDIA | ohos.permission.WRITE_MEDIA + * @permission ohos.permission.READ_MEDIA or ohos.permission.WRITE_MEDIA * @param mode mode for open, for example: rw, r, w. * @param callback Callback return the fd of the file. */ @@ -301,7 +301,7 @@ declare namespace mediaLibrary { * Open the file is located. * @since 8 * @syscap SystemCapability.Multimedia.MediaLibrary.Core - * @permission ohos.permission.READ_MEDIA | ohos.permission.WRITE_MEDIA + * @permission ohos.permission.READ_MEDIA or ohos.permission.WRITE_MEDIA * @param mode mode for open, for example: rw, r, w. */ open(mode: string): Promise; @@ -309,7 +309,7 @@ declare namespace mediaLibrary { * Close the file is located. * @since 8 * @syscap SystemCapability.Multimedia.MediaLibrary.Core - * @permission ohos.permission.READ_MEDIA | ohos.permission.WRITE_MEDIA + * @permission ohos.permission.READ_MEDIA or ohos.permission.WRITE_MEDIA * @param fd fd of the file which had been opened * @param callback no value will be returned. */ @@ -318,7 +318,7 @@ declare namespace mediaLibrary { * Close the file is located. * @since 8 * @syscap SystemCapability.Multimedia.MediaLibrary.Core - * @permission ohos.permission.READ_MEDIA | ohos.permission.WRITE_MEDIA + * @permission ohos.permission.READ_MEDIA or ohos.permission.WRITE_MEDIA * @param fd fd of the file which had been opened */ close(fd: number): Promise; @@ -351,7 +351,7 @@ declare namespace mediaLibrary { * Set favorite for the file when the file is located. * @since 8 * @syscap SystemCapability.Multimedia.MediaLibrary.Core - * @permission ohos.permission.READ_MEDIA, ohos.permission.WRITE_MEDIA + * @permission ohos.permission.READ_MEDIA and ohos.permission.WRITE_MEDIA * @param isFavorite ture is favorite file, false is not favorite file * @param callback Callback used to return, No value is returned. */ @@ -360,7 +360,7 @@ declare namespace mediaLibrary { * Set favorite for the file when the file is located. * @since 8 * @syscap SystemCapability.Multimedia.MediaLibrary.Core - * @permission ohos.permission.READ_MEDIA, ohos.permission.WRITE_MEDIA + * @permission ohos.permission.READ_MEDIA and ohos.permission.WRITE_MEDIA * @param isFavorite ture is favorite file, false is not favorite file */ favorite(isFavorite: boolean): Promise; @@ -383,7 +383,7 @@ declare namespace mediaLibrary { * Set trash for the file when the file is located. * @since 8 * @syscap SystemCapability.Multimedia.MediaLibrary.Core - * @permission ohos.permission.READ_MEDIA, ohos.permission.WRITE_MEDIA + * @permission ohos.permission.READ_MEDIA and ohos.permission.WRITE_MEDIA * @param isTrash true is trashed file, false is not trashed file * @param callback Callback used to return, No value is returned. */ @@ -392,7 +392,7 @@ declare namespace mediaLibrary { * Set trash for the file when the file is located. * @since 8 * @syscap SystemCapability.Multimedia.MediaLibrary.Core - * @permission ohos.permission.READ_MEDIA, ohos.permission.WRITE_MEDIA + * @permission ohos.permission.READ_MEDIA and ohos.permission.WRITE_MEDIA * @param isTrash true is trashed file, false is not trashed file */ trash(isTrash: boolean): Promise; @@ -750,7 +750,7 @@ declare namespace mediaLibrary { * Modify the meta data for the album * @since 8 * @syscap SystemCapability.Multimedia.MediaLibrary.Core - * @permission ohos.permission.READ_MEDIA, ohos.permission.WRITE_MEDIA + * @permission ohos.permission.READ_MEDIA and ohos.permission.WRITE_MEDIA * @param callback, no value will be returned. */ commitModify(callback: AsyncCallback): void; @@ -758,7 +758,7 @@ declare namespace mediaLibrary { * Modify the meta data for the album * @since 8 * @syscap SystemCapability.Multimedia.MediaLibrary.Core - * @permission ohos.permission.READ_MEDIA, ohos.permission.WRITE_MEDIA + * @permission ohos.permission.READ_MEDIA and ohos.permission.WRITE_MEDIA */ commitModify(): Promise; /** @@ -896,7 +896,7 @@ declare namespace mediaLibrary { * Create File Asset * @since 8 * @syscap SystemCapability.Multimedia.MediaLibrary.Core - * @permission ohos.permission.READ_MEDIA, ohos.permission.WRITE_MEDIA + * @permission ohos.permission.READ_MEDIA and ohos.permission.WRITE_MEDIA * @param mediaType mediaType for example:IMAGE, VIDEO, AUDIO, FILE * @param displayName file name * @param relativePath relative path @@ -907,7 +907,7 @@ declare namespace mediaLibrary { * Create File Asset * @since 8 * @syscap SystemCapability.Multimedia.MediaLibrary.Core - * @permission ohos.permission.READ_MEDIA, ohos.permission.WRITE_MEDIA + * @permission ohos.permission.READ_MEDIA and ohos.permission.WRITE_MEDIA * @param mediaType mediaType for example:IMAGE, VIDEO, AUDIO, FILE * @param displayName file name * @param relativePath relative path @@ -918,7 +918,7 @@ declare namespace mediaLibrary { * Delete File Asset * @since 8 * @syscap SystemCapability.Multimedia.MediaLibrary.Core - * @permission ohos.permission.READ_MEDIA, ohos.permission.WRITE_MEDIA + * @permission ohos.permission.READ_MEDIA and ohos.permission.WRITE_MEDIA * @param uri FileAsset's URI * @param callback no value returned * @systemapi @@ -928,7 +928,7 @@ declare namespace mediaLibrary { * Delete File Asset * @since 8 * @syscap SystemCapability.Multimedia.MediaLibrary.Core - * @permission ohos.permission.READ_MEDIA, ohos.permission.WRITE_MEDIA + * @permission ohos.permission.READ_MEDIA and ohos.permission.WRITE_MEDIA * @param uri, FileAsset's URI * @return A Promise instance, no value returned * @systemapi -- Gitee