Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
640,245 Commits 3 Branches 0 Tags
f0cf73d84be390fed0cb888afcc4dbccf21fe751
Commit Graph

640245 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tiger Huang
f0cf73d84b Merge "Let IME receive insets ignoring z-order" into sc-dev 2021-05-11 10:55:03 +00:00
Anton Hansson
160d104df9 Merge "Use filegroups for test-{base,mock,runner} srcs" am: af9b5f0a04 am: 06e56695cc am: 4eecbfcd41 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1700026

Change-Id: I5444e5d1028c8cf9cd3fa624e05ad5b102866d94
 2021-05-11 10:49:42 +00:00
Lucas Lin
98994935c1 [automerger skipped] Merge "Replace hidden API with public API" am: 7283a692b0 am: 78619286d3 am: c127bc6c68 -s ours 
am skip reason: Merged-In I671aaf5099f7cd3459588a78cb99de39a0e23f95 with SHA-1 d569b783aa is already in history

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

Change-Id: Iabc9b8598bdeb8b0b23e9f4c39c2c421a62fe434
 2021-05-11 10:49:19 +00:00
Anton Hansson
8acd3a8e2b Merge "Fix incorrect package in PackageChangeReceiver" am: 0ee8641209 am: 03c08d1f14 am: 3da1090ce6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699739

Change-Id: Ib3596c8941803cfc7e55d47e2099d38857ade59c
 2021-05-11 10:48:48 +00:00
Anton Hansson
822d0ac2ba Merge "Inline two constants from CorePlatform" am: dbf1544b68 am: e3eefd6d2e am: 833e374197 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699727

Change-Id: Ibac0caf69f17c8f003a4a197654c176448a9b7b9
 2021-05-11 10:48:12 +00:00
Anton Hansson
4eecbfcd41 Merge "Use filegroups for test-{base,mock,runner} srcs" am: af9b5f0a04 am: 06e56695cc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1700026

Change-Id: I107e919ab5b175789ed96cc1d4f26e8075bfa2c5
 2021-05-11 10:45:31 +00:00
Alex Johnston
c8dffffc26 Merge "Remove device ownership text in quick settings" into sc-dev 2021-05-11 10:32:23 +00:00
Lucas Lin
c127bc6c68 Merge "Replace hidden API with public API" am: 7283a692b0 am: 78619286d3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1696668

Change-Id: I73eb1314cc4c894d9c4b7455588da7557eb792fb
 2021-05-11 10:30:02 +00:00
Anton Hansson
3da1090ce6 Merge "Fix incorrect package in PackageChangeReceiver" am: 0ee8641209 am: 03c08d1f14 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699739

Change-Id: I8b990f0929f557cb9b38ebb401ad98e287d39f1b
 2021-05-11 10:29:32 +00:00
Anton Hansson
833e374197 Merge "Inline two constants from CorePlatform" am: dbf1544b68 am: e3eefd6d2e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699727

Change-Id: Ifa3f8535c1135b5b67fc1fc9cb4f0377be3acd86
 2021-05-11 10:29:15 +00:00
Anton Hansson
06e56695cc Merge "Use filegroups for test-{base,mock,runner} srcs" am: af9b5f0a04 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1700026

Change-Id: I6e67d5d69e4863472eec70454cb9b338c40209a5
 2021-05-11 10:29:02 +00:00
Lucas Lin
78619286d3 Merge "Replace hidden API with public API" am: 7283a692b0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1696668

Change-Id: I4eaeb64157a95e91ca7af93c08a603483ceb9334
 2021-05-11 10:26:24 +00:00
Anton Hansson
af9b5f0a04 Merge "Use filegroups for test-{base,mock,runner} srcs" 2021-05-11 10:09:00 +00:00
Anton Hansson
03c08d1f14 Merge "Fix incorrect package in PackageChangeReceiver" am: 0ee8641209 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699739

Change-Id: Iaa83eecc886429b13ac569eae80a16b058670b20
 2021-05-11 10:06:13 +00:00
Lucas Lin
7283a692b0 Merge "Replace hidden API with public API" 2021-05-11 09:52:50 +00:00
Anton Hansson
0ee8641209 Merge "Fix incorrect package in PackageChangeReceiver" 2021-05-11 09:46:29 +00:00
Rubin Xu
c91f0da4fd Merge "Update SecurityLog javadoc" into sc-dev 2021-05-11 09:31:51 +00:00
Treehugger Robot
f6bb9a2050 Merge "Add back @UnsupportedAppUsage to IS_DEBUGGABLE" am: b369ebee31 am: 6edf32bd8e am: 04b9df477a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1701245

Change-Id: I435f82920ceaf7ebd6d2d4a8f73b0a21a23f28ef
 2021-05-11 09:25:56 +00:00
Anton Hansson
e3eefd6d2e Merge "Inline two constants from CorePlatform" am: dbf1544b68 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699727

Change-Id: I9888625f7e797b23b1a860cb6f076a6860428f27
 2021-05-11 09:25:17 +00:00
Marcin Oczeretko
af586a1465 Merge "Count the overall number of missed frames" into sc-dev 2021-05-11 09:09:40 +00:00
Anton Hansson
dbf1544b68 Merge "Inline two constants from CorePlatform" 2021-05-11 09:00:57 +00:00
Treehugger Robot
04b9df477a Merge "Add back @UnsupportedAppUsage to IS_DEBUGGABLE" am: b369ebee31 am: 6edf32bd8e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1701245

Change-Id: I71cc95dd57f112fba51e41a862deacdbdc1e9b6d
 2021-05-11 08:27:17 +00:00
Shan Huang
6dbef56e06 Merge "Update wireless charging layout to match the new design." into sc-dev 2021-05-11 08:06:59 +00:00
Treehugger Robot
6edf32bd8e Merge "Add back @UnsupportedAppUsage to IS_DEBUGGABLE" am: b369ebee31 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1701245

Change-Id: Ica5e6524d2fc45db65500d36e31604deb08632a8
 2021-05-11 08:03:32 +00:00
Kriti Dang
e5489584ef Merge "Removing the list of formats from the javadoc in setSurroundFormatEnabled" into sc-dev 2021-05-11 07:52:39 +00:00
TreeHugger Robot
e8ce892093 Merge "Use binder thread instead of main thread in HotwordDetectionService" into sc-dev 2021-05-11 07:50:29 +00:00
Treehugger Robot
b369ebee31 Merge "Add back @UnsupportedAppUsage to IS_DEBUGGABLE" 2021-05-11 07:32:37 +00:00
Chilun Huang
c4c9e2cad4 Merge "Update visibility when finishing activity" into sc-dev 2021-05-11 07:19:51 +00:00
TreeHugger Robot
5d9fa9063e Merge "Increase RESTRICTED timeout to 45 days." into sc-dev 2021-05-11 06:46:59 +00:00
TreeHugger Robot
d943571aa6 Merge "Update ColorFade to use BLAST" into sc-dev 2021-05-11 06:12:27 +00:00
Tianjie Xu
6bb5e2fb57 Merge "Check null for before using LockSettingsService" am: 964fccfefd am: e3e7ed125e am: a90fe61200 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674887

Change-Id: Ief6c22eddb92b24a79155724f41bdd0ed5e4ab09
 2021-05-11 06:11:27 +00:00
Benedict Wong
ce6ab40d43 Merge "Add log prefixes to uniquely identify each VCN/gwConn" am: fae9ba6535 am: af9b507963 am: 62135157e0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1700307

Change-Id: I2818b5d9fc39e50316a7cf6cbd62cc4b9993db79
 2021-05-11 06:11:06 +00:00
Benedict Wong
275bf90709 Merge changes from topic "vcn-fwd" am: d7d2d2a15b am: f980436b32 am: 600401154a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682047

Change-Id: I745687f69366657dc33bfdacd878e06affd6a8ec
 2021-05-11 06:10:32 +00:00
Alexander Dorokhine
1b90731237 Merge "Update framework from Jetpack." into sc-dev 2021-05-11 06:07:41 +00:00
Tianjie Xu
a90fe61200 Merge "Check null for before using LockSettingsService" am: 964fccfefd am: e3e7ed125e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674887

Change-Id: Ic7fab8afb1e55038e86f224b5cebf55cee5d8bc3
 2021-05-11 05:53:07 +00:00
Benedict Wong
62135157e0 Merge "Add log prefixes to uniquely identify each VCN/gwConn" am: fae9ba6535 am: af9b507963 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1700307

Change-Id: Ibb41f5d50b446c9718f3a3b9b862b5b158988876
 2021-05-11 05:52:50 +00:00
Benedict Wong
600401154a Merge changes from topic "vcn-fwd" am: d7d2d2a15b am: f980436b32 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682047

Change-Id: I4e11bdfa3e887103673a354aad7f9b5fa746ac9e
 2021-05-11 05:52:26 +00:00
lpeter
e0fafd2146 Use binder thread instead of main thread in HotwordDetectionService 
Bug: 180945857
Test: atest CtsVoiceInteractionTestCases
Test: atest CtsVoiceInteractionTestCases --instant
Change-Id: Ib3424b49eb3ae15dbddf6126ae296bcaf7d6b73b
 2021-05-11 13:46:43 +08:00
Tianjie Xu
e3e7ed125e Merge "Check null for before using LockSettingsService" am: 964fccfefd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674887

Change-Id: I90dee9936f4ad8ef17fcb4850e0e29de63411416
 2021-05-11 05:43:25 +00:00
Benedict Wong
af9b507963 Merge "Add log prefixes to uniquely identify each VCN/gwConn" am: fae9ba6535 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1700307

Change-Id: I7096daeb9d45dcedbebf5c95b9c681c1e1c78935
 2021-05-11 05:37:35 +00:00
Benedict Wong
f980436b32 Merge changes from topic "vcn-fwd" am: d7d2d2a15b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682047

Change-Id: I7f02785727c73c27ac498ad4663f25252242c6e0
 2021-05-11 05:26:46 +00:00
Nader Jawad
fdccce02ba Merge "Updated StretchEffect types" into sc-dev 2021-05-11 05:22:15 +00:00
Winson Chung
d011237d39 Merge "Add test api to gc system and sysui" into sc-dev 2021-05-11 05:02:35 +00:00
Tianjie Xu
964fccfefd Merge "Check null for before using LockSettingsService" 2021-05-11 04:50:15 +00:00
Bill Yi
a3142d3c7f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aa5779f75a -s ours am: ea08e99a83 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I41da300d1dd4eea915a19aadaf21bd346cb7c779
 2021-05-11 04:38:33 +00:00
TreeHugger Robot
38e5def5ce Merge "Modify error codes and improve descriptions" into sc-dev 2021-05-11 04:22:40 +00:00
Bill Yi
ea08e99a83 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aa5779f75a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9638abc00fb62c580444eecde93062d847e59e3a
 2021-05-11 04:20:52 +00:00
Riddle Hsu
81e85863e5 Merge "Skip creating config context if it is the same as current" into sc-dev 2021-05-11 04:15:57 +00:00
Charles Chen
c8bf38ce25 Merge "Fix IME switch dialog crash on Dual rootDA display" into sc-dev 2021-05-11 04:08:49 +00:00
TreeHugger Robot
66fcb0d72d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-11 04:01:00 +00:00