Jayant Chowdhary
5216b21181
cameraserver: Add support for system only cameras
...
Bug: 133508924
Bug: 138135733
android.permission.CAMERA and android.permission.SYSTEM_CAMERA are both
required by a client process to access system only cameras.
Test: Advertise the back camera as system only;
1) don't give Camera2 SYSTEM_CAMERA permissions,
Camera2 can't connect to the back camera
2) give Camera2 SYSTEM_CAMERA permissions, Camera2 successfully
connects.
3) 3P app can't connect to any camera if all cameras are
advertised as SYSTEM_ONLY_CAMERAs.
Test: CTS CameraDeviceTest, CameraManagerTest
Change-Id: I0309462f962d9c8c92564ef6781b2aae1485a933
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
5 years ago
Xin Li
676a5419d7
[automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master" into stage-aosp-master am: d528d7e695
-s ours am: 946ea70adb
am: 58887211df
...
am: ab6a1df767
-s ours
am skip reason: subject contains skip directive
Change-Id: Ifc5e9d31c34cc120f610a367ef3dceb7622cc760
5 years ago
Dongwon Kang
b54ea33ee5
Merge "Move implementations to DataSourceBase.h"
5 years ago
Xin Li
ab6a1df767
[automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master" into stage-aosp-master am: d528d7e695
-s ours am: 946ea70adb
...
am: 58887211df
Change-Id: I266b86cb277ad79a7bfdfbaa41f908cedc4fce76
5 years ago
Xin Li
58887211df
[automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master" into stage-aosp-master am: d528d7e695
-s ours
...
am: 946ea70adb
Change-Id: I6e115dc35b9bd5e5595307dd396769b9b4822fab
5 years ago
Xin Li
946ea70adb
[automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master" into stage-aosp-master
...
am: d528d7e695
-s ours
am skip reason: subject contains skip directive
Change-Id: I62f2194c6eb223eae5dba4e89c4cd5650a631229
5 years ago
Chong Zhang
01ad43e602
Merge "Heif decoder API for decoding image sequences"
5 years ago
TreeHugger Robot
d528d7e695
Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master" into stage-aosp-master
5 years ago
TreeHugger Robot
a1994d6e22
Merge "Actually use the hdr mapper for AV1 in GetHdrProfileLevelMapper"
5 years ago
Jayant Chowdhary
d938b861e6
Merge "camera2 ndk: Allow nullptr for ACameraCaptureSession_captureCallbacks.onClosed."
5 years ago
Dongwon Kang
45bee32c4c
Move implementations to DataSourceBase.h
...
Some lib*extractors include DataSourceBase.h but are not
linking libstagefright which has the implementation.
This doesn't cause any build issue in normal build, but
it actually matters when NATIVE_COVERAGE=true which uses -O0.
Fixing by moving the implementation to the header.
Bug: 139459652
Test: m
Test: NATIVE_COVERAGE=true COVERAGE_PATHS="*" m
Change-Id: Ic955189ff9f0fbc48b5b35eccdb2916dc79fdb0f
5 years ago
Chong Zhang
0702d1f6b6
Actually use the hdr mapper for AV1 in GetHdrProfileLevelMapper
...
It's defined but not returned by GetHdrProfileLevelMapper, so
soft AV1 doesn't report HDR support.
bug: 138314480
test:
atest android.media.cts.DecoderTest#testAV1HdrStaticMetadata
atest android.media.cts.MediaMetadataRetrieverTest#testThumbnailAV1Hdr
Test should pass, AND test shouldn't be skipped.
For MediaMetadataRetrieverTest#testThumbnailAV1Hdr, enable output
file dump and there should be output file dumped.
Change-Id: I8c571729bb68d091208d5348734efd29887b5f72
5 years ago
Xin Li
3760f01295
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" am: 04d0073dc7
-s ours am: 4e6aa1d5bc
-s ours am: 620b7d3ac1
am: 52b4b9bf26
...
am: ce5890fd31
-s ours
am skip reason: subject contains skip directive
Change-Id: Ic6a244eab9da72518529ab93cb5c328dabee6db9
5 years ago
Xin Li
ce5890fd31
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" am: 04d0073dc7
-s ours am: 4e6aa1d5bc
-s ours am: 620b7d3ac1
...
am: 52b4b9bf26
Change-Id: Ie033a827558bab1e1a4feb368d7322c4f3089569
5 years ago
Xin Li
bceeb0d8d6
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master am: cacc308548
-s ours am: cc2a307ffa
-s ours am: b22051c9db
am: 7bed5f6bcc
...
am: 84683b0911
-s ours
am skip reason: subject contains skip directive
Change-Id: Iaae0ed550fd87d1a2aec0c29f5212edeb851fb7b
5 years ago
Xin Li
52b4b9bf26
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" am: 04d0073dc7
-s ours am: 4e6aa1d5bc
-s ours
...
am: 620b7d3ac1
Change-Id: I6349bc774b6ead2237a6c6d84f2cfa503932d1f4
5 years ago
Xin Li
84683b0911
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master am: cacc308548
-s ours am: cc2a307ffa
-s ours am: b22051c9db
...
am: 7bed5f6bcc
Change-Id: I0dfc6241ee1f7f72d30272e41b365e18fdfd54d5
5 years ago
Xin Li
7bed5f6bcc
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master am: cacc308548
-s ours am: cc2a307ffa
-s ours
...
am: b22051c9db
Change-Id: Ib8d7b2b5e0997368a3b20b96c7f305cd20e23354
5 years ago
Xin Li
620b7d3ac1
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" am: 04d0073dc7
-s ours
...
am: 4e6aa1d5bc
-s ours
am skip reason: subject contains skip directive
Change-Id: Ia967e6594324234a94c23706cd3542d3b0e1749a
5 years ago
Xin Li
4e6aa1d5bc
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master"
...
am: 04d0073dc7
-s ours
am skip reason: subject contains skip directive
Change-Id: I4097a3bb0f4eb48628b7b7c66cb6ee5c752f1161
5 years ago
Xin Li
b22051c9db
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master am: cacc308548
-s ours
...
am: cc2a307ffa
-s ours
am skip reason: subject contains skip directive
Change-Id: I9db6f462a61027784ef0e2e8ca6f80159db3b1ee
5 years ago
Xin Li
cc2a307ffa
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master
...
am: cacc308548
-s ours
am skip reason: subject contains skip directive
Change-Id: I54813f1184f42f9f45fd6d682d8ab9141e228fb8
5 years ago
Treehugger Robot
04d0073dc7
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master"
5 years ago
Jayant Chowdhary
9da975d887
camera2 ndk: Allow nullptr for ACameraCaptureSession_captureCallbacks.onClosed.
...
Bug: 134680093
Test: AImageReaderVendorTest
Change-Id: I8d365b434c257e949496d9495d0fa31a18a2e068
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
5 years ago
Xin Li
e41a230b56
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master
...
Bug: 134405016
Change-Id: I7e928492f14d661df6754935e21dc3e2226b2770
5 years ago
Mikhail Naganov
c6c78b6cb2
Merge "Move ExtendedAudioBufferProvider and SingleStateQueue" am: 2a70a39f4c
am: 72d2412c27
am: 1cae73f318
am: 5fdaa0f7d2
...
am: 7075dc6a21
Change-Id: I2b775d9274b8d0e0e5419c5e945a67a089bb8149
5 years ago
Mikhail Naganov
7075dc6a21
Merge "Move ExtendedAudioBufferProvider and SingleStateQueue" am: 2a70a39f4c
am: 72d2412c27
am: 1cae73f318
...
am: 5fdaa0f7d2
Change-Id: I9d5daa6051e7d047c5fe403988be2174a999a79b
5 years ago
Mikhail Naganov
5fdaa0f7d2
Merge "Move ExtendedAudioBufferProvider and SingleStateQueue" am: 2a70a39f4c
am: 72d2412c27
...
am: 1cae73f318
Change-Id: I1f52a4f44cd551b9d288e65acd240387c4de6faa
5 years ago
Mikhail Naganov
1cae73f318
Merge "Move ExtendedAudioBufferProvider and SingleStateQueue" am: 2a70a39f4c
...
am: 72d2412c27
Change-Id: I8696f9ceaec259b1776cdab48fb1d5eb28d13ce9
5 years ago
Mikhail Naganov
72d2412c27
Merge "Move ExtendedAudioBufferProvider and SingleStateQueue"
...
am: 2a70a39f4c
Change-Id: I993318e2a9a5bba3aa65ee8319d80bebb537df50
5 years ago
Treehugger Robot
2a70a39f4c
Merge "Move ExtendedAudioBufferProvider and SingleStateQueue"
5 years ago
Gopalakrishnan Nallasamy
4e00f928ae
Merge "Merge "MediaMuxer:SetCaptureRate for GCA SlowMotionRecord" into qt-r1-dev am: 9c6f37fa98
am: 3df55f34e9" into qt-qpr1-dev-plus-aosp
...
am: 7cd4830def
Change-Id: I5d2c1e8530c567839f16ef9369bbcca2aa6663b6
5 years ago
Gopalakrishnan Nallasamy
696d601a1a
Merge "MediaMuxer:SetCaptureRate for GCA SlowMotionRecord" into qt-r1-dev am: 9c6f37fa98
am: 5f55524296
...
am: 674d67adf5
Change-Id: I456d205df86c9833d8685ca0b5d741068ed75e54
5 years ago
Android Build Merger (Role)
7cd4830def
Merge "Merge "MediaMuxer:SetCaptureRate for GCA SlowMotionRecord" into qt-r1-dev am: 9c6f37fa98
am: 3df55f34e9" into qt-qpr1-dev-plus-aosp
5 years ago
Gopalakrishnan Nallasamy
1fb6c4326b
Merge "MediaMuxer:SetCaptureRate for GCA SlowMotionRecord" into qt-r1-dev am: 9c6f37fa98
...
am: 3df55f34e9
Change-Id: I56f25b10686aa80c68f3b1b23571f99a1e5607fa
5 years ago
Gopalakrishnan Nallasamy
674d67adf5
Merge "MediaMuxer:SetCaptureRate for GCA SlowMotionRecord" into qt-r1-dev am: 9c6f37fa98
...
am: 5f55524296
Change-Id: Ia3f0e46ef7ac59824a63405875fd9601f8dff7eb
5 years ago
Gopalakrishnan Nallasamy
5f55524296
Merge "MediaMuxer:SetCaptureRate for GCA SlowMotionRecord" into qt-r1-dev
...
am: 9c6f37fa98
Change-Id: Iff65726f4a2df4a3ba9daac9be641c64c74d129a
5 years ago
Gopalakrishnan Nallasamy
3df55f34e9
Merge "MediaMuxer:SetCaptureRate for GCA SlowMotionRecord" into qt-r1-dev
...
am: 9c6f37fa98
Change-Id: I518e0e11d79f66ed1fb0c4f5f1f6ed6bfab5d10c
5 years ago
Sundong Ahn
2485027eba
Merge "[automerger skipped] Merge "Check the media.settings.xml property" into qt-dev am: b9df2ec036
am: 16dadd0ae7
-s ours am: 8650f62990
-s ours
...
am: df4362befb
-s ours
am skip reason: change_id Ib7070cca94b9d637b9a1a175d09baf7b78ec0fd9 with SHA1 ef8695ed84
is in history
Change-Id: I65c0849280fae0c1c16b4b773889d82088deef60
5 years ago
Sundong Ahn
dcd67ccea5
Merge "[automerger skipped] Merge "Check the media.settings.xml property" into qt-dev am: b9df2ec036
-s ours am: f59ccec271
-s ours am: 8c0efea6b7
-s ours
...
am: 0075536e8e
-s ours
am skip reason: change_id Ib7070cca94b9d637b9a1a175d09baf7b78ec0fd9 with SHA1 ef8695ed84
is in history
Change-Id: I9362f6916462d3aef7908b4113c3ebba2a68c42f
5 years ago
Sundong Ahn
45815f9f1c
[automerger skipped] Merge "Check the media.settings.xml property" into qt-dev am: b9df2ec036
am: 16dadd0ae7
am: d2cd6284a2
-s ours
...
am: 5083f6e3cc
-s ours
am skip reason: change_id Ib7070cca94b9d637b9a1a175d09baf7b78ec0fd9 with SHA1 ef8695ed84
is in history
Change-Id: I9360f9a325d332d1d60d79d6bb8d4dcc410e4fdc
5 years ago
Gopalakrishnan Nallasamy
9c6f37fa98
Merge "MediaMuxer:SetCaptureRate for GCA SlowMotionRecord" into qt-r1-dev
5 years ago
Sundong Ahn
df4362befb
Merge "[automerger skipped] Merge "Check the media.settings.xml property" into qt-dev am: b9df2ec036
am: 16dadd0ae7
-s ours
...
am: 8650f62990
-s ours
am skip reason: change_id Ib7070cca94b9d637b9a1a175d09baf7b78ec0fd9 with SHA1 ef8695ed84
is in history
Change-Id: Ib4a444e4f8523ab5ca1db25d76f2d6fabfe028ce
5 years ago
Android Build Merger (Role)
0075536e8e
Merge "[automerger skipped] Merge "Check the media.settings.xml property" into qt-dev am: b9df2ec036
-s ours am: f59ccec271
-s ours am: 8c0efea6b7
-s ours am skip reason: change_id Ib7070cca94b9d637b9a1a175d09baf7b78ec0fd9 with SHA1 ef8695ed84
is in history" into qt-qpr1-dev-plus-aosp
5 years ago
Sundong Ahn
83f77a1abc
[automerger skipped] Merge "Check the media.settings.xml property" into qt-dev am: b9df2ec036
-s ours am: f59ccec271
-s ours
...
am: 8c0efea6b7
-s ours
am skip reason: change_id Ib7070cca94b9d637b9a1a175d09baf7b78ec0fd9 with SHA1 ef8695ed84
is in history
Change-Id: Id00bcb0677a197099b7d9340b566ac326128de74
5 years ago
Sundong Ahn
5083f6e3cc
[automerger skipped] Merge "Check the media.settings.xml property" into qt-dev am: b9df2ec036
am: 16dadd0ae7
...
am: d2cd6284a2
-s ours
am skip reason: change_id Ib7070cca94b9d637b9a1a175d09baf7b78ec0fd9 with SHA1 ef8695ed84
is in history
Change-Id: I6859e8445de1b08eb4438059d57a724ae0cf0540
5 years ago
Android Build Merger (Role)
8650f62990
Merge "[automerger skipped] Merge "Check the media.settings.xml property" into qt-dev am: b9df2ec036
am: 16dadd0ae7
-s ours am skip reason: change_id Ib7070cca94b9d637b9a1a175d09baf7b78ec0fd9 with SHA1 ef8695ed84
is in history" into qt-r1-dev-plus-aosp
5 years ago
Sundong Ahn
1255f71bc9
[automerger skipped] Merge "Check the media.settings.xml property" into qt-dev am: b9df2ec036
...
am: 16dadd0ae7
-s ours
am skip reason: change_id Ib7070cca94b9d637b9a1a175d09baf7b78ec0fd9 with SHA1 ef8695ed84
is in history
Change-Id: Ia8469c762be69390cd2bf47da2d41f8ce7e94c06
5 years ago
Sundong Ahn
d2cd6284a2
Merge "Check the media.settings.xml property" into qt-dev am: b9df2ec036
...
am: 16dadd0ae7
Change-Id: I1d6598f7cbc30bdccab547194c3cde628fc7b320
5 years ago
Sundong Ahn
8c0efea6b7
[automerger skipped] Merge "Check the media.settings.xml property" into qt-dev am: b9df2ec036
-s ours
...
am: f59ccec271
-s ours
am skip reason: change_id Ib7070cca94b9d637b9a1a175d09baf7b78ec0fd9 with SHA1 ef8695ed84
is in history
Change-Id: Ibb8076a7e87501b211aca13254efc1aed9ee9cfb
5 years ago