Commit Graph

654644 Commits

Author SHA1 Message Date
Bernardo Rufino
e9ffc7f08f Merge "Correct Parcel value types" am: 861d2e12cb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1838973

Change-Id: I0ad34ad29a54cf58ac37ec347a59b45a59959ea1
2021-10-01 09:58:17 +00:00
Bernardo Rufino
861d2e12cb Merge "Correct Parcel value types" 2021-10-01 09:46:40 +00:00
Anton Hansson
f218033ccf Merge "Add build rule to merge annotation zips" into stage-aosp-master 2021-10-01 09:32:29 +00:00
Bernardo Rufino
5539926c4a Correct Parcel value types
* Bundle supports types char, char[], short[], float[] which were
  falling back to serializable handling in Parcel because readValue()
  didn't have specific support for those types. Adding support in Parcel
  to avoid the need for length-prefixing and to improve performance.
  Curiously some of those had read/write methods already.
* Updated Bundle to just pull the types above from the map since those
  won't be lazy values anymore.
* We were missing a few custom type containers in our list of
  length-prefixed types and we were listing Bundle unnecessarily as
  length-prefixed since Bundle itself is already length-prefixed and
  copies the correspondent section of the parcel internally.

Test: atest -d android.os.cts.ParcelTest android.os.cts.BundleTest android.os.BundleTest android.os.ParcelTest
Bug: 195622897
Change-Id: I1e15d59d883311685ffa32ece1f5a00e01bf6aea
2021-10-01 09:07:49 +01:00
Hao Ke
e01e2ae588 Merge "Adding typed Parcel read/write APIs." am: d3199a6084
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1832336

Change-Id: I8a2341eef230f078c53b31a03478fa30e3774147
2021-09-30 21:31:36 +00:00
Hao Ke
d3199a6084 Merge "Adding typed Parcel read/write APIs." 2021-09-30 21:13:54 +00:00
Steven Moreland
73c85c59f7 Merge "Parcel: markForBinder -> obtain(IBinder)" am: fb7a6db2a2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1840654

Change-Id: Ibde592b1d34c2e7143c961c7d2e2029d0fbfd82f
2021-09-30 18:16:37 +00:00
Rahul Sabnis
4a39b54ec1 Merge "Add BluetoothDevice#connect and BluetoothDevice#disconnect as System APIs" into stage-aosp-master 2021-09-30 18:04:55 +00:00
Steven Moreland
fb7a6db2a2 Merge "Parcel: markForBinder -> obtain(IBinder)" 2021-09-30 17:59:47 +00:00
Anton Hansson
bab3cc34de Add build rule to merge annotation zips
This target produces nearly identical contents to the build target
framework-doc-stubs (the only diffs are in whitespace). Using this
module in the SDK zip will allow changing the inputs of
framework-doc-stubs to java sources that don't have all the annotations
(the jar stubs).

Bug: 187397779
Test: m sdk-annotations.zip and diff with framework-doc-stubs zip
Change-Id: Id163473c455f25c5f31c965d907c0c3b0e7755fc
2021-09-30 18:57:31 +01:00
Sam Gilbert
182a0a144e Merge "Fix writeToParcel parameter nullability" am: 55fb62a515
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1840533

Change-Id: Ieabc166af0086501cc638cffa7dc6f5960f67172
2021-09-30 17:24:46 +00:00
Sam Gilbert
55fb62a515 Merge "Fix writeToParcel parameter nullability" 2021-09-30 17:08:19 +00:00
Hao Ke
8a86e7d51e Adding typed Parcel read/write APIs.
Description:

Added replacements of `readList`, `readParcelable` and
`readParcelableCreator` APIs.

To avoid unexpected types of objects being unparcelled,
ideally clients would use the readTypedXXX() methods that
take the parcelable creator. However, this won’t be an option
for use cases involving deserializing children objects
inherited from non-final parcelable or serializable objects.
Currently out of ~4k parcelable classes, only ~1.5k
are marked as “final” in the platform. Hence it would be
necessary to introduce new replacements that take
an extra Class<T> parameter and before deserializing
we check that the class written on the wire is the
same or a descendant from the one provided as argument.

Doing so could enhance the security of Parcel deserialization,
More details can be found at go/safer-parcel.

Test: atest -d android.os.cts.ParcelTest
Bug: 195622897
Change-Id: Ie9a4cb4c3d6f1805b14df7b703aef43e2993d459
2021-09-30 16:31:16 +00:00
Bernardo Rufino
d60218eb45 Merge "Log.wtf in mismatch + tests" am: 1cdbc7cbd1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1837194

Change-Id: I185410ce82ca057b6767d5ca0ff0368f046a1dff
2021-09-30 10:31:03 +00:00
Bernardo Rufino
1cdbc7cbd1 Merge "Log.wtf in mismatch + tests" 2021-09-30 10:17:45 +00:00
TreeHugger Robot
8efe26afd6 Merge "Remove frameworks/base/apex/appsearch and associated tests" into stage-aosp-master 2021-09-30 04:28:04 +00:00
Baligh Uddin
d4f12c6ea6 Remove frameworks/base/apex/appsearch and associated tests
BUG: 192108282
Test: TH
Merged-In: I38469ad5df100e90aba81bbdc82078b568301f09
Change-Id: Ib7e97c6ee7dff1c5d0aad2c21635e74510d523a6
2021-09-29 23:40:11 +00:00
Suprabh Shukla
694cf0f6af Merge "Redact key value from log when DEBUG is false" am: 17a7d79ff4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1458401

Change-Id: Iea902e93f038cd3a06d63cf6c6cdd149c873df79
2021-09-29 23:39:49 +00:00
Suprabh Shukla
17a7d79ff4 Merge "Redact key value from log when DEBUG is false" 2021-09-29 23:25:21 +00:00
Steven Moreland
8c15362858 Parcel: markForBinder -> obtain(IBinder)
So that the API more closely matches intended usage, as requested.

Bug: 175814583
Test: aidl_integration_test
Change-Id: I2fb5f2d5059d7f9cd9e034a4d0d2e7aa63692067
2021-09-29 16:17:45 -07:00
Rahul Sabnis
d0afc1895a Add BluetoothDevice#connect and BluetoothDevice#disconnect as System APIs
Tag: #feature
Bug: 201462141
Test: Manual
Change-Id: I79332c63e99efd9e90036ba2c693835151cc1240
2021-09-29 23:15:37 +00:00
Brad Ebinger
e211df78dc Merge "Add a device overlay for radio off delay due to IMS deregistration" am: 6a5e594515
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1832710

Change-Id: I00bf7a8ddc67cd819e16776b9ec62bfe72bb3db6
2021-09-29 18:31:25 +00:00
Brad Ebinger
6a5e594515 Merge "Add a device overlay for radio off delay due to IMS deregistration" 2021-09-29 18:15:58 +00:00
Sam Gilbert
e3e9e3f6d4 Fix writeToParcel parameter nullability
Test: Existing tests
Bug: 144855352
Change-Id: Id3e0de043eee77e1dadf3b4db5d6d4bddd9e8247
2021-09-29 13:54:34 -04:00
TreeHugger Robot
d7cef086ca Merge "API renaming asked by API Council" into stage-aosp-master 2021-09-29 16:49:50 +00:00
Etienne Ruffieux
4c70432d82 API renaming asked by API Council
Renamed all "cancelled" to "canceled" for PendingIntent.

Tag: #feature
Bug: 201405682
Test: atest android.app.cts.PendingIntentTest#testCancelListener
Change-Id: I0f5457f58836c6e80845dcd4d874a810008a320e
2021-09-29 13:08:09 +00:00
Bernardo Rufino
95ace87925 Log.wtf in mismatch + tests
Log mismatches as wtf to be able track those. Also added unit tests
around kindofEquals() and r/w mismatches.

Test: atest -d android.os.cts.ParcelTest android.os.cts.BundleTest android.os.BundleTest android.os.ParcelTest
Bug: 195622897
Change-Id: I361dd144b23975eedc8b19ed65457a1c5405936e
2021-09-29 13:51:43 +01:00
Edward Savage-Jones
46b4ba4201 Redact key value from log when DEBUG is false
See bug for details

Bug: 170653379
Test: see bug
Change-Id: I713fd8c03444167faf35a170b885c38af5482e31
2021-09-29 06:53:42 +00:00
Xin Li
5ae099b977 Merge "Merge SP1A.210812.016" into stage-aosp-master 2021-09-29 05:31:38 +00:00
Luke Huang
2c500e21bd Merge "Keep the native mdns daemon alive for pre-S application" am: 2adba7dd4a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1763368

Change-Id: Id0f1e097c9903897a35846e0ec6026d29228a39a
2021-09-29 03:50:49 +00:00
Luke Huang
2adba7dd4a Merge "Keep the native mdns daemon alive for pre-S application" 2021-09-29 03:35:20 +00:00
TreeHugger Robot
f2753ce65f Merge "Expose Phone.ENTERPRISE_CONTENT_URI as systemApi" into stage-aosp-master 2021-09-28 21:09:57 +00:00
Xin Li
8891d70334 Merge SP1A.210812.016
Merged-In: I8b62b9b9d7ae271bc623764d545db1320b4dc64f
Change-Id: I458ed7f2eb8603f5e89c1d73bc0f0d52b826973e
2021-09-28 19:26:36 +00:00
Treehugger Robot
5f35a1d2d3 [automerger skipped] Merge "Fix stuck HDMI-CEC actions after boot" am: d801feda70 -s ours
am skip reason: Merged-In I0050ca927bdba939b0b0030a6aa2f6235b11ff5c with SHA-1 62eafa258a is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1794410

Change-Id: Ia70e96971d08dd32587c38e344e97f145573ba0d
2021-09-28 17:29:20 +00:00
Treehugger Robot
d801feda70 Merge "Fix stuck HDMI-CEC actions after boot" 2021-09-28 17:16:41 +00:00
William Escande
ce093d6738 Expose Phone.ENTERPRISE_CONTENT_URI as systemApi
Also add INTERACT_ACROSS_USERS as a requires permission
Bug: 194119078
Tag: #refactor
Test: Build

Change-Id: Iccc093d9224ed34eb76e64561607dac6085cb876
2021-09-28 18:11:33 +02:00
Mohammad Islam
430ef242c4 [automerger skipped] Merge "Fix broken test on GSI branch" am: 0fe46d947a -s ours
am skip reason: Merged-In Ibdd72ec062538838ad60b847ee1ff31a792520a3 with SHA-1 ecafad4383 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1836298

Change-Id: If953a25bd4c4a03cd336570a7dd7113db161542e
2021-09-28 15:56:13 +00:00
Mohammad Islam
0fe46d947a Merge "Fix broken test on GSI branch" 2021-09-28 15:37:08 +00:00
TreeHugger Robot
310bf06da5 Merge "DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged" into stage-aosp-master 2021-09-28 14:13:04 +00:00
Yan Han
85b7711700 Fix stuck HDMI-CEC actions after boot
Ensures that all queued actions on local devices are started after
boot. Previously, an unstarted SendKeyAction could stick around after
boot, blocking any future SendKeyAction from being created.

Unit tests omitted because of AOSP incompatibilities.

Bug: 193188675
Test: atest HdmiControlServiceTest#normalBoot_queuedActionsStartedAfterBoot

      manual test: spam volume up on boot with IR volume control enabled

Change-Id: I0050ca927bdba939b0b0030a6aa2f6235b11ff5c
Merged-In: I0050ca927bdba939b0b0030a6aa2f6235b11ff5c
(cherry picked from commit 22dc89a89f)
2021-09-28 14:00:48 +00:00
TreeHugger Robot
5d7bfac82a Merge "Fix stuck HDMI-CEC actions after boot" into stage-aosp-master 2021-09-28 14:00:03 +00:00
Yan Han
62eafa258a Fix stuck HDMI-CEC actions after boot
Ensures that all queued actions on local devices are started after
boot. Previously, an unstarted SendKeyAction could stick around after
boot, blocking any future SendKeyAction from being created.

Bug: 193188675
Test: atest HdmiControlServiceTest#normalBoot_queuedActionsStartedAfterBoot

      manual test: spam volume up on boot with IR volume control enabled

Change-Id: I0050ca927bdba939b0b0030a6aa2f6235b11ff5c
Merged-In: I0050ca927bdba939b0b0030a6aa2f6235b11ff5c
(cherry picked from commit 22dc89a89f)
(cherry picked from commit 66b6a8cc17d3c2f4d7d3a09369f7538633c43259)
2021-09-28 12:22:10 +00:00
William Escande
921efdf1bd Merge "Migrate Cellbroadcast modules to use modules-utils" into stage-aosp-master 2021-09-28 12:00:08 +00:00
Anton Hansson
b370ca080a Merge "Add a tool for merging annotation.zip files" am: 0e4260d772
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1837313

Change-Id: I3f2685923a00e0ef8bf9c6261eae93b5ede287b0
2021-09-28 10:46:16 +00:00
TreeHugger Robot
b4f626d13e Merge changes from topic "expose-pending-intent" into stage-aosp-master
* changes:
  Reduce PendingIntent memory allocation
  Expose PendingIntent.addCancelListener
2021-09-28 10:39:52 +00:00
Mohammad Samiul Islam
10284429b8 Merge "Fix broken test on GSI branch" into stage-aosp-master 2021-09-28 10:36:09 +00:00
Anton Hansson
0e4260d772 Merge "Add a tool for merging annotation.zip files" 2021-09-28 10:27:22 +00:00
Xin Li
73dba779b2 DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged
Merged-In: I59d1aa9bf89cf29d59e72207d4e8e5900c4d5666
Change-Id: Idd10f8e55c4ec1d7e158e8627f10debccccb177c
2021-09-28 07:55:17 +00:00
Treehugger Robot
799b63acc2 Merge "Update permissions OWNERS" am: dbbb827a79
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1838051

Change-Id: Ic4d3da57e701c0da40c55bd44d73df0edce9a911
2021-09-28 04:19:01 +00:00
Treehugger Robot
dbbb827a79 Merge "Update permissions OWNERS" 2021-09-28 04:04:52 +00:00