Merge "Handle failures in validators"

Merge "Prevent non-fullscreen activities from triggering auto-enter PiP" into oc-dr1-dev am: d24ed58bc2
am: 092d675192

Change-Id: I51c5a575c0700879af80a0ecd688f4f0de0eae72

Merge "Prevent non-fullscreen activities from triggering auto-enter PiP" into oc-dr1-dev
am: d24ed58bc2

Change-Id: I57175352ca15a23dc7daecc352017dc2bb9ee79e

Merge "Prevent non-fullscreen activities from triggering auto-enter PiP" into oc-dr1-dev

Merge "clearChoices when setting AbsListView adapters."

Fix egregious state check for window focusability. am: 3d0a74a9e4
am: 0ca8f5bb12

Change-Id: Ic53935b12220b21f9ad63106d08869fab4d72128

Fix egregious state check for window focusability.
am: 3d0a74a9e4

Change-Id: I68aac94729227b30e2ba05bf2e89afae5a9debbf

Merge "Revert "AAPT2: Auto-version adaptive-icon XML""

Fix egregious state check for window focusability.

- The original check should have not assumed that these are only app
  windows.

Bug: 63614176
Test: Ensure that you can unlock with password
Change-Id: I71a9959378bbd98a8ed6715d67119d38c3daceb5

Merge "Using transformation method in the ImageFloatingTextView" into oc-dr1-dev am: 997e4ac2bb
am: 727b06b498

Change-Id: I5bb0e7dd6712316f0e349795fb9d607a7bc92b9c

Merge "Using transformation method in the ImageFloatingTextView" into oc-dr1-dev
am: 997e4ac2bb

Change-Id: Ifffc5f1dfe2a5d606e5eae128cbe0a331d4aaf7c

Prevent non-fullscreen activities from triggering auto-enter PiP

Bug: 63581685
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testAppOpsDenyPipOnPause
Test: Launch screenshot from notification tray above auto-enter PiP
      activity

Change-Id: I0bddfd5c47d6053d079b9bd426003d526e8bb0dd

Merge "Using transformation method in the ImageFloatingTextView" into oc-dr1-dev

Merge "wifi: Params for SAR limits" into oc-dr1-dev am: bc15a1e3ee
am: 6dea3d77ba

Change-Id: I36d229d2bc7e19a6a3403a5bcd94aed123a436db

Merge "wifi: Params for SAR limits" into oc-dr1-dev
am: bc15a1e3ee

Change-Id: Iecd39b0d0449a356c5dfef7ec60fbca4906bf2cf

Merge "[Companion] Prevent NPE in CallbackProxy" into oc-dr1-dev am: 9e419d3082
am: 58582f7abf

Change-Id: I7d7faa17db64be9f01735e2fe0ec216a689042d1

Merge "wifi: Params for SAR limits" into oc-dr1-dev

Merge "Update to use GrBackendTexture/RT instead of Descriptors"

Merge "[Companion] Prevent NPE in CallbackProxy" into oc-dr1-dev
am: 9e419d3082

Change-Id: I0aa741d69e2f579a914973aff6a093a19d9097b4

Merge "Avoid exposing OffloadCallbackEvent values" am: aff0d1afb6 am: 74868feecd am: 1b6044f363  -s ours
am: 54028116d5  -s ours

Change-Id: I51965d3318827dd2e45a05dd41d6705ae98dada6

Merge "Stop unnecessary tethering reconfigurations" am: 8ad1c81b07 am: 009d42ffe0 am: 626c3e8739  -s ours
am: 5e886f058a  -s ours

Change-Id: I973dcd811a4bb2be42cdcb01fa0305d12989b6ef

Merge "[Companion] Prevent NPE in CallbackProxy" into oc-dr1-dev

Merge "Avoid exposing OffloadCallbackEvent values" am: aff0d1afb6 am: 74868feecd
am: 1b6044f363  -s ours

Change-Id: I2f2ac148c3a2042d3a96013a14e1efd92886c241

Merge "Stop unnecessary tethering reconfigurations" am: 8ad1c81b07 am: 009d42ffe0
am: 626c3e8739  -s ours

Change-Id: If8586140a21eea1fae0b61e073db3a7665d111ac

Merge "Remove more references to kIndex_8"

Merge "WifiMetrics: add Passpoint related metrics" into oc-dr1-dev am: b07f49dd92
am: 428b997e55

Change-Id: I9f17b94e0e9494a5ecb20bd3d0cfe1c4d95f5cc8

Merge "Avoid exposing OffloadCallbackEvent values" am: aff0d1afb6
am: 74868feecd

Change-Id: I5495caada5fc8869c4c770bbddb37d73b2603f62

Merge "Stop unnecessary tethering reconfigurations" am: 8ad1c81b07
am: 009d42ffe0

Change-Id: I000020b5e1bca50b39c627a64fe98e0fd6d80b9e

Merge "Move @Ignore from class-level to test level." into oc-dr1-dev am: bcc318f9cf
am: dfb3542879

Change-Id: I40a25ccf0d67850600d3b275fc37c7e9c503fec9

Merge "WifiMetrics: add Passpoint related metrics" into oc-dr1-dev
am: b07f49dd92

Change-Id: I37cfce7193a4fa7bc1d8edc2e513d62345ed8406

Merge "Avoid exposing OffloadCallbackEvent values"
am: aff0d1afb6

Change-Id: I4cebe1df49397405ee6492c8420f07f01ea2e3f7

Merge "Move @Ignore from class-level to test level." into oc-dr1-dev
am: bcc318f9cf

Change-Id: I88f83646fbefeaacacd60c24859f7bd228b0d097

Merge "Stop unnecessary tethering reconfigurations"
am: 8ad1c81b07

Change-Id: I261ae05664d620997d38ca40edaffd8ca11b308e

Merge "audioservice: modify default music volume" into oc-dr1-dev am: b6f946c081
am: aebf79edb4

Change-Id: I9e5ee08c8320799dd53e604005c4be57142832fb

Merge "WifiMetrics: add Passpoint related metrics" into oc-dr1-dev

Merge "audioservice: modify default music volume" into oc-dr1-dev
am: b6f946c081

Change-Id: Ia13c9e28deba3ddd0b7ab74862d2febbf01f1142

Merge "Move @Ignore from class-level to test level." into oc-dr1-dev

Merge "Avoid exposing OffloadCallbackEvent values"

clearChoices when setting AbsListView adapters.

This allows us to reset mCheckedItemCount to 0 to match the clearing
of check states.

Bug: 63559021
Fixes: 63559021
Test: Added test to AbsListViewTest.

Change-Id: I47a0fbc25448addf75a3f7e5a282bb98360200dd

Merge "Autofill: Add API for virtual view visibility"

Merge "audioservice: modify default music volume" into oc-dr1-dev

Merge "Stop unnecessary tethering reconfigurations"

Merge "Document WifiScanner callback behaviors" into oc-dr1-dev am: 4a82979153
am: 9d6cd5674b

Change-Id: I7d1a27af523dde91b340519c7b8f1b3f2b6a97a1

Merge "Document WifiScanner callback behaviors" into oc-dr1-dev
am: 4a82979153

Change-Id: I66871bfc1148c29fce78063d258911fbe85cba05

Using transformation method in the ImageFloatingTextView

Otherwise things like singleline and password don't work.

Test: runtest -x core/tests/coretests/src/com/android/internal/widget/ImageFloatingTextViewTest.java
Change-Id: I9d7d13c038be38319e6516715137789f612a43f7
Fixes: 36713596

Merge "Remove ALOGD_IF_SLOW" into oc-dr1-dev-plus-aosp
am: 5be9705588

Change-Id: I639678a11662e867bc62c6a18ca9f9725aae0c51

Merge "canBeModified accessors for AmbientDisplay pickup setting" into oc-dr1-dev am: 7c9a6b502a
am: 804322ee01

Change-Id: I19c58b8be852ab0a705b02f02d0b712bfefd3458

Merge "Document WifiScanner callback behaviors" into oc-dr1-dev

Merge "Remove ALOGD_IF_SLOW" into oc-dr1-dev-plus-aosp

Merge "canBeModified accessors for AmbientDisplay pickup setting" into oc-dr1-dev
am: 7c9a6b502a

Change-Id: I40ced751c59fbc10d0a23a3e06fe66cc59eafd17

Merge "canBeModified accessors for AmbientDisplay pickup setting" into oc-dr1-dev

Merge "Count incorrect password attempts from shell."

Merge "TSMS updates settings properly in case of package changes"

Merge "Clean up TSMS#setCurrentSpellCheckerLocked."

Merge "Merge "Address further API review comments" am: b279ec51b6 am: cf8e06c0ac am: 92189b6e21 am: 7776b49c13"

Merge "Address further API review comments" am: b279ec51b6 am: cf8e06c0ac am: 92189b6e21
am: 7776b49c13

Change-Id: I0ae1025d7382ca0dca3cf69d7362df38898ee048

Merge "Update UCE service permissions' protection level from the old "signatureOrSystem" to "signature|privileged". Also: update some outdated protection level documentation in AndroidManifest.xml."

Merge "Address further API review comments" am: b279ec51b6 am: cf8e06c0ac
am: 92189b6e21

Change-Id: I6b15cc75923cd712ca62302b8f797899ad43ad00

Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper" am: b27c5e92a2 am: e5e3bdd460 am: b63707c0ca  -s ours
am: 47fa2c5fa7  -s ours

Change-Id: I35053b8e32b7ec14f87627c6158993535d490155

Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper" am: b27c5e92a2 am: e5e3bdd460
am: b63707c0ca  -s ours

Change-Id: I4910aa2c3e1284b0959d576af99fa1ef7a0071bf

Merge "Address further API review comments" am: b279ec51b6
am: cf8e06c0ac

Change-Id: I7364fbcc09eaf47a3c90def9fd03b5f9f1d92a7d

Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper" am: b27c5e92a2
am: e5e3bdd460

Change-Id: I6e9bdfa3632ffa9abace5823c0982440f269a2c1

Merge "Address further API review comments"
am: b279ec51b6

Change-Id: Idbb8fc5c6e6cd912acbca1b5b144533dbfff2775

Update to use GrBackendTexture/RT instead of Descriptors

Test: manual testing

Change-Id: Ide727a39e2c49f226c8d432608e0072214249451

Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper"
am: b27c5e92a2

Change-Id: Ibb5f53e5e81c7969ae8edf73a42d11cd8505b0d4

Avoid exposing OffloadCallbackEvent values

Keep the android.hardware.tetheroffload.control.V1_0.OffloadCallbackEvent
import from leaking outside of OffloadHardwareInterface by converting each
event type into a separate callback.

Add basic logging implementation in OffloadController. Seems like every
call just needs to log save for two that actually need to do work:

    - onSupportAvailable()
      * poll stats and notify NetworkStatsService
      * (re)push all state, as the hardware now supports offload (again)

    - onStoppedLimitReached()
      * poll stats and notify NetworkStatsService

Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passed
Bug: 29337859
Bug: 32163131
Merged-In: I7c7675922a561a4642120df51715a550dab7f503
Merged-In: Ie91b974fbf70a4242f8b220d5fa3d6a0de59201d
Merged-In: I46c2e5252ae72a09a1550862847c1af441ece072
(cherry picked from commit a0885000f227ebf15f0b78d1d28c7a5de4afa8ea)

Change-Id: I1981d8da79f24dd0b4d76b930a5f179682500294

Move @Ignore from class-level to test level.

Workaround for reporting error.

Test: runtest systemui
Bug: 63521982
Change-Id: I81e70605471469b0ffa630ff874427a621fc1135

Merge "Avoid exposing OffloadCallbackEvent values" into oc-dr1-dev am: fcceb3ada4
am: a7534f20cd

Change-Id: I7c7675922a561a4642120df51715a550dab7f503

Merge "Address further API review comments"

Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper"

Merge "Avoid exposing OffloadCallbackEvent values" into oc-dr1-dev
am: fcceb3ada4

Change-Id: Ie91b974fbf70a4242f8b220d5fa3d6a0de59201d

Stop unnecessary tethering reconfigurations

The TetheringConfiguraiton is retrieved at startup and on every
ACTION_CONFIGURATION_CHANGED broadcast.  Re-retrieving the config
at every upstream selection is unnecessary and fills up the logs.

Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passes
Bug: 32163131
Bug: 63250751
Merged-In: Id089375a5699ac1157fc5f445876fee558d7bc7e
Merged-In: I1fc87f9c2a31f7fd16889275e6ba197b2b48a264
Merged-In: Ia6276ada690aa3e4870bb83dc4bf3ddcddc35e7b
(cherry picked from commit 6ee73daa0aa90620e4b2cb13ead4b53d16f45010)

Change-Id: Ic51123e173cc29cfcb52210707f2a0f8d2ab2e3b

Remove more references to kIndex_8

Test: Covered by existing tests. No actual change in behavior, since
kIndex_8 is not being used anyway.

Bug: 62483967

Change-Id: I317e3a814dbd102925fe412d2e19111b0af3af38

Merge "Avoid exposing OffloadCallbackEvent values" into oc-dr1-dev

Merge "Update keyguard mic icon to rounded" into oc-dr1-dev am: ea0beea5dd
am: ca07589a0a

Change-Id: I693532da82e2edba31069be1dd4ad257dec2c389

Merge "Update animations in QS" into oc-dr1-dev am: 497d73f35e
am: 11aba31e55

Change-Id: I466859df9f6b557060bb36eb3878896be438d9d1

Merge "Update keyguard mic icon to rounded" into oc-dr1-dev
am: ea0beea5dd

Change-Id: I25406b379b0cb7d554505ad72912b45d01880f33

Merge "Update animations in QS" into oc-dr1-dev
am: 497d73f35e

Change-Id: I64226ee9f79dc94e2009d27572b85b1668bff3d7

Handle failures in validators

Test: cts-tradefed run cts-dev -m CtsAutoFillServiceTestCases
          --test=android.autofillservice.cts.ValidatorTest
Bug: 62534917

Change-Id: I3aad06cd2e8b6caf7238e420727aca0cb3703bc5

Merge "Merge "Stop unnecessary tethering reconfigurations" into oc-dr1-dev am: 49a16f0998 am: e49c3675fe"

Merge "Stop unnecessary tethering reconfigurations" into oc-dr1-dev am: 49a16f0998
am: e49c3675fe

Change-Id: Id089375a5699ac1157fc5f445876fee558d7bc7e

Merge "Update keyguard mic icon to rounded" into oc-dr1-dev

Merge "Update animations in QS" into oc-dr1-dev

Merge "Fix Handler.Callback.handleMessage javadoc."

Merge "Stop unnecessary tethering reconfigurations" into oc-dr1-dev
am: 49a16f0998

Change-Id: I1fc87f9c2a31f7fd16889275e6ba197b2b48a264

Merge "Stop unnecessary tethering reconfigurations" into oc-dr1-dev

Revert "AAPT2: Auto-version adaptive-icon XML"

This reverts commit 5b7337f77cf036dda2c7218ccf22dedc774dcf76.

Bug: 63579299
Test: none
Change-Id: Ib617c4edfc16eeae3507b59b2debeae4f8bbf9a5

Add OffloadHardwareInterface.getForwardedStats() wrapper

Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passes
Bug: 29337859
Bug: 32163131

Merged-In: I41f837e16eff9a4cd763d65155bd9b5d5d980acd
Merged-In: Id9766983a3bbd885ef0f0d3ba9e33de903939f2d
Merged-In: Id831bc99cadbd59d280b026866707dbbe3b0e542
(cherry picked from commit 9a5b02a89c02d5ff633d8456b22d3d5b7a15bd44)

Change-Id: I0752b6e2cf1e0b9a5075f7911408528538683c84

Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper" into oc-dr1-dev am: 9df88e1fe7
am: 154bcbe518

Change-Id: I41f837e16eff9a4cd763d65155bd9b5d5d980acd

Merge "Don't animate bouncer changes when fading out Keyguard" into oc-dr1-dev am: f33b1eda88
am: fb8e9add4b

Change-Id: I01bf252c08decae7f82ce854332c3b4a342b5ee3

Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper" into oc-dr1-dev
am: 9df88e1fe7

Change-Id: Id9766983a3bbd885ef0f0d3ba9e33de903939f2d

Count incorrect password attempts from shell.

Test: adb shell cmd lock_settings verify --user 10 --old 12368
      and check device admin broadcast
Bug: 63295016

Change-Id: I19398eec9b324a061c4054d95dab12d047d501a5

Merge "Don't animate bouncer changes when fading out Keyguard" into oc-dr1-dev
am: f33b1eda88

Change-Id: I2ea9ccbfe01cfa948fb6dc6012859fc43a5c284b

Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper" into oc-dr1-dev

resolve merge conflicts of 5e7b01c8236b to oc-dr1-dev-plus-aosp
am: dbdf7c1484

Change-Id: I29bff92b43e0662f11823c795036e41e51477017

Merge "Don't animate bouncer changes when fading out Keyguard" into oc-dr1-dev

Add OffloadHardwareInterface.getForwardedStats() wrapper

Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passes
Bug: 29337859
Bug: 32163131

Change-Id: Id831bc99cadbd59d280b026866707dbbe3b0e542

resolve merge conflicts of 5e7b01c8236b to oc-dr1-dev-plus-aosp

Test: make -j64 framework services
Change-Id: I00460c8fe606fdce1f121685919d9a2e54febe5a

Merge "Binder: Don't attempt to catch OutOfMemoryError"

Fix Handler.Callback.handleMessage javadoc.

Currently arguments and return value annotations are applied to the
whole interface and aren't rendered at all:
https://developer.android.com/reference/android/os/Handler.Callback.html#handleMessage(android.os.Message)

Test: nothing to test.
Change-Id: I8cb44f7a6c339971b770e9bf769efee8294b4d28
Bug:36127602