654724 Commits

Author SHA1 Message Date
Treehugger Robot
70e7dd44b4 Merge changes Ic6e60752,I2b8b7e74
* changes:
  Test for contract between AndroidKeyStoreKey hash and equals.
  Keystore 2.0 SPI: Fix contract between equals and hashCode 2
2021-10-08 15:31:03 +00:00
Janis Danisevskis
2eef723ced Merge "Keystore 2.0 SPI: Fix NullPointerException in setKeyEntry." 2021-10-08 14:57:47 +00:00
Ben Miles
53e8b03bae Merge "Add empty package for critical event log with OWNERS" 2021-10-08 12:13:23 +00:00
Xin Li
c03b0fa033 Merge "Merge Android 12" 2021-10-07 23:50:15 +00:00
Janis Danisevskis
5fe5f2def0 Test for contract between AndroidKeyStoreKey hash and equals.
Test: atest KeystoreTests
Bug: 196118021

Merged-In: Ic6e60752faa986debe3d325f54242cffaa03b336
Change-Id: Ic6e60752faa986debe3d325f54242cffaa03b336
2021-10-07 16:39:39 -07:00
Janis Danisevskis
e36fe6bf46 Keystore 2.0 SPI: Fix contract between equals and hashCode 2
This fixes the contract between equals and hashCode in
AndroidKeystorePublicKey. The previous fix made only a reference
comparisson between certificate blobs. In this patch java.util.Arrays is
used to compare and compute the hash of the array.

Bug: 196118021
Test: See following CL.
Change-Id: I2b8b7e740fb377de39fd21f763e15cb00024b2fc
2021-10-07 16:24:46 -07:00
Treehugger Robot
8cc0f40cf2 Merge "Allow readability-identifier-length warnings" 2021-10-07 17:34:24 +00:00
Ray Essick
6297dd2771 Merge "Update media's mainline OWNERS" 2021-10-07 16:46:24 +00:00
Ben Miles
77b236e715 Add empty package for critical event log with OWNERS
Bug: 200263868
Test: Untested
Change-Id: Ib99594481754f2ebf48dc2adaa139f7d913b944d
2021-10-07 17:18:46 +01:00
Tyler Gunn
57704bd7a3 Merge "IMS: Propagate RTT capability of the called party to UI" 2021-10-07 15:35:35 +00:00
Janis Danisevskis
4ff6274fa7 Keystore 2.0 SPI: Fix NullPointerException in setKeyEntry.
Fix a NullPointerException when trying to insert SecretKey that already
exists.

Bug: 202146009
Test: atest android.keystore.cts.AndroidKeyStoreTest#testKeyStore_SetKeyEntry_ReplacedWithSameGeneratedSecretKey
Change-Id: If3a4bd6677ab3173c5c1a7c921ba567b7981662b
2021-10-07 08:24:42 -07:00
Treehugger Robot
9a2a261abd Merge "Improve Bundle/PersistableBundle docs" 2021-10-07 14:13:40 +00:00
Xin Li
531b8f4f26 Merge Android 12
Bug: 202323961
Merged-In: Iba1443da42161f4a41830081f2e1985b30444cc0
Change-Id: I2bebe60bb7114706a3ba6af35522268cdf031f41
2021-10-06 22:53:28 +00:00
Sarah Chin
ee05ff24d8 [automerger skipped] Merge "Update constructors for IRadioData classes" am: fa565ffc48 -s ours
am skip reason: Merged-In I8480df1164548dde491c6ae6251bbc2725c3eadf with SHA-1 80b8c7f128 is already in history

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

Change-Id: Iba1443da42161f4a41830081f2e1985b30444cc0
2021-10-06 19:21:11 +00:00
Sarah Chin
fa565ffc48 Merge "Update constructors for IRadioData classes" 2021-10-06 19:03:08 +00:00
Sarah Chin
958f299826 Merge "Update constructors for IRadioData classes" into stage-aosp-master 2021-10-06 16:38:18 +00:00
Bernardo Rufino
40e22dc991 Improve Bundle/PersistableBundle docs
around equals(), hashCode(), toString()

Test: TH passes
Bug: 122589814
Bug: 62611412
Bug: 122589479
Change-Id: Ia644e437f9b5642228c2a7138b0518f73ef2996c
2021-10-06 15:25:33 +00:00
Jeff Sharkey
28d0fdba40 Merge "Mark Soong maintainers as a last resort suggestion" am: 2885623021
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1846454

Change-Id: I6da8604f80a290bca170bbdf1246bae1efa4cef3
2021-10-06 14:34:19 +00:00
Jeff Sharkey
2885623021 Merge "Mark Soong maintainers as a last resort suggestion" 2021-10-06 14:14:06 +00:00
Liz Kammer
ff8e5c0c3f Mark Soong maintainers as a last resort suggestion
Soong having OWNERS in frameworks/base is useful to enable LSCs;
however, they shouldn't appear in review suggestions except as a
fallback.

Test: n/a
Change-Id: I86618b66e51893908478def9fc455a3dfde146f0
2021-10-06 09:15:46 -04:00
Treehugger Robot
3aaf984908 Merge "Avoid full unparcelling where possible in Bundle" am: 3ad4ecc296
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842226

Change-Id: I0aef93d99d83f20b22753e8e1d41cfb5c4b5cdce
2021-10-06 12:25:47 +00:00
Treehugger Robot
3ad4ecc296 Merge "Avoid full unparcelling where possible in Bundle" 2021-10-06 12:06:59 +00:00
Sarah Chin
e3070d75e9 Update constructors for IRadioData classes
Test: atest FrameworksTelephonyTests
Bug: 198331673
Change-Id: I8480df1164548dde491c6ae6251bbc2725c3eadf
Merged-In: I8480df1164548dde491c6ae6251bbc2725c3eadf
2021-10-06 10:16:42 +00:00
Sarah Chin
80b8c7f128 Update constructors for IRadioData classes
Test: atest FrameworksTelephonyTests
Bug: 198331673
Change-Id: I8480df1164548dde491c6ae6251bbc2725c3eadf
Merged-In: I8480df1164548dde491c6ae6251bbc2725c3eadf
2021-10-06 10:14:30 +00:00
Bernardo Rufino
3f3c3a02c2 Merge "Change defusing for lazy bundles" am: fdd1771a4a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842142

Change-Id: Ia156038712d6a25acfea8aaa6ac1d257afa95345
2021-10-06 08:57:27 +00:00
Bernardo Rufino
fdd1771a4a Merge "Change defusing for lazy bundles" 2021-10-06 08:43:17 +00:00
Treehugger Robot
3b449c249f Merge "Fixing a build breakage caused by an incorrect link. Version code for Android T doesn't exist yet, removing the link." am: 6a0afe1846
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845234

Change-Id: I8249e3a7426ee9f3d2d22ba6ae093d217980acc2
2021-10-05 18:36:56 +00:00
Treehugger Robot
6a0afe1846 Merge "Fixing a build breakage caused by an incorrect link. Version code for Android T doesn't exist yet, removing the link." 2021-10-05 18:15:36 +00:00
Treehugger Robot
31d3ee2188 Merge "media: use MediaProperties.resolution_limit_32bit()" am: b721e9b48d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1840914

Change-Id: Ib8b212601771c279a90eb8c29fb30bd1e5ecd0a3
2021-10-05 17:33:32 +00:00
TreeHugger Robot
d34ebacb36 Merge "Use AttributionSource Builder" into stage-aosp-master 2021-10-05 17:17:13 +00:00
Treehugger Robot
b721e9b48d Merge "media: use MediaProperties.resolution_limit_32bit()" 2021-10-05 17:13:35 +00:00
Jacob Hobbie
183e274d57 Fixing a build breakage caused by an incorrect link. Version code for
Android T doesn't exist yet, removing the link.

Test: presubmit, comments only, should just be "is build fixed"
Bug: 202151792
Change-Id: I2123f804aaed39eb7d31f25058c59a3c1df4d7d1
2021-10-05 09:11:39 -07:00
Alex Johnston
c8c3e89dce Merge "Revert "Revert "Cherrypicking flags and override methods for all..."" am: 5c35d3bce6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845059

Change-Id: I90e8a4d567fe2de9ab765806fc7bd3aba4fe0845
2021-10-05 15:11:32 +00:00
Alex Johnston
5c35d3bce6 Merge "Revert "Revert "Cherrypicking flags and override methods for all..."" 2021-10-05 14:58:57 +00:00
Alex Johnston
4e8851d0d8 Revert "Revert "Cherrypicking flags and override methods for all..."
Revert "Revert "Required change for adding overload method for r..."

Revert submission 1842720-revert-1836473-receiverChangesinAOSP-FWJQDTADTI

Reason for revert: DroidMonitor-triggered revert due to breakage, bug b/202144225
Reverted Changes:
I03409ea39:Revert "Required change for adding overload method...
I583a11d2a:Revert "Cherrypicking flags and override methods f...

Change-Id: I5cdf9c74d51a259fdaa43dfdc9423d22145eac60
2021-10-05 14:57:10 +00:00
Treehugger Robot
e18c4d7d32 Merge "Fix SystemAudioAutoInitiationAction not started" am: e6bebf94ed
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1772932

Change-Id: Ifba3a65691d817ff0a4167efb225a002948ac493
2021-10-05 13:06:14 +00:00
Treehugger Robot
e6bebf94ed Merge "Fix SystemAudioAutoInitiationAction not started" 2021-10-05 12:49:29 +00:00
Bernardo Rufino
9e26212dac Avoid full unparcelling where possible in Bundle
and put a warning where it's not possible. This is to make sure we know
when to touch bundles provided by apps.

In this CL:
* deepCopy() now doesn't deserialize lazy objects before copying. It
  doesn't copy them either, it merely passes them into the new map as
  the same reference. This works because we implemented fine-grained
  locking into each lazy value, so concurrent access won't be a problem.
  Furthermore, LazyValue caches the deserialized object, so we'd still
  honor the contract of deepCopy() that "Other types of objects (such
  as Parcelable or Serializable) are referenced as-is and not copied in
  any way". I had to perform one extra check in the synchronized block
  in LazyValue to guarantee this (double-checked locking), I explain
  that in the comments.
* Removed filterValues() and codepaths that used it. This was created
  with the purpose of removing items whose classes weren't available to
  the system to prevent crashes coming from full deserialization. This
  is not a concern anymore with lazy bundle, hence we can remove the
  codepaths altogether (see email for more details).
* Put warnings in javadoc of getMap() and PeristableBundle().

Test: Boots
Test: atest -d android.os.cts.ParcelTest android.os.cts.BundleTest android.os.BundleTest android.os.ParcelTest
Bug: 195622897
Change-Id: I14bb6a7874814f42cbcc6b5fd372c42752aa74c8
2021-10-05 13:39:36 +01:00
Bernardo Rufino
0c5074ede7 Change defusing for lazy bundles
With lazy bundle, exceptions thrown by deserialization of custom items
moved from being thrown in initializeFromParcelLocked() (when the bundle
is first touched) to being thrown in getValueAt() (whenever the item is
retrieved), which means they were escaping the defuse logic that caught
those exceptions. So, now also catching these exceptions in
getValueAt(), however, here we can be much less drastic, instead of
erasing the bundle, we can simply remove the bad element.

This also means we don't need to log wtf in initializeFromParcelLocked()
if sShouldDefuse = true but the bundle is not marked as defusable, since
touching the bundle doesn't carry the same consequences as before
go/lazy-bundle. So, I moved that log to unparcel(itemwise = true), ie.
whenever the entire bundle is deserialized on purpose.

Now, 2 types of defusing can happen:
1. If the (custom) item we're retrieving caused the exception, we'll
   remove the item and return null.
2. If the exception was raised during partial deserialization, that is,
   during the read of the map and its basic types (while skipping custom
   types), the map will be left empty. I believe only manually written
   parcels would cause this type of exception and if an exception is
   raised here it will also be raised in the final destination too,
   afaict. Because of this, we can now touch app-provided bundles
   without fear of clobbering the data on its way to the final
   destination.

Following conversation on previous CL, narrowed exception raised in case
of unknown type to be BadParcelableException.

Test: atest -d android.os.cts.ParcelTest android.os.cts.BundleTest android.os.BundleTest android.os.ParcelTest
Bug: 195622897
Change-Id: I4746140f63482a9ea475aac25897a447737393e4
2021-10-05 11:40:13 +01:00
Treehugger Robot
ccf3cedda8 Merge "Round 3: Fix flakiness of testNativeCrash" am: 5757f89ddc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1843421

Change-Id: I5b7038ac40d723829606c8d0a76903ad104cb94b
2021-10-05 09:29:03 +00:00
Treehugger Robot
5757f89ddc Merge "Round 3: Fix flakiness of testNativeCrash" 2021-10-05 09:16:07 +00:00
Treehugger Robot
0f423ebc5e Merge "Fix the device summary shown twice issue" am: 0a80b6a3bc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842101

Change-Id: Id343c16720f499514a3832cc7f92fb5c25beadaf
2021-10-05 06:36:29 +00:00
Treehugger Robot
0a80b6a3bc Merge "Fix the device summary shown twice issue" 2021-10-05 06:01:30 +00:00
Jacky Kao
1a894180c9 Merge "Revert "Cherrypicking flags and override methods for allowing dy..."" am: 98ff8ecdaa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842721

Change-Id: Ieaed4fcc2fa97db551a70f4a3076b4237acfb8ab
2021-10-05 02:08:29 +00:00
Jacky Kao
98ff8ecdaa Merge "Revert "Cherrypicking flags and override methods for allowing dy..."" 2021-10-05 01:55:36 +00:00
Jacky Kao
0827cf0cca Revert "Cherrypicking flags and override methods for allowing dy..."
Revert "Required change for adding overload method for registerR..."

Revert submission 1836473-receiverChangesinAOSP

Reason for revert: <INSERT REASONING HERE>
Reverted Changes:Making build break
I906ce9eb0:Required change for adding overload method for reg...
I9a16f566c:Cherrypicking flags and override methods for allow...

Change-Id: I583a11d2a23651db24acde303d522a5faae15c6b
2021-10-05 01:48:25 +00:00
Jacob Hobbie
7e5da1ee2e Merge "Cherrypicking flags and override methods for allowing dynamically registered receivers to mark themselves explicitly as exported or not exported." am: 316e0e8336
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1836473

Change-Id: I39049e42feb66c3fa3f0ebdef8e175ae86d5d410
2021-10-05 01:24:33 +00:00
Jacob Hobbie
316e0e8336 Merge "Cherrypicking flags and override methods for allowing dynamically registered receivers to mark themselves explicitly as exported or not exported." 2021-10-05 01:10:46 +00:00
Jeff Sharkey
f925faed18 Merge "Delete some ide autogen files" am: 0da8689915
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1818908

Change-Id: I9a317b53cd4aa19b6e3c54755df01dd26f5bdecf
2021-10-04 23:26:13 +00:00
Jeff Sharkey
0da8689915 Merge "Delete some ide autogen files" 2021-10-04 23:05:23 +00:00