summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-02-21Merge "Drop platform_apis from java_library" into main am: 3e9a9b8821temp_319669529Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/2970953 Change-Id: I71660822fc89b0eb33c08b4fcf806c424001eeae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21Merge "Drop platform_apis from java_library" into mainTreehugger Robot
2024-02-21Drop platform_apis from java_librarySpandan Das
This property is a no-op for this module type. Test: m nothing Bug: 215379393 Change-Id: I780457347f37d95f7538fe202d445ab0d5825c10
2024-01-17Merge Android 24Q1 Release (ab/11220357)Xin Li
Bug: 319669529 Merged-In: I2344b5ea86873ce4224761326546c72e3ead2c00 Change-Id: Iecf7498566a540562bc5d321a8a2c364bd5a2a2a
2023-12-12Merge "Camera: Add Eyes free videography advanced extender stub" into mainTreehugger Robot
2023-12-08Camera: Add Eyes free videography advanced extender stubEmilian Peev
Bug: 297083874 Test: Successful build Change-Id: I2344b5ea86873ce4224761326546c72e3ead2c00
2023-12-04Camera: Add eyes free videography reference implementationRavneet Dhanjal
Test: Camera CTS test Bug: 302583653 Change-Id: I13e1ef49723941ac462c64aef495a934642188f1
2023-10-07[automerger skipped] Merge "Merge Android 14" into main am: c0270ea348 -s ↵Xin Li
ours am: 76a44ca2a2 -s ours am: 24f06dbfe1 -s ours am: 937cd87efc -s ours am: b8fa819b96 -s ours am skip reason: Merged-In I6a736218a5df4d82338c86e6c43c39566ab38481 with SHA-1 80c5eaad25 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/2777049 Change-Id: I7d451b172780ce0c0f34c7871425ae8b8517cd31 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07[automerger skipped] Merge Android 14 am: d9c12bb107 -s ours am: 6639974ed7 ↵Xin Li
-s ours am: 33d93be089 -s ours am: 945200c996 -s ours am: 61a06660a5 -s ours am skip reason: Merged-In I6a736218a5df4d82338c86e6c43c39566ab38481 with SHA-1 80c5eaad25 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/2777049 Change-Id: Icec4b58e4aa9581852eb21273fbf22548b840990 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: c0270ea348 -s ↵Xin Li
ours am: 76a44ca2a2 -s ours am: 24f06dbfe1 -s ours am: 937cd87efc -s ours am skip reason: Merged-In I6a736218a5df4d82338c86e6c43c39566ab38481 with SHA-1 80c5eaad25 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/2777049 Change-Id: I1a5f4553bdf5d7d5205e45ad176c5c16a07b0d23 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: d9c12bb107 -s ours am: 6639974ed7 ↵Xin Li
-s ours am: 33d93be089 -s ours am: 945200c996 -s ours am skip reason: Merged-In I6a736218a5df4d82338c86e6c43c39566ab38481 with SHA-1 80c5eaad25 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/2777049 Change-Id: I7fe6730d16c108484d9fea673a2667ce20f5fcad Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: c0270ea348 -s ↵Xin Li
ours am: 76a44ca2a2 -s ours am: 24f06dbfe1 -s ours am skip reason: Merged-In I6a736218a5df4d82338c86e6c43c39566ab38481 with SHA-1 80c5eaad25 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/2777049 Change-Id: I39f4da39b4f2ede823f7109511ecc1e169ab95b8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: d9c12bb107 -s ours am: 6639974ed7 ↵Xin Li
-s ours am: 33d93be089 -s ours am skip reason: Merged-In I6a736218a5df4d82338c86e6c43c39566ab38481 with SHA-1 80c5eaad25 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/2777049 Change-Id: I31f0e6f7f7415b27f7578cde28162de580504dbc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: c0270ea348 -s ↵Xin Li
ours am: 76a44ca2a2 -s ours am skip reason: Merged-In I6a736218a5df4d82338c86e6c43c39566ab38481 with SHA-1 80c5eaad25 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/2777049 Change-Id: I0c6f3781b2b998f3e79846d2e78589f3dcf53c32 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: d9c12bb107 -s ours am: 6639974ed7 ↵Xin Li
-s ours am skip reason: Merged-In I6a736218a5df4d82338c86e6c43c39566ab38481 with SHA-1 80c5eaad25 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/2777049 Change-Id: I9c62fc35ac542da43f1628cdeef47c9c69c5fa93 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: c0270ea348 -s oursXin Li
am skip reason: Merged-In I6a736218a5df4d82338c86e6c43c39566ab38481 with SHA-1 80c5eaad25 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/2777049 Change-Id: Ia6469277ececc2e18832706b9954a46b5def1592 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: d9c12bb107 -s oursXin Li
am skip reason: Merged-In I6a736218a5df4d82338c86e6c43c39566ab38481 with SHA-1 80c5eaad25 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/2777049 Change-Id: I90c164fd4cb0d9637c3116f04ffa54a5464dc32b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06Merge "Merge Android 14" into mainXin Li
2023-10-05Merge Android 14Xin Li
Bug: 298295554 Merged-In: I6a736218a5df4d82338c86e6c43c39566ab38481 Change-Id: I97e0a3777f809319928615de1a6b2a399216a230
2023-09-21Merge "Fixed the black preview on the apps that uses older version of ↵Treehugger Robot
camerax that didn't invoke InitializerImpl.init()" into main am: 65def30764 am: eb310f03b3 am: e1137fb333 am: 180d16ee99 am: ebc5bb1a9d Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/2755806 Change-Id: Id64cc0aeca043840d5e7d48b4ef7ad85017b5a56 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21Merge "Fixed the black preview on the apps that uses older version of ↵Treehugger Robot
camerax that didn't invoke InitializerImpl.init()" into main am: 65def30764 am: eb310f03b3 am: e1137fb333 am: 180d16ee99 Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/2755806 Change-Id: I27ebcb7f39417d28fd352140e992b27b185be7b7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21Merge "Fixed the black preview on the apps that uses older version of ↵Treehugger Robot
camerax that didn't invoke InitializerImpl.init()" into main am: 65def30764 am: eb310f03b3 am: e1137fb333 Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/2755806 Change-Id: I241300036042789672d3db87e45bd6b902238af6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21Merge "Fixed the black preview on the apps that uses older version of ↵Treehugger Robot
camerax that didn't invoke InitializerImpl.init()" into main am: 65def30764 am: eb310f03b3 Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/2755806 Change-Id: I9887e7d34ea498bd0228264ee40cc806ee2ab9f6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21Merge "Fixed the black preview on the apps that uses older version of ↵tmp_amf_298295554Treehugger Robot
camerax that didn't invoke InitializerImpl.init()" into main am: 65def30764 Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/2755806 Change-Id: Idd72df86f2e484ac7cce0329504ab2c0d04bdb60 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21Merge "Fixed the black preview on the apps that uses older version of ↵Treehugger Robot
camerax that didn't invoke InitializerImpl.init()" into main
2023-09-20Fixed the black preview on the apps that uses older version of camerax thatScott Nien
didn't invoke InitializerImpl.init() Some app uses older version of CameraX that didn't invoke InitializerImpl.init() which causes the ServiceManager unable to initialize properly and cause the black preview. This CL fixed the issues and will makes isExtensionAvailable returns false on these apps. Bug: 301204044 Test: manual test Change-Id: I6a736218a5df4d82338c86e6c43c39566ab38481
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 824677fd59 -s ours ↵Xin Li
am: c99ab4977e -s ours am: a8e08ed68c -s ours am: 075eed63ae -s ours am skip reason: Merged-In I7dac45bdf2c5c00004f39a274f981c2c242c26a2 with SHA-1 036ec921b1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ex/+/24181573 Change-Id: I245c1ad67fb49c3cb3729a8527d54b64019dcd80 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 824677fd59 -s ours ↵Xin Li
am: c99ab4977e -s ours am: a8e08ed68c -s ours am skip reason: Merged-In I7dac45bdf2c5c00004f39a274f981c2c242c26a2 with SHA-1 036ec921b1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ex/+/24181573 Change-Id: Icf930676d6419c1613c04b2e832f28c0c71da55e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 824677fd59 -s ours ↵Xin Li
am: c99ab4977e -s ours am skip reason: Merged-In I7dac45bdf2c5c00004f39a274f981c2c242c26a2 with SHA-1 036ec921b1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ex/+/24181573 Change-Id: I701881f8ba7fa9d06c1352cff85956285ff6020e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28[automerger skipped] Merge Android U (ab/10368041) am: 824677fd59 -s oursXin Li
am skip reason: Merged-In I7dac45bdf2c5c00004f39a274f981c2c242c26a2 with SHA-1 036ec921b1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ex/+/24181573 Change-Id: I485817575912a24f2276ccf48ef86fed3f646903 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14Merge Android U (ab/10368041)Xin Li
Bug: 291102124 Merged-In: I7dac45bdf2c5c00004f39a274f981c2c242c26a2 Change-Id: I582fccbfdd95520e0be118afda1a1436bce6d8e0
2023-07-20Merge "Temporary Revert "Use java Jpeg encoding instead of native codes / ↵Treehugger Robot
fix some issues."" into main am: 0d0c673143 am: ed86b83884 am: 8b386aed9f am: 2256698b42 am: 640b41a78a Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/2665789 Change-Id: Id3be1cdfe29aaedb7256bffb85b31cf2bc186c0c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20Merge "Temporary Revert "Use java Jpeg encoding instead of native codes / ↵Treehugger Robot
fix some issues."" into main am: 0d0c673143 am: ed86b83884 am: 8b386aed9f am: 2256698b42 Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/2665789 Change-Id: I180d2e039907d0c0602a346bcdf195252084bb7d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20Merge "Temporary Revert "Use java Jpeg encoding instead of native codes / ↵Treehugger Robot
fix some issues."" into main am: 0d0c673143 am: ed86b83884 am: 8b386aed9f Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/2665789 Change-Id: I2a950eb2fac02f14137bfa8dc7496f548b55be25 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20Merge "Temporary Revert "Use java Jpeg encoding instead of native codes / ↵Treehugger Robot
fix some issues."" into main am: 0d0c673143 am: ed86b83884 Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/2665789 Change-Id: Id10586a7bf1d750c08bf2999f9ec3970d6e068c4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20Merge "Temporary Revert "Use java Jpeg encoding instead of native codes / ↵Treehugger Robot
fix some issues."" into main am: 0d0c673143 Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/2665789 Change-Id: Ia0e44fa40d2e08bcf58e643bce55048224195989 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20Merge "Temporary Revert "Use java Jpeg encoding instead of native codes / ↵Treehugger Robot
fix some issues."" into main
2023-07-19Temporary Revert "Use java Jpeg encoding instead of native codes / fix some ↵Emilian Peev
issues." This reverts commit f0fdaa93e7de2b5cd036e5e9b32393d2a916b51f. Reason for revert: b/291903786 Change-Id: I0fc029cd0cbf8ebd9e5dae059966c471e3341b64
2023-07-19Merge "Use java Jpeg encoding instead of native codes / fix some issues." ↵Treehugger Robot
into main am: a0df61244f am: 112a2cec91 am: 0ca00b82c1 am: 9d5ec75a29 am: bb15cb5f9c Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/2462898 Change-Id: Id812a5c2786849bdf919e8fe034805cc329d675f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19Merge "Use java Jpeg encoding instead of native codes / fix some issues." ↵Treehugger Robot
into main am: a0df61244f am: 112a2cec91 am: 0ca00b82c1 am: 9d5ec75a29 Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/2462898 Change-Id: Idbf2cfcf5e55799d5c7085eb22fbab3a8ae8be27 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19Merge "Use java Jpeg encoding instead of native codes / fix some issues." ↵Treehugger Robot
into main am: a0df61244f am: 112a2cec91 am: 0ca00b82c1 Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/2462898 Change-Id: I81cc7348e93818c74431141563e6e3a2bee245e0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19Merge "Use java Jpeg encoding instead of native codes / fix some issues." ↵Treehugger Robot
into main am: a0df61244f am: 112a2cec91 Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/2462898 Change-Id: I042a6bf4f9505a7349b0133b3db4bf0d8b65b5e2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19Merge "Use java Jpeg encoding instead of native codes / fix some issues." ↵Treehugger Robot
into main am: a0df61244f Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/2462898 Change-Id: Ib4f698a29b6af6e412b2531efd9b8cc76fb0bdab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19Merge "Use java Jpeg encoding instead of native codes / fix some issues." ↵Treehugger Robot
into main
2023-06-28Use java Jpeg encoding instead of native codes / fix some issues.Scott Nien
1. Use java JPEG encoding codes instead of native codes as native codes doesn't work under CameraX Extensions because apps aren't allowed to use shared native codes directly. 2. Setting the AWB_MODE in capture request parameters instead of session parameters to ensure the effect is enabled. Bug: 270241126 Test: Manual test. Change-Id: I83d81b5484e48025d56640c0ff5243f125b8b312
2023-06-09CameraExtensions: Align 'onNextImageAvailable' doc with implementation am: ↵Emilian Peev
78c9bf65d8 am: 1e13c93f03 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ex/+/23354562 Change-Id: I4a9c45bb4e95b69d0109c0b12fd0cbc0c02bc8f5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22CameraExtensions: Align 'onNextImageAvailable' doc with implementation am: ↵Emilian Peev
78c9bf65d8 am: 46f4458b5b am: f4ce27c2eb am: e1d7469a9e Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ex/+/23354562 Change-Id: Id98b48139de95a5bbc086496cee8eebe4799b565 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22CameraExtensions: Align 'onNextImageAvailable' doc with implementation am: ↵Emilian Peev
78c9bf65d8 am: 036ec921b1 am: 6e34c9f924 am: 6c4f6f3b10 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ex/+/23354562 Change-Id: I941f6ffb85b68cc03ce5bee98a0c68dcd88c0021 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22CameraExtensions: Align 'onNextImageAvailable' doc with implementation am: ↵Emilian Peev
78c9bf65d8 am: 46f4458b5b am: 85625f93bf am: aa299bdd5a Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ex/+/23354562 Change-Id: I8a7b8b7b792b037b785569a53abfb88204b972f5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22CameraExtensions: Align 'onNextImageAvailable' doc with implementation am: ↵Emilian Peev
78c9bf65d8 am: 46f4458b5b am: f4ce27c2eb Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ex/+/23354562 Change-Id: I467955881d5f0af9e575f070977d4c3e8bb3a877 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 05:59:39 +0000