Commit Graph

18873 Commits

Author SHA1 Message Date
Wu Ahan
782704f726 Merge "Instrument jank of CUJ take screen shot" into tm-dev am: 009099e89d am: cf5583bf8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17729988

Change-Id: I09dfd3206692095de3c5a994f9ae9a68cec77ccc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:39:48 +00:00
Tom Hsu
6ea3e95bda Merge "[Panlingual][frameworks] Fix when tap search bar, will leave a big blank." into tm-dev am: a3352d9664 am: b701f56be1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18245866

Change-Id: Iece9c300c35e7fa03b07a6987e7c188fb31e8a91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:36:45 +00:00
Wu Ahan
009099e89d Merge "Instrument jank of CUJ take screen shot" into tm-dev 2022-05-11 06:35:13 +00:00
Tom Hsu
a3352d9664 Merge "[Panlingual][frameworks] Fix when tap search bar, will leave a big blank." into tm-dev 2022-05-11 05:51:00 +00:00
Song Hu
3eb9f7ec08 Merge "ChooserActivity populates intentFilter mimeType with intent.getType() prior to intent.getDataString(). This fixes the issue in screenshot sharing that no or much less than usual direct share recommendations surface." into tm-dev am: 6c90bbe1cf am: 6ac3d6e6b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18213842

Change-Id: I57fcf9fab179487d2a7a8714470c5c41ebe47df5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:49:13 +00:00
Shawn Lin
4220129dd8 Merge "Add multi-user support for kids mode" into tm-dev am: 3ab2eccace am: 38d3dfb73b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18186214

Change-Id: I660107c1d03577fd9d922851fb6a0d3a6ed20c2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:20:36 +00:00
Song Hu
6c90bbe1cf Merge "ChooserActivity populates intentFilter mimeType with intent.getType() prior to intent.getDataString(). This fixes the issue in screenshot sharing that no or much less than usual direct share recommendations surface." into tm-dev 2022-05-10 15:23:31 +00:00
Shawn Lin
3ab2eccace Merge "Add multi-user support for kids mode" into tm-dev 2022-05-10 12:30:16 +00:00
tom hsu
75ed59fac9 [Panlingual][frameworks] Fix when tap search bar, will leave a big blank.
- Close blank layout after title disappear when search bar is expanded.

Bug: b/227287277
Test: local, see b/227287277#6
Change-Id: I6b5f6990cacf6da9e17b743519ae554af32f691d
2022-05-10 08:30:38 +00:00
Chaohui Wang
54eaec2970 Merge "Add validation TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev am: 4f4e8dd340 am: 76a8e262c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17799990

Change-Id: I0da7c189417af7fcc2a7615a51f7bac6df8bf344
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 05:02:21 +00:00
Alex Buynytskyy
a44b77400f Merge "Forcefully convert to basic Intent before calling PM API." into tm-dev am: 4220511d7e am: bf71a1df9c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18232666

Change-Id: I71658ad58b593f6cbadaf8148cb5c6859ac7151b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 03:40:46 +00:00
Shawn Lin
2b9e4b6550 Add multi-user support for kids mode
Listener to ACTION_USER_SWITCH intent and update the settings key when
user switched.

Bug: 231575466
Test: 1. set different settings keys for different user.
      2. switch between users and see if the setting value is correct.
Change-Id: Ia1afcb6121b296b293bef0ba7d0a0be25b857554
2022-05-10 03:03:56 +00:00
Chaohui Wang
4f4e8dd340 Merge "Add validation TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev 2022-05-10 02:44:48 +00:00
Joanne Chung
070275dcae Merge "[DO NOT MERGE] Remove selection toolbar code from build time" into tm-dev 2022-05-10 00:59:33 +00:00
Dmitri Plotnikov
aa84263421 Merge "Fix recording of battery history tags" into tm-dev am: f19925afc9 am: 3fee69e9d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18202091

Change-Id: I362aed6e9693f2f1ed381a9937779d2dd5389ca4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 21:55:28 +00:00
Raphael Kim
bcca281f85 Merge "Remove package title from notification access confirmation intent" into tm-dev am: 75577e9421 am: a57a8cc9fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18151122

Change-Id: I6fff009aeb50d409dc240ded3c41567ae6b0e906
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 21:53:51 +00:00
Alex Buynytskyy
4220511d7e Merge "Forcefully convert to basic Intent before calling PM API." into tm-dev 2022-05-09 21:44:00 +00:00
Tiger Huang
a86bfea124 Merge "Don't clip background drawable if navigation color view is not opaque" into tm-dev am: b8ab50b68b am: 17bca21f03
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18195528

Change-Id: I7472dcbd4e53a8510e9447b60ea9636f04910ec9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 18:32:01 +00:00
Rubin Xu
9c5a573cbb Merge "Protect UnlaunchableAppActivity against overlay attack" into tm-dev am: 9c9916e4d9 am: 7a6900a0f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18197412

Change-Id: I5a96bafd14fef807272b27a7e56be3b1849d852f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 18:07:25 +00:00
Dmitri Plotnikov
f19925afc9 Merge "Fix recording of battery history tags" into tm-dev 2022-05-09 17:56:17 +00:00
Raphael Kim
75577e9421 Merge "Remove package title from notification access confirmation intent" into tm-dev 2022-05-09 17:55:07 +00:00
Alex Buynytskyy
7e0ab65145 Forcefully convert to basic Intent before calling PM API.
AIDL can't accept subclasses, see more info in the bug

Bug: 223022163
Fixes: 223022163
Test: launch WSJ, click on share
Change-Id: I0015fda3a6fb741b109f7d3d00df1da6f7d64863
2022-05-09 09:17:23 -07:00
Michael Hoisie
2042cf6e30 Merge "Fix a thread leak due to a race condition in BackdropFrameRenderer" 2022-05-09 15:38:09 +00:00
Tiger Huang
b8ab50b68b Merge "Don't clip background drawable if navigation color view is not opaque" into tm-dev 2022-05-09 12:47:17 +00:00
Rubin Xu
9c9916e4d9 Merge "Protect UnlaunchableAppActivity against overlay attack" into tm-dev 2022-05-09 11:41:02 +00:00
Song Hu
fbdcff39cd ChooserActivity populates intentFilter mimeType with intent.getType() prior to intent.getDataString(). This fixes the issue in screenshot sharing that no or much less than usual direct share recommendations surface.
Test: atest
Test: test on phone
Bug: 229607293
Change-Id: I8d610e4c7033b25eea8a98885339207a723716b6
2022-05-07 22:22:27 +00:00
Hans Boehm
61a0e87d13 Merge "Document VirtualRefBasePtr hazards" am: 5ee3cfe147 am: 29eb7ad17e am: 0c1d2d8fbf am: de5f5a5bb5 am: cd0de54d71
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2081782

Change-Id: I7a21c4e32b571f84872bb637b04bb596f9f09b0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 03:03:56 +00:00
Treehugger Robot
33306a8a8d Merge "Set an edit uri to data of ACTION_EDIT" am: 1e3e69212a am: 0db2c732ac am: c92d823876 am: 053feadc0d am: 70e603062a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049443

Change-Id: Ib086ad4a69e1668eb03e13a697f182761c7c29d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 02:07:27 +00:00
Hans Boehm
cd0de54d71 Merge "Document VirtualRefBasePtr hazards" am: 5ee3cfe147 am: 29eb7ad17e am: 0c1d2d8fbf am: de5f5a5bb5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2081782

Change-Id: I3baa36777a4d08f27084122d297968bfea9cbdad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 01:13:05 +00:00
Hans Boehm
0c1d2d8fbf Merge "Document VirtualRefBasePtr hazards" am: 5ee3cfe147 am: 29eb7ad17e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2081782

Change-Id: I7df909549bb80d31774ba0fa472ffaeee8ce132b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 00:35:58 +00:00
Hans Boehm
29eb7ad17e Merge "Document VirtualRefBasePtr hazards" am: 5ee3cfe147
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2081782

Change-Id: I5e80ebf68b5faf3215b37bef66631452e7322d16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 00:10:26 +00:00
Dmitri Plotnikov
44cb0c4e31 Fix recording of battery history tags
Bug: 230552845
Test: atest FrameworksCoreTests:BatteryStatsTests

Change-Id: I018cf3f85e8ef11167e780653863b234822be27a
2022-05-06 17:08:18 -07:00
Hans Boehm
5ee3cfe147 Merge "Document VirtualRefBasePtr hazards" 2022-05-06 23:54:45 +00:00
Treehugger Robot
70e603062a Merge "Set an edit uri to data of ACTION_EDIT" am: 1e3e69212a am: 0db2c732ac am: c92d823876 am: 053feadc0d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049443

Change-Id: I6dc838e027a2e29a2494b4cd0d932d764c45749b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 22:27:43 +00:00
Treehugger Robot
c92d823876 Merge "Set an edit uri to data of ACTION_EDIT" am: 1e3e69212a am: 0db2c732ac
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049443

Change-Id: I8ddbe81595509ca00044e4a9b1990a309ee0ab6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 21:39:02 +00:00
Song Hu
7188047a7b Merge "ChooserActivity reports whether the selected target is pinned in Westworld logging" into tm-dev am: 42bf145179 am: b827fd4ea1 am: 665a477e0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18144333

Change-Id: Ic9d3db7547f7cbc44e0aa6cf99ada05ee9f81879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 21:38:11 +00:00
Song Hu
665a477e0e Merge "ChooserActivity reports whether the selected target is pinned in Westworld logging" into tm-dev am: 42bf145179 am: b827fd4ea1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18144333

Change-Id: Iecfedf07e9e45e789e093c9b7ff6c038b386e085
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 21:16:36 +00:00
Treehugger Robot
0db2c732ac Merge "Set an edit uri to data of ACTION_EDIT" am: 1e3e69212a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049443

Change-Id: I128625d46b2daf19ae7dbb8293f2415b940e9c02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 21:16:32 +00:00
Song Hu
29a03b252f Merge "ChooserActivity reports whether the selected target is pinned in Westworld logging" into tm-dev am: 42bf145179 am: b33e3fad36
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18144333

Change-Id: If08ef08c791e29d176a533392ad20aaa5d86100f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 20:53:51 +00:00
Shan Huang
4890b196dd Merge "Migrate IME to handle back with OnBackInvokedDispatcher." into tm-dev am: e3a61826eb am: 687f095281
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17952046

Change-Id: If970de371776a5d1a108030a0e4d2d495614a4be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 20:52:11 +00:00
TreeHugger Robot
38781d3972 Merge "Fix logging crash in ResolverRankerService model" into tm-dev am: ad237705da am: 7174869c27
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18185215

Change-Id: If2cf0bee9b79f93712ab5455b53e09296be7d833
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 20:42:42 +00:00
Song Hu
fb3db94c78 Merge "ChooserActivity reports whether the selected target is pinned in Westworld logging" into tm-dev am: 42bf145179
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18144333

Change-Id: Ic60751ea6d00a1812da32a7eb34cf7b7ea5ed30c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 20:40:04 +00:00
Treehugger Robot
1e3e69212a Merge "Set an edit uri to data of ACTION_EDIT" 2022-05-06 20:38:05 +00:00
Song Hu
42bf145179 Merge "ChooserActivity reports whether the selected target is pinned in Westworld logging" into tm-dev 2022-05-06 20:36:02 +00:00
Shan Huang
5753b4fbe1 Merge "Migrate IME to handle back with OnBackInvokedDispatcher." into tm-dev am: e3a61826eb am: 4472170cb9 am: 78c429f948
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17952046

Change-Id: I297c0cfde12b4c668203400446e897f51c0d543b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 20:32:14 +00:00
Shan Huang
78c429f948 Merge "Migrate IME to handle back with OnBackInvokedDispatcher." into tm-dev am: e3a61826eb am: 4472170cb9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17952046

Change-Id: Icf52d1afb13bdab55270c3e6319b4d889d114db0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 20:19:10 +00:00
Shan Huang
6ab5e39822 Merge "Migrate IME to handle back with OnBackInvokedDispatcher." into tm-dev am: e3a61826eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17952046

Change-Id: I33ca384c6ed7f423e7d70099db4870c8cfa9f01c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 19:52:31 +00:00
Shan Huang
e3a61826eb Merge "Migrate IME to handle back with OnBackInvokedDispatcher." into tm-dev 2022-05-06 19:35:42 +00:00
Hans Boehm
d72e472407 Document VirtualRefBasePtr hazards
Test: Treehugger
Change-Id: I6f364b4e0f73a2eb554f2902a67e774ef5890b00
2022-05-06 11:11:37 -07:00
TreeHugger Robot
4409bd790e Merge "Fix logging crash in ResolverRankerService model" into tm-dev am: ad237705da am: bde21c1bb8 am: 488b3f9926
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18185215

Change-Id: Ie4799e2b417392b09f6b14e49f45aa262322b849
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 16:20:04 +00:00