Commit Graph

813479 Commits

Author SHA1 Message Date
Treehugger Robot
31b73ad4b9 Merge "nfc: Migrate away from @hide getIntForUser" 2023-02-10 22:13:43 +00:00
Atneya Nair
9ac35bd34d Merge "Owner file fix for SoundTrigger" am: cbab36cc48
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2429180

Change-Id: I6c3e2b1a02971ea3570c3bfc366b4cb2ff31d7b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 21:37:27 +00:00
Tyler Gunn
def39f477a Merge "Clarify start/stop DTMF tone API documentation." am: b212a4bfc7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2423245

Change-Id: I3fe36c88c02f281d63246007c2e004ebd75791f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 21:36:42 +00:00
Atneya Nair
cbab36cc48 Merge "Owner file fix for SoundTrigger" 2023-02-10 21:35:52 +00:00
Treehugger Robot
f2a74a3a64 Merge "Redact DTMF digits log for production users" am: d2250b1a4a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1791847

Change-Id: I453aeadf44babb6e6c1b97a643f49c16e3d69daf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 21:33:42 +00:00
Tyler Gunn
b212a4bfc7 Merge "Clarify start/stop DTMF tone API documentation." 2023-02-10 21:32:58 +00:00
Jeff Sharkey
4c3ff4d98e Merge "Add dropbox entries as files to dumpstate ZIP." am: d63b06b429
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2422779

Change-Id: I254105c71f3ccd1fd95b90fe9e8de1b95a0a8952
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 21:31:35 +00:00
Treehugger Robot
d2250b1a4a Merge "Redact DTMF digits log for production users" 2023-02-10 21:24:04 +00:00
Jeff Sharkey
d63b06b429 Merge "Add dropbox entries as files to dumpstate ZIP." 2023-02-10 20:41:51 +00:00
Treehugger Robot
451ce2d723 Merge "camera2: Fix docs for mandatory stream combinations." am: b13fbc158b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2427686

Change-Id: I84d059a03cf1b936dba6a4d58dbac13fabb18ee6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 20:36:51 +00:00
Roshan Pius
8ef8e4ea24 nfc: Migrate away from @hide getIntForUser
Bug: 244264995
Test: Compiles
Change-Id: I50c79e4da929a431c91887278fbe42653c52c74f
2023-02-10 12:10:36 -08:00
Treehugger Robot
b13fbc158b Merge "camera2: Fix docs for mandatory stream combinations." 2023-02-10 19:40:36 +00:00
Emilian Peev
bfdd350c75 Camera: Avoid possible NPE after extension session configuration
Camera extension clients are able to close and release camera and
all associated extension resources while an advanced extension session
configuration is in progress.
In case, the extension initializer callback gets executed after all
resources are released it may try to access the already released
binder interface triggering NPE.

Bug: 268437036
Test: atest -c -d
cts/tests/camera/src/android/hardware/camera2/cts/CameraExtensionSessionTest.java

Change-Id: Ib6fdc9d08e973616dc7d83264dc3f320e496cbd3
2023-02-10 11:15:37 -08:00
Julia Reynolds
65870878af Update notification OWNERS
Change-Id: Icb0da87c9a14e270a1206bc045ef42582a7035ac
2023-02-10 15:45:26 +00:00
Treehugger Robot
dddfa2a3c5 Merge changes I099c8315,I21e958d3 am: 6317dae7fb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2429553

Change-Id: I156623158ed9b02dfb16cafbb877bb92d69c6e2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 14:49:30 +00:00
Eric Biggers
178682cb12 ArrayUtils: rename concatElements() to concat() am: 96abd9452d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2429552

Change-Id: I40242554249df84807bbd0ff54732d7701b4b6be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 14:48:58 +00:00
Treehugger Robot
6317dae7fb Merge changes I099c8315,I21e958d3
* changes:
  ArrayUtils: add concat() for byte arrays
  ArrayUtils: rename concatElements() to concat()
2023-02-10 14:08:28 +00:00
Treehugger Robot
31384ef9d3 Merge "[WMS][Bugfix] Fix hang when dumping local window." am: 635ddd9c70
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2411133

Change-Id: I4aa694d728fad1c25cea80930238adc4e0449bcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 07:41:24 +00:00
Treehugger Robot
635ddd9c70 Merge "[WMS][Bugfix] Fix hang when dumping local window." 2023-02-10 07:03:22 +00:00
TYM Tsai
8592d3c3d3 Merge "Toast: Solve the NPE problem in session.java" am: 14487f24c6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2418982

Change-Id: Id2b8fb682468d0b9e445a6901f7f49a7908b52ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 06:54:47 +00:00
TYM Tsai
14487f24c6 Merge "Toast: Solve the NPE problem in session.java" 2023-02-10 06:20:24 +00:00
Jack He
9451d2d3fe Revert "Upgrade RequireAPI annotation to prevent wrong lint error."
Revert submission 2240043-bluetooth_codec_apis_public

Reason for revert: b/268572180

Reverted changes: /q/submissionid:2240043-bluetooth_codec_apis_public

Change-Id: I687ae8f58ce1b5c025b4e79b4c801ead5966b430
2023-02-10 03:20:44 +00:00
Treehugger Robot
78697b3859 Merge "renderscript: mention deprecation in the docs "Overview"." am: 117daee126
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2425434

Change-Id: I33de94346171d7ba2a582d83f0d4419aaeb3639f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 03:01:55 +00:00
Eric Biggers
43510a5291 ArrayUtils: add concat() for byte arrays
Concatenating byte arrays is a common thing that needs to be done,
especially in the locksettings package, so add a utility method for it.

Test: atest com.android.internal.util.ArrayUtilsTest
Merged-In: I099c83155456139729f4d73f5873a172590ee7e9
Change-Id: I099c83155456139729f4d73f5873a172590ee7e9
(cherry picked from commit 4dd9540f0e)
2023-02-09 18:57:45 -08:00
Eric Biggers
96abd9452d ArrayUtils: rename concatElements() to concat()
concatElements() was probably named as it is to be like addElement() and
removeElement().  However, that doesn't really make sense because the
parameters of concatElements() are only arrays, not array elements.

Rename it to concat(), as that is just as clear and follows the example
of Guava's ObjectArrays.concat().  And I'd like to add a variant that
operates on byte arrays, and would like to call it concat().

Also clean up the tests a bit.

Test: atest com.android.internal.util.ArrayUtilsTest
BYPASS_INCLUSIVE_LANGUAGE_REASON=existing code in SettingsBackupAgent
Change-Id: I21e958d3d7b3366ec724e757ac4ccc50b36abee1
Merged-In: I21e958d3d7b3366ec724e757ac4ccc50b36abee1
(cherry picked from commit 1174b2fd68)
2023-02-09 18:55:39 -08:00
Treehugger Robot
117daee126 Merge "renderscript: mention deprecation in the docs "Overview"." 2023-02-10 02:15:59 +00:00
Atneya Nair
04ede52916 Owner file fix for SoundTrigger
Test: Compiles
Change-Id: I918efb14f0a7784c818f169c73ecf9db6d90649d
2023-02-10 00:13:00 +00:00
Jayant Chowdhary
02d4085c65 camera2: Fix docs for mandatory stream combinations.
- SCALER_MANDATORY_PREVIEW_STABILIZATION_OUTPUT_STREAM_COMBINATIONS
- SCALER_MANDATORY_TEN_BIT_OUTPUT_STREAM_COMBINATIONS

Test: build

Change-Id: I2c387ade6593f23948ff61efca212cc4c767b9da
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2023-02-09 21:26:29 +00:00
Yisroel Forta
fa9fbf3484 Merge "Add OWNERS coverage for start info" am: c97d692350
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2427204

Change-Id: I9b97d6bbba0c5435e25a060700f545bd04699819
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 20:58:06 +00:00
Mitch Phillips
a63fa9ad09 [GWP-ASan] Enable recoverable GWP-ASan for apps.
Currently, GWP-ASan is opt-in, and requires an app to set
`gwpAsanMode=always` in the manifest. If `gwpAsanMode` is unspecified,
or `gwpAsanMode=default`, then no GWP-ASan is enabled.

Let's flip that to the new recoverable mode, which catches
heap-use-after-free and heap-buffer-overflow using sampled page
allocations (as per normal GWP-ASan), but now doesn't crash the app when
it's detected.

Also, provide a kill switch that we can use if we discover problems in
the field, which can be pushed if necessary with go/android-exp.

Bug: N/A
Test: Build a device with this enabled, use some debugging apps that
trigger a use-after-free to test the mode is working as intended.

Change-Id: I03b1478c148b9f9cfaeaa16ed273f107b55f9057
2023-02-09 12:52:51 -08:00
Yisroel Forta
c97d692350 Merge "Add OWNERS coverage for start info" 2023-02-09 19:24:31 +00:00
James Willcox
5e2f60f6b8 Merge "Add OWNERS for credentials tests" am: 4c3eb0011b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2419106

Change-Id: Ia6cbc3be08672a05c321062ec4e8d81a30a4c5e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 19:23:31 +00:00
Sudheer Shanka
1b247ece5c Merge "Update OWNERS file for broadcasts related code." am: 7562658619
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2427205

Change-Id: I7e0c8bfef4d9ffd6d141338865742ee0ee19f521
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 19:18:13 +00:00
James Willcox
4c3eb0011b Merge "Add OWNERS for credentials tests" 2023-02-09 19:03:17 +00:00
Sudheer Shanka
7562658619 Merge "Update OWNERS file for broadcasts related code." 2023-02-09 18:31:07 +00:00
James Willcox
c85d79d1ea Add OWNERS for credentials tests
Bug: 255429632
Test: N/A
Change-Id: Id255f0d6c4c2e6bc581fae91fcc1798b61ccfe5b
2023-02-09 16:53:01 +00:00
Yisroel Forta
525b804721 Add OWNERS coverage for start info
Test: presubmit

Bug: 247814855
Change-Id: If66a2d161e08085a70a903f6654d9f59bc09d2cc
2023-02-09 15:38:07 +00:00
Alison Cichowlas
dc350b9593 Merge "Change mODICaptionsTooltipView null check occasion to avoid potential crash" am: 1add3774e4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2405714

Change-Id: I8f3c5c2b9c16c347aa47edec664bef8784e494d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 15:28:59 +00:00
Betty Chang
9b4f3067f2 Merge "[LE Audio] Add feature flag to decouple Broadcast from Unicast" am: a71abc1388
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2419060

Change-Id: I05a5456e1f5f842140131d53ed2716e8bd0f71a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 15:28:25 +00:00
Alison Cichowlas
1add3774e4 Merge "Change mODICaptionsTooltipView null check occasion to avoid potential crash" 2023-02-09 15:13:47 +00:00
Betty Chang
a71abc1388 Merge "[LE Audio] Add feature flag to decouple Broadcast from Unicast" 2023-02-09 14:35:40 +00:00
Treehugger Robot
4b6b091442 Merge "[TeX] Updated the comments for the Histogram class" am: 4cdefccacf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2428473

Change-Id: Iac1ce91416aed4d27bbd7c7cefbac7da716722a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 11:32:52 +00:00
Treehugger Robot
4cdefccacf Merge "[TeX] Updated the comments for the Histogram class" 2023-02-09 10:38:16 +00:00
SongFerng Wang
46e5b65447 Merge "Add limitation for the password" am: 4c0ca9b87d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2428052

Change-Id: Icc9370704c3877e3dcb783b7fd7190441f7d8a63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 09:16:28 +00:00
Sorin Basca
caf7a70ba9 Merge "Pin tradefed dependencies to Java 11" am: e1cd5baf7a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2422059

Change-Id: I146c08b6cb3fba28771ec3bf3ef7053609b70b80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 09:13:33 +00:00
SongFerng Wang
4c0ca9b87d Merge "Add limitation for the password" 2023-02-09 09:02:34 +00:00
Sorin Basca
e1cd5baf7a Merge "Pin tradefed dependencies to Java 11" 2023-02-09 08:31:13 +00:00
Vova Sharaienko
2ce6904deb [TeX] Updated the comments for the Histogram class
Bug: 268161449
Change-Id: I37106e1f697bccf8e8b9a2b46760b4f5f0e9eb75
Test: m
2023-02-09 01:57:59 +00:00
Sudheer Shanka
9ea4186c7a Update OWNERS file for broadcasts related code.
Test: TH
Change-Id: I362fec085e42b80690688da96be9f29618bd8452
2023-02-09 01:37:55 +00:00
SongFerngWang
244d54d8a3 Add limitation for the password
The UI allows the password as below cases.
1. empty case
2. at least 4 characters and fewer than 16 characters

Bug: 263698307
Test: build pass and local test pass
Change-Id: Ie1952cde16f4f260be2ca42b00b0de1d21a9f208
Merged-In: I216d91c083dfe36cbda84481a8d0a308cfa8bfa1
2023-02-08 23:03:32 +00:00