Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
769,750 Commits 3 Branches 0 Tags
d4d54d88eced5d8922bbcd68fa9eff512dcff0a8
Commit Graph

18825 Commits

Author SHA1 Message Date
Song Hu
c505075bd3 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: 04e773c395 am: 81c8f40053 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18213842

Change-Id: Ibfa3f9af3c0d61d5c9daa8472234606c03e6b0d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:37:10 +00:00
Shawn Lin
5a4a20ce70 Merge "Add multi-user support for kids mode" into tm-dev am: 3ab2eccace am: 06c8b78bae am: 7c37101a48 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18186214

Change-Id: Ice49c1b5c35b4139319d4563e563ed4533e6c91a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:31:51 +00:00
Song Hu
04e773c395 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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18213842

Change-Id: I11d92e51949b00bb6e4f182b80b6adf3bdd18a0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:36:39 +00:00
Shawn Lin
06c8b78bae Merge "Add multi-user support for kids mode" into tm-dev am: 3ab2eccace 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18186214

Change-Id: I8e157b22b287a84fc4e579552be816a51b4cb862
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 20:26:46 +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
Chaohui Wang
c36fe527b4 Merge "Add validation TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev am: 4f4e8dd340 am: f260301608 am: 1ce828ffdc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17799990

Change-Id: I65b642c2c391d8270982f36b0dd7abcf61703aff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 12:50:58 +00:00
Shawn Lin
3ab2eccace Merge "Add multi-user support for kids mode" into tm-dev 2022-05-10 12:30:16 +00:00
Joanne Chung
9190fad4f7 [DO NOT MERGE] Remove selection toolbar code from build time am: ade911b9c7 am: 724dd81653 am: ebc3fb469c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18162825

Change-Id: Ie0232a1241669e1f03b81d71c05abef69ead9b59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 11:03:52 +00:00
Chaohui Wang
f260301608 Merge "Add validation TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev am: 4f4e8dd340 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17799990

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

Change-Id: I782e1d3fd2949c64f2be0f077a368dbcde9c6e36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 06:04:59 +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
Joanne Chung
724dd81653 [DO NOT MERGE] Remove selection toolbar code from build time am: ade911b9c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18162825

Change-Id: If09c9e832c2d087ae523ab189319036f9e3a6b61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 02:53:42 +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
Alex Buynytskyy
66dd9d37e4 Merge "Forcefully convert to basic Intent before calling PM API." into tm-dev am: 4220511d7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18232666

Change-Id: Ia2c2957ef2cd40439daf5b62b7ef489c563bfa21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 23:17:30 +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
Dmitri Plotnikov
680e98fa7c Merge "Fix recording of battery history tags" into tm-dev am: f19925afc9 am: af94d05875 am: ab858c6af2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18202091

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

Change-Id: Iee49581fa4aa751c286b10fe53f8d3b97e987c50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 21:07:35 +00:00
Dmitri Plotnikov
8c766d1ef2 Merge "Fix recording of battery history tags" into tm-dev am: f19925afc9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18202091

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

Change-Id: I7cbe28e79f497ff1c3ecb60caa2627cd867945fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 20:41:49 +00:00
Tiger Huang
9e8e7891da Merge "Don't clip background drawable if navigation color view is not opaque" into tm-dev am: b8ab50b68b am: 6ad6a41d46 am: 726e9b34e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18195528

Change-Id: I2dffcf5b7f714df6dcb0bcf69a9bbc3f05c4a3dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 20:11:18 +00:00
Rubin Xu
f7ff202012 Merge "Protect UnlaunchableAppActivity against overlay attack" into tm-dev am: 9c9916e4d9 am: 3327a4c0d7 am: 05823d0e3e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18197412

Change-Id: Icbfedc68522c7dabf68c368d1228c22901720468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 19:57:08 +00:00
Dmitri Plotnikov
ab858c6af2 Merge "Fix recording of battery history tags" into tm-dev am: f19925afc9 am: af94d05875 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18202091

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

Change-Id: I61966c98af52a2e556b8dad4b52e8c8602b1a367
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 19:50:13 +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
Tiger Huang
752819c0b3 Merge "Don't clip background drawable if navigation color view is not opaque" into tm-dev am: b8ab50b68b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18195528

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

Change-Id: I75581b0124116eb7efd50d892491d72d5f5b7fec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 17:23:28 +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
Tiger Huang
726e9b34e7 Merge "Don't clip background drawable if navigation color view is not opaque" into tm-dev am: b8ab50b68b am: 6ad6a41d46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18195528

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

Change-Id: I18b8050a1847051671f98c1d435a49d67ae452d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 15:29:15 +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
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
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