Commit Graph

567133 Commits

Author SHA1 Message Date
Orion Hodson
94deae9295 Merge "Move to renamed NDK symbol AFileDescriptor_getFd" 2021-05-21 08:29:52 +00:00
Sarah Chin
d4a99869a8 Merge "Optimize SIM phonebook feature with new APIs" 2021-05-21 04:21:15 +00:00
Chiachang Wang
392633f757 Merge "Add test for NetworkCapabilities.Builder.withoutDefaultCapabilities" 2021-05-21 03:33:23 +00:00
Chiachang Wang
d916891405 Add test for NetworkCapabilities.Builder.withoutDefaultCapabilities
Bug: 186061922
Test: atest CtsNetTestCases:android.net.NetworkCapabilitiesTest
Change-Id: I369e71dd6ae85da78e114ea8377967ab0bde787b
2021-05-21 09:57:42 +08:00
Frank Li
327678ebd6 Merge "Improve the net-capabilities scheme for backward compatibility" 2021-05-21 01:28:35 +00:00
Treehugger Robot
2c219a5b84 Merge "Use CS identity to update setting while performing factory reset" 2021-05-21 01:26:05 +00:00
Matt Reynolds
82edb97d6a Merge "Add keylayout mapping for Luna controller (Bluetooth)" 2021-05-21 00:32:19 +00:00
Treehugger Robot
c54117c71e Merge "Close the FileStream to avoid resource leak" 2021-05-21 00:05:11 +00:00
Tom Natan
3e686651ad Merge "Rename addPackageOverrides to putPackageOverrides." 2021-05-20 23:02:10 +00:00
Matt Reynolds
552dfe5c29 Add keylayout mapping for Luna controller (Bluetooth)
Add a keylayout mapping to support gamepad buttons and axes on the
Amazon Luna controller.

Buttons and axes are mapped according to
https://www.kernel.org/doc/Documentation/input/gamepad.txt except for
the Alexa Push-To-Talk button which is mapped to MEDIA_RECORD.

Bug: 183990549
Test: used the "Gamepad Tester" app and https://gamepad-tester.com in
Chrome to verify all mappings work.

Change-Id: I1921e501eea0ce398b79a32809efa63456074ed5
2021-05-20 15:01:11 -07:00
Calin Juravle
95590e1a62 Merge "Update the use of registerAppInfo" 2021-05-20 21:46:00 +00:00
Cody Kesting
a376a93738 Merge "Check location permission for ConnDiags last." 2021-05-20 21:27:46 +00:00
Treehugger Robot
06a4f88eb9 Merge "Improve documentation of IpSecTunnelInterface#setUnderlyingNetwork" 2021-05-20 20:33:41 +00:00
Meng Wang
ffb1899ba2 Merge "PersistableBundle.restoreFromXml should return a mutable bundle." 2021-05-20 19:13:26 +00:00
Naga Venkata Durga Ashok Mutyala
cf89b5d085 Close the FileStream to avoid resource leak
Test: NA
Change-Id: I8426ed1409d5870f50c3036d4c5f45ca396d6060
2021-05-20 18:08:40 +00:00
Anton Hansson
4fc41b4fb6 Merge "Update API txt following a metalava fix" 2021-05-20 17:38:26 +00:00
lifr
46c3c694d4 Improve the net-capabilities scheme for backward compatibility
- Create a new XML tag for the new format. The new format should
  persist the arrays of values without assuming they necessarily
  have different bits.

- Upon reading, if the new tag is present, use that. If the new
  tag is not present but the old tag is present, then limit the
  contents to the capabilities/transports that existed in R.

- Catch all exceptions and ignore the requests if they can't be
  re-read from disk. This is a measure to avoid any mistake where
  the device couldn't boot when JS tries to restore state.

Bug: 183071974
Test: atest JobStoreTest
Change-Id: I56cde50d2adab81134c8be4f6996d68018f4212a
2021-05-21 01:00:21 +08:00
Jeff Sharkey
ba5fa81923 Merge "add notification team as OWNERS of notification utils" 2021-05-20 13:44:03 +00:00
Neil Fuller
55f4ea8068 Merge "Add permission to shell for CTS test" 2021-05-20 13:13:27 +00:00
tomnatan
79fe2b53f8 Rename addPackageOverrides to putPackageOverrides.
Bug: 187738991
Test: atest FrameworksServicesTests:CompatConfigTest
Test: atest FrameworksServicesTests:PlatformCompatTest
Change-Id: I52e5051810cf31cbcee9ba600c92c86d335187a0
2021-05-20 11:52:39 +00:00
Siim Sammul
83d1954afe Merge "Include binder stats in battery stats" 2021-05-20 09:46:37 +00:00
Chiachang Wang
f1b5a1a2ea Use CS identity to update setting while performing factory reset
When apps try to call factoryReset to do networking reset, it
will result in updating the setting in SettingsProvider.
ContentProvider will verify if the package name of the caller
that initiated the request being processed on the current thread.
The package should belong to the calling UID. The setting update
started from the ConnectivityService context, so the package will
be android but the calling UID will be the calling app. It will
cause a SecurityException. The behavior is fine previously as its
known caller(Settings) shares system UID. But it will be a
problem for other callers, such as CTS. Thus, clear the identity
since the necessary permission check should be examined at the
top of the method. The following actions should be fine to be
proceed from the system itself. Also replace the user restriction
check via hasUserRestrictionForUser with the UserHandle created
from the calling uid to ensure it's verified with correct user.

Bug: 186061922
Test: Factory reset from Settings
Change-Id: If2dd69f702a1eafff331f9e71f6b92aeadfb715d
2021-05-20 10:01:50 +08:00
Jeff DeCew
ac14604706 add notification team as OWNERS of notification utils
Change-Id: I0c773d253e080aabadc9d15ff945abd7eb2638f3
2021-05-19 20:32:31 +00:00
Brad Ebinger
bd5ef43130 Merge "Clarify some UCE API docs" 2021-05-19 17:08:42 +00:00
Neil Fuller
22472c6361 Add permission to shell for CTS test
This grants the shell app the SUGGEST_EXTERNAL_TIME permission needed
for the TimeManagerTest (CTS) to invoke the
TimeManager.suggestExternalTime() method during tests.

Bug: 184947690
Bug: 177079827
Test: See associated cts change
Merged-In: Ia1995ec9503dbd2b12e0b5b5f92a96e02f85beec
Change-Id: Ia1995ec9503dbd2b12e0b5b5f92a96e02f85beec
2021-05-19 16:11:32 +00:00
vichang
0799624dc7 Merge "Add ART module-lib and system API to the collection" 2021-05-19 12:27:25 +00:00
Anton Hansson
85a702b78c Update API txt following a metalava fix
The txt was previously referencing VcnGatewayConnectionConfig.MIN_MTU_V6
which isn't part of the API. The API txt should be complete on its own,
so inline the value instead.

Bug: 188527836
Test: m checkapi
Merged-In: Ideb34ab78c9a8fc4d589e58e810316b6f36b7a43
Change-Id: Ideb34ab78c9a8fc4d589e58e810316b6f36b7a43
2021-05-19 09:36:12 +01:00
Remi NGUYEN VAN
74ce6ae771 Merge "Move config_apf* resources to NetworkStack" 2021-05-19 00:58:52 +00:00
Brad Ebinger
7fc88ee1c5 Clarify some UCE API docs
Adds some clarifications for how UCE operates
in Android 12.

Bug: 188580687
Test: docs only change
Merged-In: I139455c286378ccfac876014656f8d3177bdba9d
Change-Id: I139455c286378ccfac876014656f8d3177bdba9d
2021-05-18 23:01:27 +00:00
Christopher Ferris
9510033467 Merge "Add a cherry-pick exception." 2021-05-18 22:50:29 +00:00
Nikita Iashchenko
a4466fbe61 Merge "Move IoUtils#deleteContents from CorePlatformApi set to framework" 2021-05-18 22:13:56 +00:00
Mengjun Leng
25eb471790 Optimize SIM phonebook feature with new APIs
1. Declare the constant events for loading and updating SIM contacts.
2. Introduce radio HAL capability to control the SIM phonebook feature.

Bug: 23044962
Change-Id: Ice0cc1cddc832b5ae0f272348503e28842fccbb6
Merged-In: Ice0cc1cddc832b5ae0f272348503e28842fccbb6
2021-05-18 21:28:58 +00:00
Treehugger Robot
b7bccf0c76 Merge "Revert^2 "Fix incompatibilities with Kotlin 1.5.0"" 2021-05-18 20:54:38 +00:00
Christopher Ferris
9fbe8a8279 Add a cherry-pick exception.
If someone is trying to cherry-pick back to aosp, don't force them
to use --no-verify, allow it.

Right now, the only form of cherry-pick allowed is:

  cherry picked from

Test: Ran on a commit with the message and without and observed that
Test: with the cherry pick message, no error, without, error message.
Change-Id: I27581f782cdc1a1c4fa207a3aae392c0d434eb5a
2021-05-18 13:49:08 -07:00
Treehugger Robot
9635abafa0 Merge "Reset target sdk version of ParseTypeImpl" 2021-05-18 19:56:58 +00:00
Patrick Baumann
1ef34e9022 Merge changes I04dfc5c2,Idc7e1f3c
* changes:
  Updates OWNERS files
  Update OWNERS file.
2021-05-18 19:03:06 +00:00
Chris Weir
c4099ac074 Merge "Print human-readable OEM managed states" 2021-05-18 16:29:26 +00:00
Victor Chang
d21107a1e8 Add ART module-lib and system API to the collection
Bug: 157639992
Test: m update-api
Change-Id: Icae91fd724dd1f827a61e0a7a248fd1db8532e53
2021-05-18 14:56:05 +01:00
Les Lee
ced78f535c Merge "Support to query TYPE_WIFI usage with subscriberId" 2021-05-18 13:02:07 +00:00
Les Lee
287dcfbc80 Merge "Add metered filter for API: buildTemplateCarrier" 2021-05-18 13:01:38 +00:00
Dmitri Plotnikov
1956f4c700 Include binder stats in battery stats
Cherry picked from internal master: https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/11856226

Bug: 158232997

Test: atest FrameworksCoreTests:com.android.internal.os.BatteryStatsBinderCallStatsTest
Change-Id: I2234776d710adf73c363bdfa6a334f3a6f36d986
Merged-In: I2234776d710adf73c363bdfa6a334f3a6f36d986
2021-05-18 12:18:05 +01:00
Siim Sammul
e6a97f86a7 Merge "Add plumbing to collect Binder stats for battery attribution" 2021-05-18 09:23:48 +00:00
liulvping
2cd9d26116 Reset target sdk version of ParseTypeImpl
In device booting, PackageParser2 uses a thread
local ParseTypeImpl obj as shared result and reset
it before parsing everty time. But it doesn't reset
the target sdk version, which could make deferError
returned unexpected error, cause apk scaned failed
and deleted by the system.

Test: atest com.android.server.pm.parsing

Change-Id: Ie6fbc4b79e94943c9282206b1ef6d20b4129fa0b
Signed-off-by: liulvping <liulvping@xiaomi.com>
2021-05-18 17:10:54 +08:00
Treehugger Robot
5bae6daf9b Merge "[VCN21] Do not add NOT_VCN_MANAGED capability if specifier is present" 2021-05-18 08:35:06 +00:00
Treehugger Robot
2a088541ac Merge "Kill logcat with SEGV so we get a tombstone on timeout." 2021-05-18 03:12:50 +00:00
Cody Kesting
727856cc35 Check location permission for ConnDiags last.
This CL updates ConnectivityService to check location permissions for
ConnectivityDiagnostics callbacks last in the permission check process.
This minimizes misattribution of location access for networks that an
app is not administering.

This CL also updates ConnectivityDiagnosticsManager documentation to
clearly state that location permissions are required in order to receive
callbacks.

Bug: 187310575
Test: atest ConnectivityDiagnosticsManagerTest
Test: atest ConnectivityServiceTest
Change-Id: I2dbeddac6273e2392ccaeae51a1c7776d6d3da75
2021-05-17 19:36:47 -07:00
Chiachang Wang
f93d99deae Merge "Dump only NORMAL priority information if no priority assigned" 2021-05-18 02:12:28 +00:00
Aurimas Liutikas
b715c4d730 Revert^2 "Fix incompatibilities with Kotlin 1.5.0"
c5b4071877

Change-Id: I1fc09f028411cce8bdaa9eec68eaf88116f2143f
2021-05-17 17:41:41 +00:00
Christian Wailes
6c914b4bc6 Merge "Make BackgroundDexOpt aware of thermal state" 2021-05-17 16:15:40 +00:00
Dmitri Plotnikov
474354593d Add plumbing to collect Binder stats for battery attribution
Cherry picked from internal master: https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/9966816

Bug: 158232997
Test: atest FrameworksCoreTests:com.android.internal.os.BinderCallsStatsTest

Change-Id: Icbccd26e20bc4ead13ffeac76b851af39269ca89
Merged-In: Icbccd26e20bc4ead13ffeac76b851af39269ca89
2021-05-17 15:42:17 +00:00