Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
823,738 Commits 3 Branches 0 Tags
619dfd599a4e99dff7f89eefa4d8ea08adcaf5de
Commit Graph

5702 Commits

Author SHA1 Message Date
Chavi Weingarten
619dfd599a Merge "Use layer mirroring when screen recording via VD" 2022-08-10 21:58:58 +00:00
Jayant Chowdhary
68b009b02b Merge "Fix spacing for preview stabilization mandatory streams docs." into tm-qpr-dev am: 23ac6aceca am: 4bcb7914b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19572800

Change-Id: Iaf16a291dc42d40257a8a8d872460c66ce3d252b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 18:08:54 +00:00
Jayant Chowdhary
4bcb7914b8 Merge "Fix spacing for preview stabilization mandatory streams docs." into tm-qpr-dev am: 23ac6aceca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19572800

Change-Id: Ibe4864a2f0b239f0ff8d3d642dbe5da01bfb0186
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 17:42:54 +00:00
Jayant Chowdhary
b723541a6e Fix spacing for preview stabilization mandatory streams docs. 
Bug: 237717894

Test: Check output of make doc-comment-check-docs

Change-Id: Ia389f18746fd6c4c534a87ae6ad89261bdd8cc3a
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
 2022-08-10 00:10:37 +00:00
Chavi Weingarten
e64bae455e Use layer mirroring when screen recording via VD 
When a Display has the flag VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR, the
content on the display is expected to mirror another display. This was
previously done by setting the same layerStack. This change removes that
behavior and instead will create a mirror hierarchy of the other display
and place it at the root of the new Display. This is leveraging the work
done for ContentRecorder, but using it as default for all displays
instead of only for VD created by MediaProjection.

Test: Screen record via MediaProjection
Test: Screen record via DisplayManager
Test: ContentRecorderTests
Test: DisplayContentTests
Bug: 237664947
Change-Id: I18b36dadc43ba1c37f9516ff10d24bb8683c04ac
 2022-08-09 16:45:56 +00:00
rockyfang
cc16eef601 Synchronized setClientProxy and callbackFinished to prevent NPE 
During the gap between createClient and setClientProxy that sets up
mClientProxy, another thread callbackFinished on mClientProxy that will
causes NPE, this CL wait until mClientProxy is created then allow
callbackFinished to be called

Test: Added Thread.sleep(7000) to expand the gap between
mService.createClient and client.setClientProxy to expand the chance of creating race condition NPE then run PtsChreTestCases and passed (ab/I55000010077218265)
Fixes: 240691175
Change-Id: I8a729abf9f4368eab51c886a20035ccf879d9eff
 2022-08-05 18:31:12 +00:00
TreeHugger Robot
2d3ab8bd84 Merge "Camera: Avoid NPE when extension results are not supported" into tm-d1-dev am: 8f42b2f8d6 am: 5c002a64a5 am: 3d698aabaa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19451689

Change-Id: I3d36b6323c6434f0ad0351a7026c8b4b51568b67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 18:03:39 +00:00
TreeHugger Robot
3d698aabaa Merge "Camera: Avoid NPE when extension results are not supported" into tm-d1-dev am: 8f42b2f8d6 am: 5c002a64a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19451689

Change-Id: I980d941daf2be5aef08b9695e993dbb76edffc3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 17:59:25 +00:00
TreeHugger Robot
5c002a64a5 Merge "Camera: Avoid NPE when extension results are not supported" into tm-d1-dev am: 8f42b2f8d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19451689

Change-Id: I7d641cea03f9f35889d0ebdcf66e9bf7a0f35609
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 17:51:59 +00:00
Bharatt Kukreja
563b92d6c6 Merge "Fix MandatoryStreamCombinations for ultra high resolution sensors" 2022-07-28 14:22:53 +00:00
Emilian Peev
671d613bcb Camera: Avoid NPE when extension results are not supported 
Bug: 240017175
Test: atest -c -d cts/tests/camera/src/android/hardware/camera2/cts/CameraExtensionSessionTest.java#testRepeatingAndCaptureCombined
Change-Id: I0b82039a103ac2a55f71a6aea505d7c7c696d7be
 2022-07-27 22:46:59 +00:00
Rucha Katakwar
656bb29f56 Merge "Update torch brightness max level description." into tm-d1-dev am: 7cdfd75b02 am: 77f3fe5709 am: 81d5ed723b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19386567

Change-Id: Ib0197be19c70ff8e6ffa6b016883a9da1b3ae7ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-27 19:44:48 +00:00
Rucha Katakwar
81d5ed723b Merge "Update torch brightness max level description." into tm-d1-dev am: 7cdfd75b02 am: 77f3fe5709 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19386567

Change-Id: I8cc7c95e80e21ad68847b749dd9f0b0d36bbf27b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-27 19:00:10 +00:00
Rucha Katakwar
77f3fe5709 Merge "Update torch brightness max level description." into tm-d1-dev am: 7cdfd75b02 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19386567

Change-Id: Idc09acf8b2b185f873b45b7bad70e0a32fab5ac3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-27 18:37:45 +00:00
Rucha Katakwar
7cdfd75b02 Merge "Update torch brightness max level description." into tm-d1-dev 2022-07-27 18:14:04 +00:00
Joshua Mccloskey
315f6f124d Merge "SideFPS UX updates" into tm-qpr-dev am: 2ff2a64cfe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19039844

Change-Id: I0e5645ff7a507ebd9c8c29f347ed6e45f3f365d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-26 20:56:14 +00:00
Joshua Mccloskey
2ff2a64cfe Merge "SideFPS UX updates" into tm-qpr-dev 2022-07-26 20:34:50 +00:00
Jayant Chowdhary
9623f2520a Merge "camera2: update original ByteBuffer using bulk get on 'viewed' ByteBuffer for correct position" into tm-d1-dev am: 138fc75ad4 am: 8023620746 am: aaee5102db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19354614

Change-Id: I3ff06d72705ae3852dae3e67d3e589d364a90624
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-21 21:31:30 +00:00
Jayant Chowdhary
aaee5102db Merge "camera2: update original ByteBuffer using bulk get on 'viewed' ByteBuffer for correct position" into tm-d1-dev am: 138fc75ad4 am: 8023620746 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19354614

Change-Id: I89cabe4d6c8c7afe2695d46f7f8dafc800497dc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-21 21:13:50 +00:00
Jayant Chowdhary
8023620746 Merge "camera2: update original ByteBuffer using bulk get on 'viewed' ByteBuffer for correct position" into tm-d1-dev am: 138fc75ad4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19354614

Change-Id: Iaf4d48ea9d31b053f78f788e0f651b7ba1c5c8bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-21 21:06:35 +00:00
Rucha Katakwar
851d5cf44b Update torch brightness max level description. 
Bug: 239492786
Change-Id: I9514a3d137a64f99e3c5c03d1843b53ace0cbf3a
 2022-07-21 14:03:50 -07:00
Jayant Chowdhary
138fc75ad4 Merge "camera2: update original ByteBuffer using bulk get on 'viewed' ByteBuffer for correct position" into tm-d1-dev 2022-07-21 20:41:45 +00:00
Rucha Katakwar
0a3aded9d5 Merge "Update torch brightness max level description." into tm-d1-dev am: 88949ab1fc am: 7095b9c34d am: e4d719e90f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19340523

Change-Id: Ic031be67b28cb97c5ea0a414fe8a9fd8ed81aa3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-21 02:36:29 +00:00
Rucha Katakwar
e4d719e90f Merge "Update torch brightness max level description." into tm-d1-dev am: 88949ab1fc am: 7095b9c34d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19340523

Change-Id: Id0e9868bfd839ed5ee5768556c659f1c287b3067
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-21 00:03:58 +00:00
Rucha Katakwar
7095b9c34d Merge "Update torch brightness max level description." into tm-d1-dev am: 88949ab1fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19340523

Change-Id: I6c31a737c549916c5f81f45191f9949367f60eef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 23:47:48 +00:00
Rucha Katakwar
727b4386db Merge "Update torch brightness max level description." into tm-d1-dev am: 88949ab1fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19340523

Change-Id: Id2ddfe491e9f75e9f2e1818bf48f26e369234e63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 23:47:39 +00:00
Jayant Chowdhary
cff610bf0e camera2: update original ByteBuffer using bulk get on 'viewed' ByteBuffer for correct position 
When we use any of the viewed methods from ByteBuffer such as
asFloatBuffer, the returned buffer's position and the original
ByteBuffer's positions are independent. So update the original
ByteBuffer's position as well, for correct accounting.

Bug: 239639757

Test: Camera CTS; GCA
Test: MarshalQueryableArray error logs don't appear in logcat while using GCA

Change-Id: I488a23c278ee5d044c2423a616e598a93cbbad0b
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
 2022-07-20 18:33:45 +00:00
Joshua McCloskey
2987c8b264 SideFPS UX updates 
1. Added side fps auth delay on device entry/biometric
prompt to wait for power press.
2. Added tap to dismiss dialog for side fps enrollment.

Test: atest SideFpsEventHandlerTest
Bug: 233953696
Change-Id: I1b8a63cc76cdb5d8e46206ba1bee8fc3246a8cdc
Merged-In: I1b8a63cc76cdb5d8e46206ba1bee8fc3246a8cdc
 2022-07-20 17:02:29 +00:00
Joshua Mccloskey
00c545be97 Merge "SideFPS UX updates" 2022-07-20 17:01:57 +00:00
Rucha Katakwar
a5bd39561a Update torch brightness max level description. 
Bug: 239492786
Change-Id: I01720f2d25b932d58fa8b7816f8504101d70f3a3
 2022-07-19 16:50:25 -07:00
Jayant Chowdhary
11005a03ec Merge "camera2: use bulk get methods while unmarshalling primitives." into tm-d1-dev am: c5a041d4c7 am: 2f824d9426 am: 410013d8a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19303234

Change-Id: Id14761296a9ba6d4450d5fac4db1b0bdc1b2dba2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 20:32:26 +00:00
Bharatt Kukreja
20d2dcff58 Fix MandatoryStreamCombinations for ultra high resolution sensors 
Some combinations for ultra high resolution sensors are repeated, and
some are there in the documentation which are missing. Specifically
YUV/RAW/Jpeg + YUV preview don't have the right combinations listed.
This was probably a typo.

Bug: 234752370
Test: Tested in RobustnessTest.java
Change-Id: I316443c1e2328494b75ac49242b4ddac5a51775e
 2022-07-19 18:24:35 +00:00
Jayant Chowdhary
410013d8a0 Merge "camera2: use bulk get methods while unmarshalling primitives." into tm-d1-dev am: c5a041d4c7 am: 2f824d9426 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19303234

Change-Id: Ia3f26ef93c439fbf58a92ce2b2daab90318c2fa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 15:52:58 +00:00
Jayant Chowdhary
7057d372ad Merge "camera2: use bulk get methods while unmarshalling primitives." into tm-d1-dev am: c5a041d4c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19303234

Change-Id: Ic70c6b733132182fba2b984b0a80296b80cc46b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 15:37:40 +00:00
Jayant Chowdhary
2f824d9426 Merge "camera2: use bulk get methods while unmarshalling primitives." into tm-d1-dev am: c5a041d4c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19303234

Change-Id: Ic9bd7f09a84b2e873e6cc00e2f77ab321c8f1f9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 15:37:39 +00:00
Joshua McCloskey
60dedc99fe SideFPS UX updates 
1. Added side fps auth delay on device entry/biometric
prompt to wait for power press.
2. Added tap to dismiss dialog for side fps enrollment.

Test: atest SideFpsEventHandlerTest
Bug: 233953696
Change-Id: I1b8a63cc76cdb5d8e46206ba1bee8fc3246a8cdc
 2022-07-18 18:58:31 +00:00
Weilin Xu
f731308ceb Merge "Fix purge bug for program list update" into tm-qpr-dev am: 8f70a3a4ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19245921

Change-Id: I108fc9d830d7705806f42f094ad9137a7cbc2438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-18 18:28:14 +00:00
Jayant Chowdhary
f0f7a7cabf camera2: use bulk get methods while unmarshalling primitives. 
Bug: 239167817

Test: GCA (validity)
Test: Camera CTS
Test: profiling results mentioned in b/239167817

Change-Id: I6954a81d49be6d8a0746301e544b1772444ee746
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
 2022-07-15 19:40:29 +00:00
Weilin Xu
db8579ffd0 Fix purge bug for program list update 
Fix the bug that using keySet and removing items of mPrograms at
the same time during program list update

Bug: 238199883
Test: atest android.hardware.radio.tests.functional
Test: atest com.android.server.broadcastradio.hal2
Change-Id: Ie958b3686780de8c6f3b9912c71dcfe7c07befd0
Merged-In: Ie958b3686780de8c6f3b9912c71dcfe7c07befd0
(cherry picked from commit 92a2339b7b)
 2022-07-13 16:37:31 +00:00
Matt Gilbride
ad218d3333 Merge "@EnforcePermission migrations - services.core" 2022-07-12 20:09:47 +00:00
Matt Gilbride
941bde91bc Merge "@EnforcePermission migrations - services.core" 2022-07-12 15:27:14 +00:00
Weilin Xu
e3b95bdb26 Merge "Fix purge bug for program list update" 2022-07-11 22:19:28 +00:00
mattgilbride
53f1bcf670 @EnforcePermission migrations - services.core 
Immediate calls to helper methods that themselves call
Context.enforceCallingOrSelfPermission.
Fixes applied by Android Lint (cl/18432857).

Bug: 232058525
Test: N/A
Change-Id: I2b233caac7ee6db04f674f0143c79973847336c2
 2022-07-11 20:22:03 +00:00
mattgilbride
f48d794e01 @EnforcePermission migrations - services.core 
Immediate calls to Context.enforceCallingPermission.  Fixes
applied by Android Lint (ag/18432857).

Bug: 232058525
Test: N/A
Change-Id: Id9bdeb71e84962d55fd1657e91856d84e1c3d11b
 2022-07-11 20:01:27 +00:00
Lei Ju
a80162db98 Merge "Migrate wakelock logic." 2022-07-10 18:10:11 +00:00
Weilin Xu
92a2339b7b Fix purge bug for program list update 
Fix the bug that using keySet and removing items of mPrograms at
the same time during program list update

Bug: 238199883
Test: atest android.hardware.radio.tests.functional
Test: atest com.android.server.broadcastradio.hal2
Change-Id: Ie958b3686780de8c6f3b9912c71dcfe7c07befd0
 2022-07-09 03:28:32 +00:00
Avichal Rakesh
573c527843 Merge "camera: Fix exception handling from ImageReader#detach" into tm-d1-dev am: 00d8fb5022 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19139699

Change-Id: Ib70238ad7e850cad5666a66c2a6f29353d58cf0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:52:26 +00:00
Matt Gilbride
ca35dff510 Merge "@EnforcePermission migrations - framework-minus-apex" 2022-07-08 11:03:04 +00:00
Matt Gilbride
13e657b87f Merge "@EnforcePermission migrations - framework-minus-apex" 2022-07-08 10:59:40 +00:00
Avichal Rakesh
da88796523 Merge "camera: Fix exception handling from ImageReader#detach" into tm-d1-dev am: 00d8fb5022 am: f7be5a5d08 am: 6bb32af31b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19139699

Change-Id: I58d6043bc3fb6a912736797abc51ac4556490c53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-07 23:27:07 +00:00