Bug: N/A
Test: N/A
Change-Id: I48f986e1ca5eadc6c23ca693143f122e415eeefd

* changes:
  health: Drop HealthServiceWrapperHidl.init.
  BatteryService: remove HIDL-ness
  Move BatteryServiceTest to HealthServiceWrapperTest.

* changes:
  Correct the request number
  VoNR toggle

Test: check owners file
Change-Id: If8adecda0d23d6d673825695e57813b281c0f6bc

RIL_REQUEST_IS_VONR_ENABLED

Bug: 203162440
Test: make
Change-Id: I9ecdc1811e9e680cd966ab91e7e2906a71e1c6ea

Allow user to enable or disable voice over NR.

Bug: 190668235
Test: verified using settings UI
Change-Id: I655dc93c0b213e1b85b29b9a168f99072ca82186
Merged-In: I655dc93c0b213e1b85b29b9a168f99072ca82186

The count down latch is triggered too early that the value
to be verified may not have been set.

Fixes: 194183975
Test: atest ActivityOptionsTest#testTransferLaunchCookie
Change-Id: I3b78db921a178e2df970a85496ae5238b5bd6fb3
(cherry picked from commit c10eb7b1)

add sasindran
rm nazaninb

Bug: 199432252
Test: build
Merged-In: I2f537aaf1faec1dce65a3041da8b13e15ed96057
Change-Id: I2f537aaf1faec1dce65a3041da8b13e15ed96057

When carriers have more than one APN that supports
internet APN type, the data icon might sometimes
disappeared, for example, after sending an MMS.
This is caused by the PreciseDataConnectionState
refactoring in Android 12. Added the workaround in
TelephonyRegistry to aggregate the data connection state for
internet, since it would be very difficult to make this
right in DataConnection class.

In Android 13, a more robust and comprehensive logic will
be added in the new data network controller to fix this.

Fix: 204328662
Fix: 187967526
Test: Manual test & TelephonyRegistryTest
Merged-In: Icba446e879e4d892829b41fdea50ebc1a10bf832
Change-Id: Icba446e879e4d892829b41fdea50ebc1a10bf832
(cherry picked from commit c50ef8d0)

Bug: 205633893
Test: n/a

Change-Id: Ib9cf70c9acb200e8019a6522cb6a85f85b760651

This change ensures that if the VCN's underlying network MTU is not
reported via the LinkProperties APIs (as in the case of Carrier WiFi),
the kernel values will be used (as possible).

Bug: 204813618
Test: Manual testing
Test: atest FrameworksVcnTests CtsVcnTestCases
Change-Id: If291aa6b915e4da39152a679bbe3e40216b42f44

Having a separate init function is a bad contract because
the client may not call it. Replace it with the constructor.

This reduces technical debt.

Test: pass
Change-Id: I3828903b006c32eb6898d36e64326520ef601ba8

Move HIDL-specifics of BatteryService to a list of classes
under com.android.server.health, so that we can replace
with the AIDL HAL easily.

HealthInfo types are kept as HIDL types. This will be
transformed to AIDL types in the next CL.

Also move BatteryServiceTest to HealthServiceWrapperTest,
since it essentially test just HealthServiceWrapper. Moving
the test to the proper package allows us to make things
package private.

Also make HealthServiceWrapperTest JUnit 4, since AndroidTestCase
is deprecated.

Test: builds
Test: atest FrameworksServicesTests
Bug: 177269435

Change-Id: Ie4dff341594fe9185a188ad963f29ade5d199e85

Moving the file in this commit so that git recognizes
that the file is moved, not deleted then created.

Test: none (note: this cannot be built. See next CL that
      correctly fix this.)
Bug: 177269435
Change-Id: I3c41ba1571c30a912b558dac4f1aaf8f1b5c5b61

The new name better aligns with the component and permission names.

Follow up review comments on https://r.android.com/1784487

Bug: 183487233
Test: presubmit
Change-Id: Ibe3a3e51b0dc154ee3e43b27e561fd541b62cc54

setTurnScreenOn shouldn't dismiss keyguard automatically even when the
keyguard is insecure.
The keyguard state should only be affected by requestDismissKeyguard
and/or setShowWhenLocked, and for either case setTurnScreenOn can be
used to wakeup device if the activity is going to be resumed and
visible.

Bug: 201103497
Test: atest ActivityVisibilityTests KeyguardTests KeyguardLockedTests
Change-Id: I283dea469a33286fc9cf835e39ee5a3be2444739

Test: pass
Bug: 177269435
Change-Id: I71bceb1bb6d1797cdc744ae939b0d4e694a7c8e6

Merged traffic descriptor into DataProfile. Now DataProfile
becomes a container of an ApnSetting plus a TrafficDescriptor.

Bug: 196597630
Test: CTS && atest FrameworksTelephonyTests
Merged-In: I1f2ad8239461469bacb8fb67e2e61c9a8a47795b
Change-Id: I1f2ad8239461469bacb8fb67e2e61c9a8a47795b
(cherry picked from commit bbb11109)

This is needed for CompatChangeTests to verify that the min aspect ratio
is applied directly by checking the min aspect ratio.

Bug: 203541827
Test: N/A
Change-Id: I1736cd4a2c4a1c5857796fa9772def7b7d94ba33
Merged-In: I1736cd4a2c4a1c5857796fa9772def7b7d94ba33

Merge "Deprecate GATT callbacks and methods that were not memory safe and replace with memory safe versions."