Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
818,849 Commits 3 Branches 0 Tags
0a3aded9d50adacae59607da18157698dfdacba4
Commit Graph

5676 Commits

Author SHA1 Message Date
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
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
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
Avichal Rakesh
6bb32af31b Merge "camera: Fix exception handling from ImageReader#detach" into tm-d1-dev am: 00d8fb5022 am: f7be5a5d08 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19139699

Change-Id: Ib920a44f3fee261e5511978ed0a2107dd0c5b43a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-07 22:57:47 +00:00
Avichal Rakesh
f7be5a5d08 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: I1a8dd18f1fc9ea044296a16bd80ea4a8da38090d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-07 22:38:58 +00:00
Lei Ju
42fd7de622 Migrate wakelock logic. 
Test: Existing chqts test.
Bug: 202447392
Change-Id: I7cb29ed67213c9fc85e54b5d18dbdd3fba8b356f
 2022-07-07 10:26:39 -07:00
mattgilbride
1b6a6d0f8c @EnforcePermission migrations - framework-minus-apex 
Immediate calls to helper methods that themselves call
permission checks OTHER THAN Context.enforceCallingOrSelfPermission.
Fixes applied by Android Lint (cl/18432857).

Bug: 232058525
Test: N/A
Change-Id: Ib0fc48fe50ca1317668194474324e99bef9c44ea
 2022-07-06 16:23:09 +00:00
mattgilbride
d038c746f1 @EnforcePermission migrations - framework-minus-apex 
Immediate calls to Context.enforceCallingOrPermission.  Fixes
applied by Android Lint (cl/18432857).

Bug: 232058525
Test: N/A
Change-Id: I1f53b24fe870a95aaacb97164138bb6dd2afaafc
 2022-07-06 01:41:05 +00:00
Avichal Rakesh
a9d512bef1 camera: Fix exception handling from ImageReader#detach 
ImageReader has a bug where if detaching an Image from Surface fails, it
might throw a RuntimeException instead of an IllegalStateException as
stated in the javadoc. This can lead to CameraExtensionSessionImpl
crashing due to the unhandled exception. Changing ImageReader behavior
is difficult as it might break backwards compatibility.

To prevent crashes from expected exception, this CL adds exception
handling for RuntimeException when detaching images.

In addition, CameraExtensionSessionImpl caught generic `Exception` at
another place, which can lead to it consuming unintended exceptions.
This CL scopes in the exception handling to consume expected exceptions
only.

Bug: 236825255
Test: CtsCameraTestCases pass on Flame
Change-Id: I6fa81b7a19fb4017480074e33b09942aedcd2212
 2022-07-01 11:42:22 -07:00
Hani Kazmi
4f221e5c51 Migrate Bundle/Intent APIs to new, type checked, variants 
Part of go/safer-parcel. Follow up to ag/16639043. Migrates the following unsafe APIs:

* Parcel.readArray()
* Parcel.readParcelableArray()
* Bundle.getSerializable()
* Bundle.getParcelable()
* Bundle.getParcelableArrayList()
* Bundle.getParcelableArray()
* Bundle.getSparseParcelableArray()
* Intent.getSerializableExtra()
* Intent.getParcelableExtra()
* Intent.getParcelableArrayExtra()
* Intent.getParcelableArrayListExtra

Bug: 227458983
Test: m and presubmit pass
Change-Id: I72f206cb18eb5c669a7fff07a6845bed1c433fdb
 2022-07-01 10:53:53 +00:00
Weilin Xu
e5e456e97f Merge "Fix deadlock due to callbacks in ProgramList" into tm-qpr-dev am: 5355bffe3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19120223

Change-Id: I6635f3da3bdaddf105dba7329314920472990709
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 00:23:30 +00:00
Austin Borger
b6bd8075e5 Merge "camera2 params: Use a builder pattern for constructing a Face." 2022-06-29 23:55:39 +00:00
Weilin Xu
b5c6901c67 Fix deadlock due to callbacks in ProgramList 
Copy callback member variables in ProgramList and call them after
releasing the lock of ProgramList, avoiding acquiring lock in
RadioAppService after already locking ProgramList, which causes
deadlook.

Bug: 193041795
Test: m -j
Test: atest android.hardware.radio.tests.functional
Test: atest com.android.server.broadcastradio.hal2
Change-Id: I196377ea030248a5d66a4db03ffb3bee4a70e633
Merged-In: I196377ea030248a5d66a4db03ffb3bee4a70e633
(cherry picked from commit 4ca33d655a)
 2022-06-29 18:30:11 +00:00
Weilin Xu
92c7107e0d Merge "Fix deadlock due to callbacks in ProgramList" 2022-06-29 16:38:08 +00:00
Treehugger Robot
4218c30042 Merge "CEC: Do not allow null callback" am: a36bae6e00 am: 4a6e08d4b5 am: 0ee5cd13f9 am: da0078713c am: ec4376adee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2134302

Change-Id: I6b03bb1769e52408965184871414d5c1bc1602dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 09:36:55 +00:00
Treehugger Robot
ec4376adee Merge "CEC: Do not allow null callback" am: a36bae6e00 am: 4a6e08d4b5 am: 0ee5cd13f9 am: da0078713c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2134302

Change-Id: I48039797c983ef04d2c4b5714ba57128c704a11e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 09:18:15 +00:00
Treehugger Robot
da0078713c Merge "CEC: Do not allow null callback" am: a36bae6e00 am: 4a6e08d4b5 am: 0ee5cd13f9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2134302

Change-Id: I66b1715120e1c0597196a75d61fb50d62f31387f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 08:55:33 +00:00
Treehugger Robot
0ee5cd13f9 Merge "CEC: Do not allow null callback" am: a36bae6e00 am: 4a6e08d4b5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2134302

Change-Id: I0923d607a1aa766ba46d4f159b2d060ec37c66fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 08:32:17 +00:00
Venkatarama Avadhani
d9b319e0d2 CEC: Do not allow null callback 
Do not allow oneTouchPlay and getDisplayStatus methods to be called
with null callback as an argument.

Bug: 236687418
Test: None
Change-Id: I9f1b3ec5c1a44fd588068881febd35d34930f031
 2022-06-29 07:17:49 +00:00
Austin Borger
30748ee91c camera2 params: Use a builder pattern for constructing a Face. 
This patch re-hides the Face contructors and instead makes a Builder
available for public use.

Test: atest -m android.hardware.camera2.cts.SimpleObjectsTest
Bug: 202059787
Bug: 236187068
Change-Id: Ia6906f8204330ec078dae8dff85f2f77bac54bc5
 2022-06-28 15:32:29 -07:00
Austin Borger
fc42ec4850 camera2 params: Use a builder pattern for constructing a DeviceStateSensorOrientationMap. 
This patch re-hides the DeviceStateSensorOrientationMap contructors and
instead makes a Builder available for public use.

Test: atest -m android.hardware.camera2.cts.SimpleObjectsTest
Bug: 202059787
Bug: 236187068
Change-Id: Ia0bcda187340f175aa5f4472068598d9400b420d
 2022-06-28 13:11:53 -07:00
Weilin Xu
77c195587c Merge "Added new owner to radio service folder" am: 0948b77d4f am: 5d38f81f13 am: db809e7990 am: 96b02b8b6f am: aa60c6a20f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2133941

Change-Id: I613d44f96f86d6a3635ea9d73c6f24d18148e001
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 20:18:56 +00:00
Weilin Xu
aa60c6a20f Merge "Added new owner to radio service folder" am: 0948b77d4f am: 5d38f81f13 am: db809e7990 am: 96b02b8b6f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2133941

Change-Id: Ic2bae518081d8f3011536308ebf22c7127432fea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 20:02:31 +00:00
Austin Borger
5f1ff7d2ec Merge "camera2 params: Modify Capability constructor to take a Size and Range." 2022-06-27 18:34:25 +00:00
Michael Wright
aff9c4ff94 Merge "Brightnessthrottler updateable through DeviceConfig" into tm-qpr-dev am: c5f1c156ba am: b0c536ee88 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18740932

Change-Id: I621d39ee81ef2ee435231a48bda37ae05608e619
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 20:46:52 +00:00
Michael Wright
b0c536ee88 Merge "Brightnessthrottler updateable through DeviceConfig" into tm-qpr-dev am: c5f1c156ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18740932

Change-Id: I28ff59074b53bf8c5c06e7054a4d9831ac61bbbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 20:27:05 +00:00
Weilin Xu
96b02b8b6f Merge "Added new owner to radio service folder" am: 0948b77d4f am: 5d38f81f13 am: db809e7990 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2133941

Change-Id: I44ac2938655e5b5d24ce18870a0761c5cc85a918
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 20:04:27 +00:00
Weilin Xu
db809e7990 Merge "Added new owner to radio service folder" am: 0948b77d4f am: 5d38f81f13 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2133941

Change-Id: I77d17f37da0fffad766e57d481d22880e98e3de9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 19:42:06 +00:00
Fiona Campbell
265f9a6c9c Brightnessthrottler updateable through DeviceConfig 
Add listener and methods to allow BrightnessThrottler to be updated
though DeviceConfig.

Bug: 224567082
Test: atest com.android.server.display
Test: adb shell device_config put display_manager
brightness_throttling_data
"local:4619827677550801152,3,moderate,0.5,severe,0.379518072,emergency,0.248995984;local:4619827677550801151,1,moderate,0.75;local:4619827677550801150,0"
adb shell dumpsys display | grep -A20 BrightnessThrottler

Change-Id: If4fe4875d6a05cb03fbf69abb8a62a645098b3a0
 2022-06-24 14:51:33 +00:00