Commit Graph

758326 Commits

Author SHA1 Message Date
Jing Ji
300599c630 Merge "Add a device config about moving abusive apps to restricted level" into tm-dev 2022-04-22 07:28:50 +00:00
Hakjun Choi
e595e78a22 Merge "Reinforce comments for newly added provisioning keys" into tm-dev 2022-04-22 07:21:51 +00:00
Mark Punzalan
ac9ae5d960 Merge changes from topic "b192331240-singleInvoke" into tm-dev
* changes:
  Rename translationActivityUid to translatedAppUid.
  Reduce duplicate UiTranslationStateCallback calls.
2022-04-22 07:01:15 +00:00
TreeHugger Robot
acb5ec3db7 Merge "usb: Add the boot completed check before broadcasting intent" into tm-dev 2022-04-22 06:27:40 +00:00
Bill Yi
02cb8a83b6 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-22 06:17:37 +00:00
Kathy Chen
3c3cd552a4 Merge "Fix a typo in AbstractMasterSystemService." into tm-dev 2022-04-22 06:14:01 +00:00
TreeHugger Robot
c3947aa6ff Merge "Do not run NotificationTest on Auto." into tm-dev 2022-04-22 05:58:06 +00:00
Charles Chen
bf10e8cce5 Merge "Revert "Fix testRegisterComponentCallbacksOnWindowContext flaky"" into tm-dev 2022-04-22 04:33:20 +00:00
TreeHugger Robot
f840778b7d Merge "Allow injecting cached NTP time without network" into tm-dev 2022-04-22 03:55:45 +00:00
TreeHugger Robot
a136110aa2 Merge "Fix testGetSurroundingTextFailWithNegative{Before,After}LengthForA11y" into tm-dev 2022-04-22 03:35:35 +00:00
TreeHugger Robot
5f803607fe Merge "Use correct timeout when gating sync transaction" into tm-dev 2022-04-22 02:40:10 +00:00
Kohsuke Yatoh
37893c2046 Merge changes from topic "kyatoh-b221483132-tm-dev" into tm-dev
* changes:
  Do not cleanup IME window if show is requested.
  Notify IMMS synchronously on IME insets hidden.
2022-04-22 02:14:55 +00:00
TreeHugger Robot
26fa852fd6 Merge "Block subdirs of Android for SAF and normalize the path" into tm-dev 2022-04-22 02:02:16 +00:00
TreeHugger Robot
4b086b73e3 Merge "Fix memory leak in MultiStateCounter" into tm-dev 2022-04-22 01:26:46 +00:00
TreeHugger Robot
692d9be97d Merge "Collect the max number of successive missed frames metric." into tm-dev 2022-04-22 01:10:45 +00:00
Sravan Kumar Reddy Kallu
ce506dcf00 Revert "Fix testRegisterComponentCallbacksOnWindowContext flaky"
This reverts commit edf1b37a08.

Reason for revert: ~2.49 seconds of BootTime regression b/230022846

Change-Id: Icaddb7aa21b95ad6f9f589528fe893ae8d5c9c93
Exempt-From-Owner-Approval: see go/perf-revert-first
2022-04-22 01:07:19 +00:00
Hakjun Choi
79a5053197 Reinforce comments for newly added provisioning keys
changing mmtel_requires_provisioning_bundle requires changes to
carrier_volte_provisioning_required_bool and vice versa

Bug: 229935282
Test: N/A, add simpl comment
Change-Id: I38dee512f3fc98f94b49e300860617ec54c52832
2022-04-22 00:58:01 +00:00
Kohsuke Yatoh
7f1e7a1e65 Do not run NotificationTest on Auto.
Bug: 229820964
Test: atest InputMethodStressTest
Change-Id: Icf218460fa842f59125c2c09b822b3444ffc1281
2022-04-21 17:35:17 -07:00
Bill Yi
1e95f1abad Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-22 00:17:18 +00:00
Bill Yi
cc3a2fb673 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-22 00:17:18 +00:00
Bill Yi
e8fe645ac9 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-22 00:17:18 +00:00
Bill Yi
513d9fbcbe Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-22 00:17:18 +00:00
Bill Yi
d008d4c778 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-22 00:17:18 +00:00
Bill Yi
87fd93a325 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-22 00:17:18 +00:00
Jing Ji
c75fdad219 Add a device config about moving abusive apps to restricted level
Bug: 203105544
Test: Manual - toggle the flag in device_config
Change-Id: I69fab1de00c9a02beea517252fb6dd4706c608e1
2022-04-21 16:31:55 -07:00
Songchun Fan
da15b86d2b Merge "Add the compile reason for the forceDexOpt method" into tm-dev 2022-04-21 22:47:59 +00:00
TreeHugger Robot
f1b91f6314 Merge "In getMatchingShareTargets, add callerLauncher to fetch sharesheet marked pin info." into tm-dev 2022-04-21 22:16:14 +00:00
TreeHugger Robot
e5f9c3da5c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 321bc7cceb -s ours am: ee573f4e36 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9fd7ffd6d863b97928705b8534a5445f9e090ab7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 21:55:07 +00:00
Bill Yi
bee9868d4d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c91b6268f7 -s ours am: 950a46807a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0a940f46bd9648a98b3d4ed7826bbd4a9d623ced
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 21:54:51 +00:00
TreeHugger Robot
1aef49b75c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 793546f301 -s ours am: 3ee7de7a2c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I88e1d52fa7bcd65b972f63e31daa8b31aa6d1af5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 21:54:38 +00:00
Bill Yi
d018849458 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc2e65f050 -s ours am: 648d65030a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1268afd30f20e7f09e490a51f87ca243b3c369eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 21:54:11 +00:00
TreeHugger Robot
14a9eeba83 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 17db7dfc1a -s ours am: 67e993c89a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id5df1fc275d4ed5734c85a64a760519a4adb5f46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 21:53:37 +00:00
Bill Yi
c1d7838afd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 90aca266a3 -s ours am: 065238c643 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I18c08c55fb518806f7d72005870290b0fad430a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 21:52:58 +00:00
Yu-Han Yang
34fbbdeb9a Allow injecting cached NTP time without network
Bug: 197038444
Test: manual
Change-Id: Ib47bc64e706201620edf6403da86338f6734dae4
2022-04-21 14:49:43 -07:00
Kohsuke Yatoh
eae7ca8165 Do not cleanup IME window if show is requested.
This CL fixes a race condition for IMM#showSoftInput, which surfaces
when it's called during an IME hide animation.
IMM#showSoftInput ends up calling WIC#show asynchronously, but at that
time the running IME hide animation may have already been finished
successfully, and WIC#show may fail to cancel the hide animation
(then the cleanup IMM#notifyImeHidden hides the IME again disruptively).

I think a clean fix is to have IMM#showSoftInput call WIC#show
synchronously. However, this requires a significant refactoring.

As a short term fix, this CL adds a boolean field indicating whether or
not IMM#showSoftInput has been called. If it's called, we skip calling
IMM#notifyImeHidden.

Bug: 221483132
Bug: 225674038
Test: atest InputMethodStressTest
Test: atest CtsInputMethodTestCases
Test: atest WindowInsetsAnimationControllerTests
Change-Id: I36d570630085d0bc34097a2433208601dc9cb0fd
(cherry picked from commit 4c607982ed)
Merged-In: I36d570630085d0bc34097a2433208601dc9cb0fd
2022-04-21 21:34:31 +00:00
Kohsuke Yatoh
4844170377 Notify IMMS synchronously on IME insets hidden.
Currently, IMMS will be notified asynchronously when an IME hide
animation finishes, via message dispatching through IMS
(IMM#notifyImeHidden -> IMS#notifyImeHidden -> IMMS#hideMySoftInput).
This creates a race condition when IMM#showSoftInput or WIC#show is
called around the end of hide animation.

This CL fixes the race condition by synchronously and directly
calling IMMS#hideSoftInput from IMM#notifyImeHidden.

Note that there is still another race condition for IMM#showSoftInput
(not WIC#show) if it's called during an IME hide animation;
IMM#showSoftInput ended up calling WIC#show asynchronously, but at that
time the running IME hide animation may have already been finished
successfully and WIC#show may fail to cancel the hide animation
(then the cleanup IMM#notifyImeHidden hides the IME again disruptively).
I will fix the latter issue in a separate CL.

Bug: 221483132
Bug: 225674038
Test: atest InputMethodStressTest
Test: atest CtsInputMethodTestCases
Test: atest WindowInsetsAnimationControllerTests
Change-Id: I7c71dc5a1d6b61aa79d1666f0e257e6401e4adb2
(cherry picked from commit 9065310f81)
Merged-In: I7c71dc5a1d6b61aa79d1666f0e257e6401e4adb2
2022-04-21 21:34:24 +00:00
TreeHugger Robot
ee573f4e36 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 321bc7cceb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia7a1e3d34fa6ef87f0007ce9477a44bbde833a31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 21:31:25 +00:00
Bill Yi
950a46807a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c91b6268f7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7389339146f07a0715dd696c1c4d35fa794a2905
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 21:31:14 +00:00
TreeHugger Robot
3ee7de7a2c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 793546f301 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0785e79539b85029940dccd2095150da43a91009
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 21:30:39 +00:00
Bill Yi
648d65030a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc2e65f050 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ice9edf5935593d7b419598ec426426243a855756
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 21:30:10 +00:00
TreeHugger Robot
67e993c89a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 17db7dfc1a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8856023f4ab609ba1a5bdebcaeb73dab35c20ed8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 21:29:47 +00:00
Bill Yi
065238c643 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 90aca266a3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5a9b7014f589d96c6d15b90e39f442c76bcd8056
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 21:29:08 +00:00
TreeHugger Robot
321bc7cceb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-21 21:13:11 +00:00
TreeHugger Robot
793546f301 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-21 21:13:11 +00:00
TreeHugger Robot
17db7dfc1a Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-21 21:13:11 +00:00
Dave Mankoff
6584dbb6e6 Merge "Cleanup GlobalModule." into tm-dev 2022-04-21 20:48:54 +00:00
Kathy Chen
dbc7e4a31e Fix a typo in AbstractMasterSystemService.
Test: make and flash device
Change-Id: I4757dd904748ffd6d6b1f794d1154d58dfce4c1a
2022-04-21 20:05:02 +00:00
TreeHugger Robot
fbcba37205 Merge "Check appOp in testWakefulnessAwake_AcquireCausesWakeup" into tm-dev 2022-04-21 19:23:32 +00:00
Mitch Phillips
ecaeb5a153 Merge "[GWP-ASan] Use new GWP-ASan android_mallopt()" am: a50c4137e3 am: 65b39e8f66 am: a94d0a79ce
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2040626

Change-Id: If42e3edea739733272fa9b1ecfc8f5bfb73b8490
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 19:18:20 +00:00
Nikita Dubrovsky
18a113c42d Merge "Remove manual pregrants for ContentCaptureService (now handled via roles)" into tm-dev 2022-04-21 19:12:26 +00:00