summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-12-15Snap for 11224086 from 2158494c49997954a7f169ded4068101e8da26b2 to ↵aml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz5_341510010Android Build Coastguard Worker
mainline-tzdata5-release Change-Id: Ia82fb567297a250bfa1f7664ec74bad7c64832eb
2023-11-01Camera2: Do not pass location info for startActivity case am: 3c097bb0e5 am: ↵Shuzhen Wang
a73f9d3e0d am: e43bba16fc am: ba5dd7a1af am: f451da03d5 am: c4cd166386 am: d650480470 am: b4193567d9 am: fc44b18b72 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/25135945 Change-Id: I3411a7ece97b305b90c17ebf135d618171bba276 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01Camera2: Do not pass location info for startActivity case am: 3c097bb0e5 am: ↵Shuzhen Wang
a73f9d3e0d am: e43bba16fc am: ba5dd7a1af am: f451da03d5 am: c4cd166386 am: d58eeff54f am: a0abba23df Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/25135945 Change-Id: I83f2de60cfaf2637eac448c5fc67f0378f8bb8ff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01Camera2: Do not pass location info for startActivity case am: 3c097bb0e5 am: ↵Shuzhen Wang
a73f9d3e0d am: e43bba16fc am: ba5dd7a1af am: f451da03d5 am: c4cd166386 am: d650480470 am: b4193567d9 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/25135945 Change-Id: I10c98a86ffdc169a5f7be2ed27de2a6b822fd0f8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01Camera2: Do not pass location info for startActivity case am: 3c097bb0e5 am: ↵Shuzhen Wang
a73f9d3e0d am: e43bba16fc am: ba5dd7a1af am: f451da03d5 am: c4cd166386 am: d58eeff54f Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/25135945 Change-Id: I16c2737b9a6252d3f0d2c40a4dc22f7af4920714 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01Camera2: Do not pass location info for startActivity case am: 3c097bb0e5 am: ↵Shuzhen Wang
a73f9d3e0d am: e43bba16fc am: ba5dd7a1af am: f451da03d5 am: c4cd166386 am: d650480470 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/25135945 Change-Id: Iadd304096ddca0fc8131957d4e595fea4da75a21 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01Camera2: Do not pass location info for startActivity case am: 3c097bb0e5 am: ↵Shuzhen Wang
a73f9d3e0d am: e43bba16fc am: ba5dd7a1af am: f451da03d5 am: c4cd166386 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/25135945 Change-Id: I102ae92f370bf2bf6898d7f32bef5658d662e08c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01Camera2: Do not pass location info for startActivity case am: 3c097bb0e5 am: ↵Shuzhen Wang
a73f9d3e0d am: e43bba16fc am: ba5dd7a1af am: f451da03d5 am: c4cd166386 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/25135945 Change-Id: I408605267a070cd5a925c38c40dbbd4387a98f1d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01Camera2: Do not pass location info for startActivity case am: 3c097bb0e5 am: ↵Shuzhen Wang
a73f9d3e0d am: e43bba16fc am: ba5dd7a1af am: f451da03d5 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/25135945 Change-Id: I2c7f8059c3add52effe1c27835ea218d81808d2c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01Camera2: Do not pass location info for startActivity case am: 3c097bb0e5 am: ↵Shuzhen Wang
a73f9d3e0d am: e43bba16fc am: ba5dd7a1af Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/25135945 Change-Id: I4071151a2a698f797a05ff7bcd97b2666e11fb12 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31Camera2: Do not pass location info for startActivity case am: 3c097bb0e5 am: ↵Shuzhen Wang
a73f9d3e0d am: e43bba16fc Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/25135945 Change-Id: I124fb715d54b0b175dd8fa278c30ba77841c93cd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31Camera2: Do not pass location info for startActivity case am: 3c097bb0e5 am: ↵Shuzhen Wang
a73f9d3e0d Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/25135945 Change-Id: Ib2b0b9bedbf2c8c1d5fb3241065c44c58d24e3f3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31Camera2: Do not pass location info for startActivity case am: 3c097bb0e5Shuzhen Wang
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/25135945 Change-Id: Id70d6e5ce2e3217f03ca3faf3d8f71887d3a5687 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-28Camera2: Do not pass location info for startActivity caseShuzhen Wang
If the Camera2 activity is started by startActivity, we shouldn't unconditionally grant location. Test: Use Camera2 app both independently and with INTENT Bug: 285142084 Change-Id: I3b78840f9b0fefeadea44150ea319886f06c1485
2023-05-10Snap for 10103804 from c4f3de3d4009f35b4f6e9c0dda3710f84fe2b79c to ↵Android Build Coastguard Worker
mainline-tzdata5-release Change-Id: If3f93fb34b1b96d0222a076d712483a7b7dc9940
2023-03-13Add required flag to receiver in VideoModule am: ff47dc7f6fMichael Groover
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/21934303 Change-Id: Iec9ff297bf37e1b33d13cd90a8cfeff690155ce6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Add required flag to receiver in VideoModuleandroid14-devMichael Groover
Android T allows apps to declare a runtime receiver as not exported by invoking registerReceiver with a new RECEIVER_NOT_EXPORTED flag; receivers registered with this flag will only receive broadcasts from the platform and the app itself. However to ensure developers can properly protect their receivers, all apps targeting U and registering a receiver for non-system broadcasts must specify either the exported or not exported flag when invoking registerReceiver; if one of these flags is not provided, the platform will throw a SecurityException. This commit updates the receiver with the RECEIVER_EXPORTED flag since the broadcast is sent from the media provider. Bug: 234659204 Test: Build Change-Id: I227e8d9e2ace18119a37ddb0c2c4ddf4c3be6209
2023-02-01Snap for 9550733 from 96ca62a1940625d2029d94d9592f4c23870ed01f to ↵Android Build Coastguard Worker
mainline-tzdata5-release Change-Id: If7ac8fd0f4d6118ade1a25bad686b4c883e7b38d
2023-01-28Merge "Always use setResultEx" am: dcf1bbf9b1 am: 2a9c47c354 am: 575d3c1fbcTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2400471 Change-Id: Ibea6545a083ab265da6f7b0cab30e76150d36e6c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27Merge "Always use setResultEx" am: dcf1bbf9b1 am: 2a9c47c354Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2400471 Change-Id: I3ab0cdd4c82f88e527c1032c846a6f68166b9114 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27Merge "Always use setResultEx" am: dcf1bbf9b1android-u-beta-1-gplTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2400471 Change-Id: I2108dd4ab244bf6daa98afc0a567d73d73139fe1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27Merge "Always use setResultEx"Treehugger Robot
2023-01-27Always use setResultExAndrew Scull
Have one common code path for setting the activity result and updating the variables for tests. Test: TH Change-Id: I9ab3f36bea564b3b1c9f9ff2dfe0380f31a79689
2022-12-12[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master am: 55b2c99533 -s ours am: e56026eac6 -s ours am skip reason: Merged-In Ia44262146d4cc6f3859a1d8a37688c502e3ec939 with SHA-1 c512318426 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2338386 Change-Id: I3629939f974bd7c0e90b6d2a6ea21d1dbe0f73ca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12[automerger skipped] Merge "Merge Android 13 QPR1" am: 38dd493b77 -s ours ↵Xin Li
am: b86d0e6a82 -s ours am: 71c4660096 -s ours am skip reason: Merged-In Ia44262146d4cc6f3859a1d8a37688c502e3ec939 with SHA-1 c512318426 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2338386 Change-Id: I3a5cc6af9aadf2f354fc1144933f2c4613f1803a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12[automerger skipped] Merge "Merge Android 13 QPR1" am: 38dd493b77 -s ours ↵Xin Li
am: a794dca699 -s ours am: 860c818398 -s ours am skip reason: Merged-In Ia44262146d4cc6f3859a1d8a37688c502e3ec939 with SHA-1 c512318426 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2338386 Change-Id: I09a1a55ac43bd096ab0a0e15aae124c7ac9fcd13 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12[automerger skipped] Merge Android 13 QPR1 am: 9a11661453 -s ours am: ↵Xin Li
55ebac7c64 -s ours am: d88def3437 -s ours am skip reason: Merged-In Ia44262146d4cc6f3859a1d8a37688c502e3ec939 with SHA-1 c512318426 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2338386 Change-Id: I7954885723b1c457a338fdafc060037f58370478 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into ↵Automerger Merge Worker
stage-aosp-master am: 55b2c99533 -s ours am skip reason: Merged-In Ia44262146d4cc6f3859a1d8a37688c502e3ec939 with SHA-1 c512318426 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2338386 Change-Id: I076825c6c58d35ea16cb01e1df494dcb2eb0c811 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10[automerger skipped] Merge "Merge Android 13 QPR1" am: 38dd493b77 -s ours ↵Xin Li
am: b86d0e6a82 -s ours am skip reason: Merged-In Ia44262146d4cc6f3859a1d8a37688c502e3ec939 with SHA-1 c512318426 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2338386 Change-Id: I06c08aa51dda907d54267d3de158f460f1ce7176 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10[automerger skipped] Merge "Merge Android 13 QPR1" am: 38dd493b77 -s ours ↵Xin Li
am: a794dca699 -s ours am skip reason: Merged-In Ia44262146d4cc6f3859a1d8a37688c502e3ec939 with SHA-1 c512318426 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2338386 Change-Id: I58e9510ccb3c4268e4eab548207fc7b3f467eeb4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10[automerger skipped] Merge Android 13 QPR1 am: 9a11661453 -s ours am: ↵Xin Li
55ebac7c64 -s ours am skip reason: Merged-In Ia44262146d4cc6f3859a1d8a37688c502e3ec939 with SHA-1 c512318426 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2338386 Change-Id: Ife7e8a9cf8189539ef25f3e33d7ead597b31d6f2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into ↵Automerger Merge Worker
stage-aosp-master * changes: [automerger skipped] Merge "Merge Android 13 QPR1" am: 38dd493b77 -s ours [automerger skipped] Merge Android 13 QPR1 am: 9a11661453 -s ours
2022-12-09[automerger skipped] Merge "Merge Android 13 QPR1" am: 38dd493b77 -s oursXin Li
am skip reason: Merged-In Ia44262146d4cc6f3859a1d8a37688c502e3ec939 with SHA-1 c512318426 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2338386 Change-Id: I4f9498d77942135a7c04bf53f18184db77bf9612 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09[automerger skipped] Merge Android 13 QPR1 am: 9a11661453 -s oursXin Li
am skip reason: Merged-In Ia44262146d4cc6f3859a1d8a37688c502e3ec939 with SHA-1 c512318426 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2338386 Change-Id: Ief93e315e2b652f449438173681e929c57f7b491 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09[automerger skipped] Merge "Merge Android 13 QPR1" am: 38dd493b77 -s oursXin Li
am skip reason: Merged-In Ia44262146d4cc6f3859a1d8a37688c502e3ec939 with SHA-1 c512318426 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2338386 Change-Id: I6d800750cd010e35ea36db9db02ebaf7b398ac84 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09[automerger skipped] Merge Android 13 QPR1 am: 9a11661453 -s oursXin Li
am skip reason: Merged-In Ia44262146d4cc6f3859a1d8a37688c502e3ec939 with SHA-1 c512318426 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2338386 Change-Id: Iaaad1e6f4a2c13792833b55986857d6fac60d987 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09Merge "Merge Android 13 QPR1"main-16k-with-phonesXin Li
2022-12-09Merge Android 13 QPR1Xin Li
Bug: 261731544 Merged-In: Ia44262146d4cc6f3859a1d8a37688c502e3ec939 Change-Id: Ic7e91acfdcc21ffa397fd719edd94d9127670018
2022-11-10Merge "Fix errorprone warnings that should be errors" am: dc30d90c05 am: ↵Cole Faust
13e88abc63 am: d7605cad37 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2255053 Change-Id: I814b8a4dd0086eb615d029b2064401dad1d72edb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-10Merge "Fix errorprone warnings that should be errors" am: dc30d90c05 am: ↵Cole Faust
13e88abc63 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2255053 Change-Id: I5a8a4785cd7f5b7fbb4a3b166830790ba1b1c313 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-09Merge "Fix errorprone warnings that should be errors" am: dc30d90c05Cole Faust
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2255053 Change-Id: Ieff1885f79df01c8de1e54e8cc7df3104a1f751e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-09Merge "Fix errorprone warnings that should be errors"Cole Faust
2022-11-09Fix errorprone warnings that should be errorsCole Faust
This commit is part of a large scale change to fix errorprone errors that have been downgraded to warnings in the android source tree, so that they can be promoted to errors again. The full list of changes include the following, but not all will be present in any one individual commit: BadAnnotationImplementation BadShiftAmount BanJNDI BoxedPrimitiveEquality ComparableType ComplexBooleanConstant CollectionToArraySafeParameter ConditionalExpressionNumericPromotion DangerousLiteralNull DoubleBraceInitialization DurationFrom DurationTemporalUnit EmptyTopLevelDeclaration EqualsNull EqualsReference FormatString FromTemporalAccessor GetClassOnAnnotation GetClassOnClass HashtableContains IdentityBinaryExpression IdentityHashMapBoxing InstantTemporalUnit InvalidTimeZoneID InvalidZoneId IsInstanceIncompatibleType JUnitParameterMethodNotFound LockOnBoxedPrimitive MathRoundIntLong MislabeledAndroidString MisusedDayOfYear MissingSuperCall MisusedWeekYear ModifyingCollectionWithItself NoCanIgnoreReturnValueOnClasses NonRuntimeAnnotation NullableOnContainingClass NullTernary OverridesJavaxInjectableMethod ParcelableCreator PeriodFrom PreconditionsInvalidPlaceholder ProtoBuilderReturnValueIgnored ProtoFieldNullComparison RandomModInteger RectIntersectReturnValueIgnored ReturnValueIgnored SelfAssignment SelfComparison SelfEquals SizeGreaterThanOrEqualsZero StringBuilderInitWithChar TreeToString TryFailThrowable UnnecessaryCheckNotNull UnusedCollectionModifiedInPlace XorPower See https://errorprone.info/bugpatterns for more information on the checks. Bug: 253827323 Test: m RUN_ERROR_PRONE=true javac-check Change-Id: Ia44262146d4cc6f3859a1d8a37688c502e3ec939
2022-10-20Merge "Camera2: get jpeg compression quality for front camera" am: ↵Noah Woo
ff0890358d am: eb7c22e645 am: b6e116b659 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2263681 Change-Id: Icc81527e4c5ed859ca691da80cb0e4e6b16fe2bc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-20Merge "Camera2: get jpeg compression quality for front camera" am: ↵Noah Woo
ff0890358d am: eb7c22e645 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2263681 Change-Id: I5145cb0a296b93c26ae3dc9341ee6bc8479798c2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-20Merge "Camera2: get jpeg compression quality for front camera" am: ff0890358dNoah Woo
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2263681 Change-Id: I83b9c0d0978d1279626ac22ea9c11ea263e66a27 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-20Merge "Camera2: get jpeg compression quality for front camera"Noah Woo
2022-10-20Camera2: get jpeg compression quality for front cameraNoah Woo
This patch modifies TaskCompressImageToJpeg.getJpegCompressionQuality() so that it can retrieve jpeg compression quality of a front-facing camera in case that there is no back-facing camera found. Bug: 226597684 Test: Checked quality of captured images is good with a device having a front-facing camera only. Signed-off-by: Noah Woo <namyoon@google.com> Change-Id: I363285dc399ab7746a663dd766d982ceaed8f5c3
2022-10-11[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: ↵Xin Li
5640ac095f -s ours am: 28723d3206 -s ours am skip reason: Merged-In I7ff8a794872917caff27f540a29e77db7e9f5bb2 with SHA-1 ecfe9c6343 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/20137165 Change-Id: Ia16c99bd83d591b97518a0a2e36d8d7a59708f56 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: ↵Xin Li
5640ac095f -s ours am skip reason: Merged-In I7ff8a794872917caff27f540a29e77db7e9f5bb2 with SHA-1 ecfe9c6343 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/20137165 Change-Id: Ia8c3bac190e9df004b726764bf29cd8739872019 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-05-21 20:21:12 +0000