Chiachang Wang 3caa3cf399 Merge "Ignore other IKE options if IkeTunnelConnectionParams is set" am: 48160f9b9b ...

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

Change-Id: I3595e032cff0b18959150139d9f84cb817784fb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2022-04-07 10:38:03 +00:00

..

accessibilityservice

…

accounts

…

animation

…

annotation

…

app

Merge changes from topic "presubmit-am-a857ce8919bc4bb7802485a10b458590" into sc-v2-dev-plus-aosp

2022-03-28 10:10:03 +00:00

apphibernation

…

appwidget

…

attention

…

companion

…

content

Merge "Updated API documentation of screenWidthDp and screenHeightDp." am: ec2121901c

2022-04-04 18:00:57 +00:00

database

…

ddm

…

debug

…

gesture

…

graphics/fonts

…

hardware

Don't remove devices on onHotplug() am: c188a56888

2022-04-04 16:13:43 +00:00

inputmethodservice

…

metrics

…

net

Merge "Ignore other IKE options if IkeTunnelConnectionParams is set"

2022-04-07 10:24:03 +00:00

nfc

[automerge] Add null checking to fix NullPointerException while creating mock tag 2p: d52c4c3e83

2022-03-07 03:08:43 +00:00

os

Merge "setProperty check for byte limit"

2022-04-01 21:43:23 +00:00

permission

…

permissionpresenterservice

…

preference

…

print

…

printservice

…

privacy

…

provider

Merge "[DeviceConfig] true/false should be wrapped in @code tags" am: d47a35e3a7

2022-04-04 18:01:22 +00:00

rotationresolver

…

security

WrappedApplicationKey: Remove superfluous branch in deserialization.

2022-03-24 15:28:15 -07:00

service

Merge "Updated the owners" am: c22f798040

2022-04-04 05:40:33 +00:00

speech

…

telephony

Clear up CarrierPrivilegesListener APIs

2022-03-23 14:30:43 -07:00

text

Add truncateStringForUtf8Storage()

2022-03-31 18:57:05 -07:00

timezone

…

tracing

…

transition

…

util

Merge "Document a section of code" am: 7c37904142

2022-04-05 15:55:20 +00:00

uwb

…

view

Merge "Provide gesture and tappable element insets for caption" am: 268eff33ec

2022-04-04 03:30:58 +00:00

webkit

…

widget

[automerge] Fix the translation not work if the animation is off 2p: 880a59217d

2022-03-24 07:20:13 +00:00

window

Merge "Fix setSplashScreenTheme documentation" into sc-dev am: ffad2f714d am: 276387cce1

2022-03-21 14:24:42 +00:00

package.html

…