Merge "Changed to use putLong() instead of putInt() for initialization of KEY_SUBSCRIBE_RETRY_DURATION_MILLIS_LONG)" into main

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



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

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



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

Bug: 283121968
Test: NA
Flag: NA
Change-Id: Ia7a8ff87f7e2967cd4f3f2fd4ca28ee41485a82f

Test: Manually by adding a widget
Bug: 245950570
Change-Id: Ia8fd366b7926fe6992ae7e1f06d58e9af872df8d

Merge "Invalidate connectionless handwriting availability cache when enabled setting changes" into main

Merge "Sort user restriction constants and add the missing `DISALLOW_CONFIG_DEFAULT_APPS`." into main

Merge "Extract api_versions_defaults from api_versions_* modules" into main am: e343d44c am: b44a8c74

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



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

Bug: 317891876
Test: atest KeyguardSmartspaceRepositoryImplTest, KeyguardSmartspaceViewModelTest
Flag: ACONFIG com.android.systemui.migrate_clocks_to_blueprint STAGING

Change-Id: I29b4799482bc6f87171fd958458552c971cc060d

This is a preparation to start maintaining
InputMethodBindingController instance for each user.

If you take a closer look at what

  InputMethodMangerService#switchUserOnHandlerLocked(),

then you may find that we update IMMS#mCurrentUserId to the new user
ID first, followed by IMMS#resetCurrentMethodAndClientLocked(), which
resets the state for the new user. In reality, however, what we have
cleaned up are states in IMMS for the previous user. Such confusions
are not new at all. I can actually see them at least 6 years ago [1].

Another relatively new confusion is around

  InputMethodManagerService#onUnbindCurrentMethodByReset() [2]

which was introduced to address Bug 285821212.

The code in question is now invoked not only when the IME user is
switching but also when resetCurrentMethodAndClientLocked() gets
called for other reasons, while its code comment and manual testing
only mention the IME user switching scenario. Watch Bug 338461930
regarding whether such a workaround is still necessary or not.

Anyway with this CL

  InputMethodManagerService#switchUserOnHandlerLocked()

starts explicitly resetting state for the previous user rather than
the current user, with a TODO comment about Bug 197848765 where we are
going to see if we can keep the previous IME binding alive for better
profile switching performance.

We hope there is no observable behavior change, but if there was then
it'd be considered to be a bug that needed to be fixed sooner or
later.

 [1]: I63388402369f58d11fdb21b508eb2051ff39fa5b
      0d7aff8a
 [2]: I0873ec065722e9e0b22dd5010d3415d3704cfd2d
      56fa6466

Bug: 325515685
Test: presubmit
Change-Id: Ida3cb689b450a775529edebb87cbb6e58b32c8a6

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



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

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



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

* changes:
  camera2 impl: Return rotation type from `shouldOverrideToPortrait`, and rename to `getRotationOverride`.
  camera2 impl: Allow connecting clients to specify rotation override

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



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

Bug: 338036076
Test: StylusHandwritingTest
Change-Id: I1e3198fb94c9a781cf709b2a55197ad65e354278

To services/tests/servicestests/src/com/android/server/autofill

Change-Id: Ibcd6798627dc3506e4ef4ed690daf5c4e90c53d1
Test: n/a
Bug: n/a