Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
692,012 Commits 3 Branches 0 Tags
41fa371e64b5c81c64664c9b06e487f0e7ad071c
Commit Graph

692012 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kyunglyul Hyun
41fa371e64 Merge "Correct stream type for BLE input device" am: 2c7275d641 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2089446

Change-Id: I2ac829ab63858a3988bf437e9741cdc653c13575
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 02:31:07 +00:00
Kyunglyul Hyun
2c7275d641 Merge "Correct stream type for BLE input device" 2022-05-12 01:27:03 +00:00
Treehugger Robot
3813698ac3 Merge "Skip ApkVerityTest on HWASan." am: fda1fe2400 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2094290

Change-Id: If2ceb8af0db97856f74f1718e97dfae0870c0660
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 00:58:10 +00:00
Nate Myren
36ea7c6cff Merge "Fix indicator can't disappear in some cases" am: bd6308ac92 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2041184

Change-Id: I9b122468405b44ec0f1b109a29ef61d598352d68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 00:56:43 +00:00
Treehugger Robot
fda1fe2400 Merge "Skip ApkVerityTest on HWASan." 2022-05-12 00:00:55 +00:00
Nate Myren
bd6308ac92 Merge "Fix indicator can't disappear in some cases" 2022-05-11 22:45:36 +00:00
Florian Mayer
27c8be497e Skip ApkVerityTest on HWASan. 
This is consistently broken.

Change-Id: I0e68d63a54923987aec5f2e6e0d2304c32fff515
 2022-05-11 21:11:57 +00:00
Anton Hansson
d708548986 Merge "Use lint database from api_version_public" am: 39ebb3b0c0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2092243

Change-Id: Id40b4f020f8f7da01beac428f3ad955cb6fc3a72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:41:59 +00:00
Anton Hansson
39ebb3b0c0 Merge "Use lint database from api_version_public" 2022-05-11 08:11:45 +00:00
Roman Kiryanov
7d4b80089c Merge "Label emulator clipboards with SUPPRESS_CLIPBOARD_OVERLAY" am: c079a82c70 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2094923

Change-Id: Ie3807e20120b5a5a808e0d0faf0fc6c29cb390ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 03:37:59 +00:00
Roman Kiryanov
c079a82c70 Merge "Label emulator clipboards with SUPPRESS_CLIPBOARD_OVERLAY" 2022-05-11 03:06:57 +00:00
Dmitry Dementyev
69bdf63e4d Merge "Ignore tests in RecoverableKeyStoreManagerTest" am: 197653158e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2095183

Change-Id: I6472083a466a460fbabe00ebdb12003931153ab3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 02:23:40 +00:00
Kyunglyul Hyun
bc41187257 Correct stream type for BLE input device 
Correct the stream type of an active BLE input device
as STREAM_DEFAULT.

Bug: 230556991
Test: Switching BLE -> Phone -> BLE to check if Blutooth volume
is recovered (A2DP is tested as well to ensure no regression)

Change-Id: I883cce5e2525d6a10970fe38bd36e676438d016a
Merged-In: I0dc289d9b670133928513aa5e5c1edd240351aef
 2022-05-11 11:22:05 +09:00
Dmitry Dementyev
197653158e Merge "Ignore tests in RecoverableKeyStoreManagerTest" 2022-05-11 01:51:51 +00:00
Dmitry Dementyev
7ea5f4fff7 Ignore tests in RecoverableKeyStoreManagerTest 
Expired cerificate causes tests failure.

Bug: 231667368
Test: N/A
Change-Id: I2bbc952a95f983d0ea4d85e519b55322a5d88568
 2022-05-10 23:32:17 +00:00
Kiwon Park
68c6469e54 Merge "Populate carrier id in anomaly reports." am: cf4cc8c1b9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2094563

Change-Id: I39cd16261249fe2ccaa4e3439d9b41080f22f637
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:59:48 +00:00
Roman Kiryanov
f3edf38753 Merge "Add wrappers around IO functions to check the return values" am: 217b0fdbda 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2092589

Change-Id: Iafb1031ffc60c51959c14199667a98ed300ce305
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:57:11 +00:00
Vinh Tran
f4f0c7d545 Merge "Unset platform_apis if sdk_version is already set" am: f1a6e001fd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2085943

Change-Id: I79e46bb3007137846ad7f189b791b5d8c6bcd8cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:56:44 +00:00
Roman Kiryanov
f7a05bd2fa Label emulator clipboards with SUPPRESS_CLIPBOARD_OVERLAY 
Emulator QA found this popup too noisy
to be useful.

Bug: 222604628
Test: boot the emulator, copy on the host
Test: check if there is no popup in the guest
Change-Id: I46323732a64202dabdd3a43bf17df7e7f3f9dd9c
Signed-off-by: Roman Kiryanov <rkir@google.com>
 2022-05-10 13:56:17 -07:00
Neil Fuller
1aa92e3754 Merge "Add a Y2038 check into the time_detector" am: 808b9f1b73 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1994850

Change-Id: I791a25c36760a8828eea27e11c5dfc5bdd9e8d0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:56:13 +00:00
Eran Messeri
ad0c8bb23d Merge "Keystore: Support Ed25519 keys" am: fa8aac4629 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2092071

Change-Id: I33a8410b48c417df98175c627f542ed5ebdc94c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:55:06 +00:00
Kiwon Park
cf4cc8c1b9 Merge "Populate carrier id in anomaly reports." 2022-05-10 20:13:07 +00:00
Roman Kiryanov
217b0fdbda Merge "Add wrappers around IO functions to check the return values" 2022-05-10 16:54:27 +00:00
Kiwon Park
7b2da8207f Populate carrier id in anomaly reports. 
Test: statsd_testdrive
Bug: 188462677
Change-Id: Id3859dad6a64be61d38865562887879878d08af9
(cherry picked from commit 9e41ab3c4b)
Merged-In: Id3859dad6a64be61d38865562887879878d08af9
 2022-05-10 16:31:47 +00:00
Vinh Tran
f1a6e001fd Merge "Unset platform_apis if sdk_version is already set" 2022-05-10 15:29:23 +00:00
Neil Fuller
808b9f1b73 Merge "Add a Y2038 check into the time_detector" 2022-05-10 11:44:09 +00:00
Eran Messeri
fa8aac4629 Merge "Keystore: Support Ed25519 keys" 2022-05-10 11:38:58 +00:00
Neil Fuller
2ff5ec1aad Add a Y2038 check into the time_detector 
Add a Y2038 check into the time_detector and add infrastructure to allow
command-line testing to confirm it works.

This is before removing a Y2038 check from NITZ parsing code in the
telephony process. After this change, Androdi will consistently block
>= Y2038 suggestions, not just time signals that come in via telephony.

The initial checks attempt to limit the restriction to devices with
32-bit ABIs, since the main issue we're aware of is that time_t is a
32-bit signed int under bionic, hence there could be issues with that
type in 32-bit processes on 32-bit / mixed 32/64-bit devices.

Bug: 204193177
Test: adb shell cmd time_detector suggest_network_time --reference_time 2480587 --unix_epoch_time 1646473966056
Test: Run with 32-bit + 64-bit only builds, inspect adb shell dumpsys time_detector
Merged-In: Ib9d6472f5ca7a62d59b3224f1845846f99a0b52d
Change-Id: Ib9d6472f5ca7a62d59b3224f1845846f99a0b52d
 2022-05-10 10:01:58 +00:00
Eran Messeri
51d7088287 Keystore: Support Ed25519 keys 
Implement support for Ed25519 signing keys in Android Keystore.
Because Conscrypt does not yet handle those keys, the Keystore classes
implement EdECPublicKey directly and parse the keys.

Specifically, AndroidKeyStoreEdECPublicKey can take an encoded X.509 key
specification, validate the encoding is of an Ed25519 key, then parse
the oddity and Y point on the curve.
RFC8032 describes EdDSA signature scheme, particularly Ed25519.
RFC8410, Section 3, defines the OID for Ed25519 keys (1.3.101.112).
RFC8410, Section 4, describes the encoding of the public key.

Bug: 195309719
Bug: 194359292
Bug: 214203951
Test: atest android.security.keystore2.AndroidKeyStoreEdECPublicKeyTest
Merged-In: I07b793cbd5029630768368ad4a863bbc1c828ced
Change-Id: I477e87658b98bc3340da9a062d81508aad041c07
 2022-05-10 10:19:39 +01:00
Roman Kiryanov
8883415f71 Add wrappers around IO functions to check the return values 
Os.read and Os.write don't throw exceptions if
`fd` is closed on the other end.

Bug: 231345789
Test: save a snapshot
Test: use clipboard both, check if there is no
Test: infinite loops which sets the clipboard
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: If98fb3adf58f2e4e13d483b78ea05ea9d8d61b58
 2022-05-09 20:14:39 -07:00
Vinh Tran
625cb76f14 Unset platform_apis if sdk_version is already set 
Unsetting platform_apis while keeping sdk_version as is does not affect
the module's deps

Test: m queryview && builozer 'print soong_module_deps' :target (to
ensure the deps aren't affected

Bug: 219755537
Change-Id: Ic0d02c5e7fec24843e4cd2541cc5106381c7180e
 2022-05-09 19:36:38 +00:00
Vinh Tran
31679bad73 Merge "Revert "Remove sdk_version if platform_apis is set"" am: aca9b26c93 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2084725

Change-Id: I9feaf75b0219aea85af7c3d02b5bfe415ddb65d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 17:07:09 +00:00
Treehugger Robot
a6f6e4f53f Merge "Keep ArtStasLog write() functions" am: c8f3e70f59 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2089105

Change-Id: Ia4072e3cbc4ac374720b120001830b256220a40a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 17:06:38 +00:00
Jack Yu
42f8a74991 Merge "Improved data fail cause debug message" am: 78f46dd41e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2091481

Change-Id: I014c183887231d085a533dddc37772ae02f97ec0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 17:04:55 +00:00
Vinh Tran
aca9b26c93 Merge "Revert "Remove sdk_version if platform_apis is set"" 2022-05-09 16:51:02 +00:00
Treehugger Robot
c8f3e70f59 Merge "Keep ArtStasLog write() functions" 2022-05-09 16:00:47 +00:00
Jack Yu
78f46dd41e Merge "Improved data fail cause debug message" 2022-05-09 15:47:21 +00:00
Eric Biggers
8601ad8110 Merge changes from topic "deny-create-user-dirs" am: 350433edc8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2077724

Change-Id: Idcba161a8ade26be5df817b7e77167ab45d1eb40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 15:18:59 +00:00
Eric Biggers
350433edc8 Merge changes from topic "deny-create-user-dirs" 
* changes:
  Zygote: relabel to either system_userdir_file or system_data_file
  BrightnessTracker: don't create stuff directly in /data/system_de
 2022-05-09 14:45:11 +00:00
Vinh Tran
cfb43cae24 Revert "Remove sdk_version if platform_apis is set" 
This reverts commit 160172d92d.

Reason for revert: Should have removed platform_apis instead because
removing platform_apis doesn't change the module deps (done in aosp/2085943)

Test: CI
Bug: 219755537
Change-Id: I9657e569d942bf845c79352a042553c6fc6b0fd3
 2022-05-09 13:18:44 +00:00
Anton Hansson
247c5f26ec Use lint database from api_version_public 
These two databases are (nearly) identical but the latter is generated
in a much more efficient way.

The diffs are very minor and it's not clear to me which versions is more
correct than the other, though I'm fairly confident they don't matter.

https://paste.googleplex.com/5567994005553152

Droidstubs now support using the api-versions.xml from another
droidstubs module, so reuse the one from api_versions_public
in framework-doc-stubs.

Bug: 187398174
Test: diff api-versions.xml
Test: diff stubs of framework-doc-stubs
Change-Id: I774be9097e97d6b180fe54d799c94515780be6ec
 2022-05-09 12:18:46 +00:00
Jack Yu
fcb5553d10 Improved data fail cause debug message 
Test: Manual
Fix: 228611718
Merged-In: Ic3a5a64a4e57ed49dd4445ff31018b78e833f73f
Change-Id: Ic3a5a64a4e57ed49dd4445ff31018b78e833f73f
 2022-05-08 23:28:05 -07:00
Jack Yu
d5718c7c66 Merge changes from topics "enterprise_internet", "set_data_enabled" am: 0d0729a62f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2091527

Change-Id: I8650138a61c7445fa4c1d4b6029aca69d9854db1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 04:51:17 +00:00
Sarah Chin
04470f4d33 SetDataEnabled indicate calling package am: 967c10b103 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2091526

Change-Id: I7d973e7dbfbec2648c063b51eea7ff67dbbf6fae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 04:51:07 +00:00
Jack Yu
0d0729a62f Merge changes from topics "enterprise_internet", "set_data_enabled" 
* changes:
  Improved the network type to string
  SetDataEnabled indicate calling package
 2022-05-09 03:19:56 +00:00
Jack Yu
1780b1aece Improved the network type to string 
Bug: 227781379
Test: atest DataNetworkControllerTest DataProfileManagerTest
Merged-In: I6d09ade1650e226a965547e3f78e74f3f2ffec59
Change-Id: I6d09ade1650e226a965547e3f78e74f3f2ffec59
 2022-05-08 13:42:20 -07:00
Sarah Chin
967c10b103 SetDataEnabled indicate calling package 
Test: atest TelephonyManagerTest
Bug: 226149142
Merged-In: I769437e9332f27c0990c37f60ad6d9db284e86cf
Change-Id: I769437e9332f27c0990c37f60ad6d9db284e86cf
 2022-05-08 12:22:43 -07:00
Treehugger Robot
17c8654c58 Merge "Don't send null data call list response" am: 22a9bec54c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2090384

Change-Id: Ic5cfb7ff25e9c330b2deceabb241802c2bcb3e62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-07 01:29:29 +00:00
Treehugger Robot
22a9bec54c Merge "Don't send null data call list response" 2022-05-07 00:54:03 +00:00
Hans Boehm
29eb7ad17e Merge "Document VirtualRefBasePtr hazards" am: 5ee3cfe147 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2081782

Change-Id: I5e80ebf68b5faf3215b37bef66631452e7322d16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-07 00:10:26 +00:00