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
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
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
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
lucaslin
deda023922
Grant the ACTIVATE_PLATFORM_VPN appop if VPN app has CONTROL_VPN
...
This makes the VpnManager APIs consistent with VpnService, ensuring that apps relying on CONTROL_VPN and a separate consent dialog (per CDD) can work properly using the VpnManager. Without this patch, there is an inverted incentive to use the VpnService.
As a workaround, apps using this with CONTROL_VPN already can/do work around this by calling VpnService.prepareAndAuthorize().
Bug: 232051081
Test: atest FrameworksNetTests:VpnTest
Change-Id: I0e0566bb8fed2f9330889e031175c33d499fa855
2022-07-20 09:11:07 +00:00
Orion Hodson
762723f190
Document return values from android.util.Log logging functions
...
Add a note about the return values from logging function since it was
asked in b/228523679.
Bug: 228523679
Fix: 228841312
Test: m
Change-Id: I39a3cad4ba10c4602e58ec9e88c7864ead4b9d85
2022-07-20 08:57:23 +01:00
Sarah Chin
69bca0eb26
Add always full location check to LocationAccessPolicy
...
Check whether the package is allowlisted to always have full location
data.
Test: atest LocationAccessPolicyTest
Bug: 231445403
Change-Id: I33c5088b639595c8e0f89f3f2a926dfc5d830fcf
Merged-In: I33c5088b639595c8e0f89f3f2a926dfc5d830fcf
2022-07-20 00:04:11 -07:00
Sorin Basca
0e6426add4
[automerger skipped] Merge "Use Mockito 4.6.1 API" am: 59b496c31d -s ours
...
am skip reason: Merged-In I0e301b641312f8cc4a235df5ec62acf1446cbb64 with SHA-1 aceee6876a is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2152642
Change-Id: I6003cad31908ab06bf6c2b44c62f586d4192d93b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-20 05:56:03 +00:00
Sorin Basca
ce66acabec
[automerger skipped] Use Mockito 4.6.1 API am: d12c911fb8 -s ours
...
am skip reason: Merged-In I0e301b641312f8cc4a235df5ec62acf1446cbb64 with SHA-1 aceee6876a is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2152642
Change-Id: I7be388667119fe5e57f56b3a0f4324c5e8d7ef8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-20 05:55:23 +00:00
Sorin Basca
59b496c31d
Merge "Use Mockito 4.6.1 API"
2022-07-20 05:32:35 +00:00
Sarah Chin
0ddebc6774
Update values for NR signal strength
...
Ranges were the same as LTE values, which is incorrect.
Test: atest CellSignalStrengthNrTest
Bug: 234304714
Change-Id: I030c6aeec22556454955bb4f9671afe830bb9e2f
Merged-In: I030c6aeec22556454955bb4f9671afe830bb9e2f
2022-07-19 21:27:28 -07:00
Xusong Wang
9fb5ad2a60
Change OWNERS.
...
Test: n/a
Change-Id: If647d9f16ab26aab2a6cb7d699031a5db8cd6015
2022-07-19 23:52:35 +00:00
Caren Chang
afc1b7d01e
Merge "Add explanation about the purpose of accessibility heading and use case apps should consider." am: 407d531735
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2151635
Change-Id: If08ab9af3186e37a8e59863ac701d3679e18bd36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-19 22:29:08 +00:00
Caren Chang
407d531735
Merge "Add explanation about the purpose of accessibility heading and use case apps should consider."
2022-07-19 22:05:32 +00:00
Andrew Chant
4dde1ee814
Merge "Revert "Remove unused net-module-utils-srcs filegroup."" am: 1ae7d6245c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2159641
Change-Id: If19ec868ddbab89e29d523828a59543e492509e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-19 20:48:50 +00:00
Andrew Chant
1ae7d6245c
Merge "Revert "Remove unused net-module-utils-srcs filegroup.""
2022-07-19 20:32:22 +00:00
Andrew Chant
fdff6e62d3
Revert "Remove unused net-module-utils-srcs filegroup."
...
Revert submission 2152437-remove-net-module-utils-srcs
Reason for revert: broke build.
Bug: 239599703
Reverted Changes:
I058e1aa37:Remove unused net-module-utils-srcs filegroup.
I7c8a12372:Remove unused net-module-utils-srcs filegroup.
Change-Id: Ib9f9319fd6dfade634eda65cafc8c9f7b643f3bb
2022-07-19 20:27:51 +00:00
Jeff Sharkey
954431c4df
Merge changes from topic "jul15" am: 0e27faa039
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2155659
Change-Id: Ie949e0bb40967581190f7b98bb5005bab19cb7fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-19 19:12:28 +00:00
Alex Buynytskyy
574659e3dd
[automerger skipped] Cache least recently used output buffer. am: 2be5b4c118 -s ours
...
am skip reason: Merged-In Ieedd27a676d718967c2fac30bc48a68ae636a180 with SHA-1 19f8adfbdf is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2155658
Change-Id: Ic0bf76701c2ea6dd6aea6ced9f4f3d8340f6066d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-19 19:11:56 +00:00
Jeff Sharkey
0e27faa039
Merge changes from topic "jul15"
...
* changes:
Offer explicit 3-byte vs 4-byte modified UTF-8.
Cache least recently used output buffer.
2022-07-19 18:59:31 +00:00
Alex Buynytskyy
ad0c6b5d8c
Revert "Compress .so files for PackageManager to reclaim the space"
...
This reverts commit 61a0a35dd5 .
Reason for revert: debugging b/237904436
Change-Id: I557e7b69cd5917188c33cbd42293307efa9d6f8f
2022-07-19 18:38:09 +00:00
Patrick Rohr
6d338ccf26
Merge "Remove unused net-module-utils-srcs filegroup." am: 4b8edd89ed
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2152437
Change-Id: I68fcc6db65f4fc8eae7fde867bf99f2c22408d22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-19 18:32:24 +00:00
Patrick Rohr
4b8edd89ed
Merge "Remove unused net-module-utils-srcs filegroup."
2022-07-19 18:06:42 +00:00
Jeff Sharkey
c6b3699b63
Offer explicit 3-byte vs 4-byte modified UTF-8.
...
As documented in art/runtime/jni/jni_internal.cc, ART has deviated
from the RI by using a 4-byte encoding instead of the 3-byte encoding
required by the JNI specification.
Some users are okay with this 4-byte encoding (where they control
both the reading and writing logic) but other users require
compatibility with the DataOutput/DataInput API contract, so this
change lets users request either behavior.
This change now exercises all tests in both 4-byte and 3-byte modes,
and exhaustively confirms that all valid code-points match the
DataOutput/DataInput contract when in 3-byte mode.
Benchmark results still show significant performance benefits when
using this 3-byte encoding over the upstream RI:
timeRead_Upstream_mean (ns): 5090068
timeRead_LocalUsing3ByteSequences_mean (ns): 1996032
timeRead_LocalUsing4ByteSequences_mean (ns): 1813250
timeWrite_Upstream_mean (ns): 3856276
timeWrite_LocalUsing3ByteSequences_mean (ns): 1632697
timeWrite_LocalUsing4ByteSequences_mean (ns): 886503
Bug: 236923096
Test: atest FrameworksCoreTests:CharsetUtilsTest
Test: atest FrameworksCoreTests:FastDataTest
Test: atest FrameworksCoreTests:XmlTest
Test: atest FrameworksCoreTests:BinaryXmlTest
Test: ./frameworks/base/libs/hwui/tests/scripts/prep_generic.sh little && atest CorePerfTests:FastDataPerfTest
Change-Id: Ibddd36410a0d4a909522de011f23a337b53d6889
2022-07-19 10:36:37 -06:00
TreeHugger Robot
d88ed633ab
Merge "Use Mockito 4.6.1 API" into stage-aosp-master
2022-07-19 11:43:51 +00:00
Treehugger Robot
b0d12902f7
Merge "Add OWNERS for core_jni_helpers.*" am: 7dba39cbdd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2155588
Change-Id: I865b789a0b1cfa183efb0596d5a16bbbf0db8303
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-19 09:15:28 +00:00
Sorin Basca
aceee6876a
Use Mockito 4.6.1 API
...
Bug: 236636175
Test: m RunBackupEncryptionRoboTests
Test: m RunBackupEncryptionIntegRoboTests
Test: m RunSettingsRoboTests
Test: m RunSettingsLibRoboTests
Change-Id: I0e301b641312f8cc4a235df5ec62acf1446cbb64
(cherry picked from commit 58ddd21982 )
Merged-In: I0e301b641312f8cc4a235df5ec62acf1446cbb64
(cherry picked from commit 86203882dd )
Merged-In: I0e301b641312f8cc4a235df5ec62acf1446cbb64
2022-07-19 09:07:22 +00:00