Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
766,133 Commits 3 Branches 0 Tags
faef3a82deecfac2987ea6a8f4da84834067dee8
Commit Graph

766133 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Jeon
faef3a82de Merge "Exclude dumpsys from incident in dumpstate" am: 6e1ac19115 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2156679

Change-Id: I5c81d8ed230d499c6ab97d99643bb5a23f8d20e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-25 16:35:06 +00:00
Kevin Jeon
6e1ac19115 Merge "Exclude dumpsys from incident in dumpstate" 2022-07-25 16:17:32 +00:00
Treehugger Robot
f7726a198f Merge "identity: Fix uncompressed form encoding of P-256 EC Public Key." am: 2fd4ee6439 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2163536

Change-Id: I17191c5dc18c4ff4faeab834b8fcbc971fe9bfe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-22 22:08:27 +00:00
Treehugger Robot
2fd4ee6439 Merge "identity: Fix uncompressed form encoding of P-256 EC Public Key." 2022-07-22 21:48:41 +00:00
Cole Faust
907b32ebdc Disable AndroidFrameworkLintCheckerTest 
Andorid lint was updated, and now includes some
prebuilt classes compiled for java 15. The soong
build doesn't support java 15 yet, so we can't have
modules that compile against lint right now.

Bug: 239881504
Bug: 236431222
Test: Presubmits
Change-Id: Idc85e23438c1c5b1e7862312298e14e96cf2213e
 2022-07-22 18:08:03 +00:00
Cole Faust
f3944eb168 Add -Xjvm-default=all 
Android lint is being updated, and now requires
custom detectors to be compiled with -Xjvm-default=all.

This is a cherrypick without the fixes for indentation
errors because lint is not actually run on these older
branches, but the custom detectors are compiled.

Bug: 236431222
Test: Presubmits
Change-Id: Idf5302302496a6dff0f79ced4e20327041ae7a5a
(cherry picked from commit b331e4e254)
(cherry picked from commit 116be9d69f)
 2022-07-22 14:52:15 +00:00
David Zeuthen
dc379a45aa identity: Fix uncompressed form encoding of P-256 EC Public Key. 
Properly encode an P-256 EC Public Key in uncompressed form, in
particular ensure that the resulting blob is always 65 bytes long as
is expected.

Was able to reproduce this with about 4% failures running a
test. After the fix didn't get a failure in 1,000 runs.

Also remove unused Util.integerCollectionToArray() function.

Bug: 239857653
Test: atest --rerun-until-failure 1000  android.security.identity.cts.ProvisioningTest#testProvisionAndRetrieveMultipleTime
Change-Id: I9a8a5570fde5a80f74632606126cdfcc1f6c7c99
 2022-07-22 09:49:14 -04:00
Xiao Ma
251adfb310 Merge "Revert^2 "Remove unused net-module-utils-srcs filegroup."" am: f15b1ffd0b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2160446

Change-Id: I8a0a03f9af733aab429f270410fd3feacafafbdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-22 07:16:06 +00:00
Xiao Ma
f15b1ffd0b Merge "Revert^2 "Remove unused net-module-utils-srcs filegroup."" 2022-07-22 06:56:50 +00:00
Treehugger Robot
7ad4387627 [automerger skipped] Merge "RESTRICT AUTOMERGE Allowlist alarm-clock alarms from pre-S apps for FGS" am: 337bb720f4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4485726156765a25ad2633b3d47878e4ae186160
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-22 06:09:38 +00:00
Suprabh Shukla
b25320d921 [automerger skipped] RESTRICT AUTOMERGE Allowlist alarm-clock alarms from pre-S apps for FGS am: 116ec3b913 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2b2cc87273343deceb55190dde70716915cc15dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-22 06:09:15 +00:00
Treehugger Robot
337bb720f4 Merge "RESTRICT AUTOMERGE Allowlist alarm-clock alarms from pre-S apps for FGS" 2022-07-22 05:43:02 +00:00
Suprabh Shukla
116ec3b913 RESTRICT AUTOMERGE Allowlist alarm-clock alarms from pre-S apps for FGS 
FGS starts are allowed by default to apps targeting pre-S sdks. However,
on update their alarms may start getting denied if the app could not
reset its alarms.
Explicitly adding them to the allowlist to avoid this problem.

Test: atest FrameworksMockingServicesTests:AlarmManagerServiceTest
Test: Manual, using steps listed in b/238407723

Bug: 239098759
Bug: 238407723
Change-Id: I895901f0c870b161a8a4df92ebe93c873a55abc9
Merged-In: I895901f0c870b161a8a4df92ebe93c873a55abc9
 2022-07-22 04:44:25 +00:00
Treehugger Robot
5e6588a9d7 Merge "Add xutan@ to WM shell owner" am: 584338ea98 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2162828

Change-Id: I20464ffc59deca0f0a3d6657703432a23b75e2ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-22 00:55:49 +00:00
Treehugger Robot
584338ea98 Merge "Add xutan@ to WM shell owner" 2022-07-22 00:34:12 +00:00
Treehugger Robot
840f2a30e9 [automerger skipped] Merge "cleanupOrphanPA's feature framework (2/2)*" am: 2c2ef9a04a -s ours 
am skip reason: Merged-In Ic350e4e45c0d1597c6f61e3e3e717b3a2c1bb099 with SHA-1 c8460d8e21 is already in history

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

Change-Id: I6dc392ba7a1005073e055baf524e7e25ea88537c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-21 22:41:51 +00:00
Thomas Stuart
9fd86379d0 [automerger skipped] cleanupOrphanPA's feature framework (2/2)* am: 6ff1ff9e20 -s ours 
am skip reason: Merged-In Ic350e4e45c0d1597c6f61e3e3e717b3a2c1bb099 with SHA-1 c8460d8e21 is already in history

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

Change-Id: I5e1c080db05206202688dc47397095d199772100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-21 22:41:41 +00:00
Orion Hodson
f0ac357afb Merge "Rename jniGetReferent to GetReferent and cache the method id it uses." am: fe892a0f52 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2152646

Change-Id: I2dfdec571499cb10db92afe52b23ef0f585a5b51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-21 22:34:18 +00:00
Orion Hodson
c822b157e9 Merge "Document return values from android.util.Log logging functions" am: 07166bf3b1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2158819

Change-Id: Ia50d0d1945460168b0e8699e3142d17c573905bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-21 22:33:42 +00:00
Treehugger Robot
41a5df2f79 Merge "Fix javadoc typo for Bitmap.Config.RGBA_F16" am: be25d91e81 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2154933

Change-Id: Ib4e5a2fe1056e555247c6098bc47e5f1bf37c6c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-21 22:32:49 +00:00
Lucas Lin
e49b2e5666 Merge "Skip sending VpnManager events for Settings VPNs" am: 0b990180cb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2160448

Change-Id: I7d69ac10d780fbd79a3f2291ee4795c5f87ac4e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-21 22:20:16 +00:00
Treehugger Robot
a79bad63a3 Merge "Minor update canHandleType()" am: 002e7fd1ca 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2154446

Change-Id: I6ea089f3d8c8c847d425a0a3c9e08468b283e9b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-21 22:19:18 +00:00
Jack Yu
f431f2cadd Merge "Throw illegal state exception when service is not available" am: 572a358723 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2160225

Change-Id: I5663f4bba2e8722cbe3423da40264944cd23ed61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-21 22:17:31 +00:00
Sarah Chin
78aab3e3da [automerger skipped] Merge "Add always full location check to LocationAccessPolicy" am: d66bbc7208 -s ours 
am skip reason: Merged-In I33c5088b639595c8e0f89f3f2a926dfc5d830fcf with SHA-1 3a70f7b6e6 is already in history

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

Change-Id: If585434446fecfa1dbde06924359a68333c59d96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-21 22:16:33 +00:00
Sarah Chin
1c85658333 [automerger skipped] Add always full location check to LocationAccessPolicy am: 69bca0eb26 -s ours 
am skip reason: Merged-In I33c5088b639595c8e0f89f3f2a926dfc5d830fcf with SHA-1 3a70f7b6e6 is already in history

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

Change-Id: Ibde103fee2c2a7f75d8046ddcae5327c4053dc9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-21 22:16:23 +00:00
Garfield Tan
e8cc6e7197 Add xutan@ to WM shell owner 
Also move the resource owners to the new OWNERS file from the OWNERS
file one level of folder above.

Bug: None
Test: None
Change-Id: I81b3eeff0cf565482772023243652a949cfbcd1f
 2022-07-21 14:46:27 -07:00
Treehugger Robot
2c2ef9a04a Merge "cleanupOrphanPA's feature framework (2/2)*" 2022-07-21 16:24:51 +00:00
Orion Hodson
fe892a0f52 Merge "Rename jniGetReferent to GetReferent and cache the method id it uses." 2022-07-21 15:07:56 +00:00
Orion Hodson
07166bf3b1 Merge "Document return values from android.util.Log logging functions" 2022-07-21 13:49:30 +00:00
Treehugger Robot
be25d91e81 Merge "Fix javadoc typo for Bitmap.Config.RGBA_F16" 2022-07-21 13:38:09 +00:00
Lucas Lin
0b990180cb Merge "Skip sending VpnManager events for Settings VPNs" 2022-07-21 11:05:42 +00:00
Treehugger Robot
de83608fa3 Merge "Update values for NR signal strength" am: 8f2cd8d7b3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2160160

Change-Id: I6e4334a18afbf160dfe81584eb0a8117e4f1aceb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-21 05:37:08 +00:00
Treehugger Robot
002e7fd1ca Merge "Minor update canHandleType()" 2022-07-21 03:21:29 +00:00
Thomas Stuart
6ff1ff9e20 cleanupOrphanPA's feature framework (2/2)* 
Bug: 210134615
Test: Unit + manual
Change-Id: Ic350e4e45c0d1597c6f61e3e3e717b3a2c1bb099
Merged-In: Ic350e4e45c0d1597c6f61e3e3e717b3a2c1bb099
 2022-07-21 00:43:36 +00:00
Jack Yu
572a358723 Merge "Throw illegal state exception when service is not available" 2022-07-20 23:22:09 +00:00
Sarah Chin
d66bbc7208 Merge "Add always full location check to LocationAccessPolicy" 2022-07-20 21:38:55 +00:00
Treehugger Robot
8f2cd8d7b3 Merge "Update values for NR signal strength" 2022-07-20 21:38:06 +00:00
Jack Yu
58ac838baa Throw illegal state exception when service is not available 
Bug: 239607619
Test: Build
Change-Id: I84b3f813e798707d5564b54b6b2cc329f570908d
 2022-07-20 19:42:29 +00:00
Xusong Wang
be77a2b550 Merge "Change OWNERS." am: 4592692985 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2160156

Change-Id: Iac517c7e058e67e364775882bb66e376ce091303
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 18:24:56 +00:00
Xusong Wang
4592692985 Merge "Change OWNERS." 2022-07-20 18:09:32 +00:00
Treehugger Robot
7dafb8c427 Merge "Revert "Compress .so files for PackageManager to reclaim the space"" am: 67610047b0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2159418

Change-Id: I2b911ededfee9cd73a2425b8e303b25cb219afdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 17:34:51 +00:00
Treehugger Robot
67610047b0 Merge "Revert "Compress .so files for PackageManager to reclaim the space"" 2022-07-20 16:53:27 +00:00
Jiyong Park
80cd0a84a0 Merge "Replace #apex with #systemapi" am: b1151361c9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2155321

Change-Id: I262e003e06e7c3e4408d646cc6b09aa5f8e22b21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 15:28:46 +00:00
Jiyong Park
b1151361c9 Merge "Replace #apex with #systemapi" 2022-07-20 15:00:40 +00:00
Lucas Lin
58c079210b Merge "Grant the ACTIVATE_PLATFORM_VPN appop if VPN app has CONTROL_VPN" am: 41142d7244 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2141595

Change-Id: I4b7c0e255e10015cb7680106fdeb6b17b89e49fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 13:36:05 +00:00
Lucas Lin
41142d7244 Merge "Grant the ACTIVATE_PLATFORM_VPN appop if VPN app has CONTROL_VPN" 2022-07-20 13:28:43 +00:00
Victor Chang
b0bbe9b5f3 Merge "Deprecate Debug.enableEmulatorTraceOutput()" am: 3f007c4dea 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2154934

Change-Id: I254df58123db32e542a75176544313776c55d20b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 10:23:51 +00:00
Xiao Ma
52fa88cff6 Revert^2 "Remove unused net-module-utils-srcs filegroup." 
fdff6e62d3

Change-Id: I6b29eca9f21b36db0dbf9357625c36c230550987
 2022-07-20 09:58:11 +00:00
Victor Chang
3f007c4dea Merge "Deprecate Debug.enableEmulatorTraceOutput()" 2022-07-20 09:57:40 +00:00
lucaslin
5a684c6362 Skip sending VpnManager events for Settings VPNs 
This change early-exits from the sendEventToVpnManagerApp()
method if the profile was not a VPN app.

Otherwise the sendEventToVpnManagerApp() will call
getRedactedNetworkCapabilities() which will call
AppOpsManager#checkPackage() eventually.
And AppOpsManager#checkPackage() will check if the given package
is the same as the given uid. In this case, VPN sends
"[Legacy VPN]" as the package and sends 1000 as the uid, but
there is no package named "[Legacy VPN], so the SecurityException
is thrown.

Bug: 236315805
Test: atest FrameworksNetTests:VpnTest
Change-Id: I228f62a5e09017dbf985a614f2e42434238a220c
 2022-07-20 17:37:41 +08:00