Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
628,977 Commits 3 Branches 0 Tags
351a6d7bd73256e6830acbb407a1e84bbae962e7
Commit Graph

628977 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eugene Susla
351a6d7bd7 Fix CDM association filtering 
Null filter should match all associations

Bug: 181344542
Test: presubmit
Change-Id: Ib5c8e78177657e55113e0f9cca28b53d2fb5c002
 2021-03-12 17:43:06 -08:00
Jackal Guo
70a30dabed Merge "Drop prebuilt files to android source tree." into sc-dev 2021-03-12 02:46:22 +00:00
TreeHugger Robot
98dfc2a69c Merge "Implement passing the model data to the trusted process" into sc-dev 2021-03-12 02:32:22 +00:00
Luigi Bruno
d77d2bf6e4 Merge "Log attribution tag into Westworld LocationManagerApiUsageReport." into sc-dev 2021-03-12 02:25:22 +00:00
Remi NGUYEN VAN
7c4d278749 Merge "Create ServiceConnectivityResources" into sc-dev 2021-03-12 02:10:20 +00:00
Seigo Nonaka
f36829cf57 Merge "Use getLineMax for desired text width calculation" into sc-dev 2021-03-12 02:02:45 +00:00
TreeHugger Robot
cb320bf9ee Merge "Prevent caching unexpected IME shown state for legacy split" into sc-dev 2021-03-12 02:00:19 +00:00
TreeHugger Robot
848cc69c1a Merge changes from topic "uwb_api_changes" into sc-dev 
* changes:
  Pass SessionHandle to UWB Service when opening a session
  Return CancellationSignal when opening UWB session
  Address UWB API feedback
 2021-03-12 01:58:38 +00:00
Winson Chiu
3b1852bd2e [automerger skipped] Revert "Only allow BROWSABLE && DEFAULT Intents to be always opened" am: f83d79928f am: e75b482280 am: 636c57cf22 -s ours 
am skip reason: Change-Id I00b78d596ee05c5a4a228771bbf8082af2b0ab8a with SHA-1 1ad90d5a2d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaf5e9602758861d7f3ccc2b0f5d156b3652f5967
 2021-03-12 01:41:06 +00:00
TreeHugger Robot
706c23e63f Merge "Add SensorPrivacyManagerInternal api for system server usage" into sc-dev 2021-03-12 01:38:39 +00:00
TreeHugger Robot
5774fa63b2 Merge "Expose shared memory related APIs for testing purpose" into sc-dev 2021-03-12 01:38:16 +00:00
TreeHugger Robot
755678b31a Merge "Send metrics notification just before frame advances" into sc-dev 2021-03-12 01:31:53 +00:00
TreeHugger Robot
62acb3887f Merge "Prevent fail to get device config while dumping package service" into sc-dev 2021-03-12 01:17:46 +00:00
TreeHugger Robot
024f239d4a Merge "Set notification shelf icon color to primary text color" into sc-dev 2021-03-12 01:11:11 +00:00
TreeHugger Robot
e1396848ae Merge "Move fs-verity check into DexMetadataHelper" into sc-dev 2021-03-12 00:54:27 +00:00
Winson Chiu
4a3c50472e [automerger skipped] Revert "Only allow BROWSABLE && DEFAULT Intents to be always opened" am: f83d79928f am: e75b482280 -s ours am: 90b62806ae -s ours am: c81a4d3b7a -s ours 
am skip reason: Change-Id I00b78d596ee05c5a4a228771bbf8082af2b0ab8a with SHA-1 1ad90d5a2d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ided2bab82976968bcbc542145ef0fe8915631de2
 2021-03-12 00:52:53 +00:00
Remi NGUYEN VAN
e14511d6e7 [automerger skipped] Merge changes from topic "ethernet_specifier" am: c77293b7a9 am: 2943678b0e am: 1764ceaa67 -s ours 
am skip reason: Change-Id Iec8ef874a3ca6dcc65944bbbaa3575a5ae0f4989 with SHA-1 4e5222b9da is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0133b6f49eac269c5704e5a1dbdfecc85507ae32
 2021-03-12 00:52:26 +00:00
Remi NGUYEN VAN
105a6940d6 [automerger skipped] Add Ethernet, TestNetworkSpecifier API am: c5479a0886 am: c792424cad am: 734c56f7a9 -s ours 
am skip reason: Change-Id Iee569f5c8bbdc4bc979610e1191308281f3d4620 with SHA-1 6d98157012 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If4f60a26f8c19e77d348dfcc7c382022ba6cf0d1
 2021-03-12 00:52:15 +00:00
Treehugger Robot
6bb68aa10b Merge "Added mount to OWNERS for RecyclerView and ViewPager" am: 2273adedcd am: 62aa26cacb am: 4f3026147a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629662

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8a4a77fb4188fd44bbad910d0889521b56b64f5d
 2021-03-12 00:51:32 +00:00
Grace Jia
0a77d3fc8a Merge "Annotation and doc improvement for adhoc conference APIs." am: 0251d617a5 am: e4bc4e9ca5 am: 3e96c1328c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1412812

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie849bba0805a1a43a841ae204337c12d3f5d9791
 2021-03-12 00:51:05 +00:00
mrenouf
70f4666558 Merge "Update OWNERS for long screenshots framework code" am: 4392dd9cb8 am: 695b9ee40e am: 85bf625569 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619622

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied18be7a63642d3303a50534cbe95e05e1336cc5
 2021-03-12 00:50:34 +00:00
Treehugger Robot
b19e28697c Merge "Removed EpsQosSessionAttributes#onCreate" am: 5967b657ef am: 0dd1a463f0 am: 8de105cc8b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626282

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8f5c4b1cbbc629233acb2728b470e53b775f6bd
 2021-03-12 00:50:00 +00:00
Treehugger Robot
1c80dea734 Merge changes Iac9487e8,Ifa411c7b am: 999506022f am: 7d70dd9c33 am: bec7ce5cf4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622675

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If1b3f0447705f910467a52d2504ba1aaef850a80
 2021-03-12 00:49:24 +00:00
Rob Carr
df405c94ac Merge "WindowState: Introduce applyWithNextDraw, port Seamless Rotation" into sc-dev 2021-03-12 00:47:08 +00:00
Winson Chiu
c81a4d3b7a [automerger skipped] Revert "Only allow BROWSABLE && DEFAULT Intents to be always opened" am: f83d79928f am: e75b482280 -s ours am: 90b62806ae -s ours 
am skip reason: Change-Id I78284e0a0dd5c41345753cdd2ed9a518db1df930 with SHA-1 2ef71e3c85 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id1ab57380355dea6b389d388aac1f98987a97aca
 2021-03-12 00:44:31 +00:00
Remi NGUYEN VAN
1764ceaa67 Merge changes from topic "ethernet_specifier" am: c77293b7a9 am: 2943678b0e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626207

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I772ca29f64cb9431a899a2c213c511ad467fc36f
 2021-03-12 00:26:49 +00:00
Remi NGUYEN VAN
734c56f7a9 Add Ethernet, TestNetworkSpecifier API am: c5479a0886 am: c792424cad 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I63159846579c43c721eeb86c9a55faa3f2888be8
 2021-03-12 00:26:45 +00:00
Treehugger Robot
4f3026147a Merge "Added mount to OWNERS for RecyclerView and ViewPager" am: 2273adedcd am: 62aa26cacb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629662

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id7b9ca5d814aa27e295c46b755af35743de5d434
 2021-03-12 00:25:20 +00:00
TreeHugger Robot
e46f19e2b1 Merge "Merge "Move CtsScopedStorageHostTest to group presubmit-large" am: 33b19a2507 am: 4e5452499e" into sc-dev 2021-03-12 00:17:58 +00:00
TreeHugger Robot
cdebbc764a Merge "Merge "Add OWNERS for long screenshots framework code" am: 79bed70aa2 am: 4df29fd76a" into sc-dev 2021-03-12 00:17:58 +00:00
Remi NGUYEN VAN
2943678b0e Merge changes from topic "ethernet_specifier" am: c77293b7a9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626207

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ef1a287439b5f5705ff3b3b4de4ded54f61c1c1
 2021-03-12 00:12:52 +00:00
Remi NGUYEN VAN
c792424cad Add Ethernet, TestNetworkSpecifier API am: c5479a0886 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a1b38fb6b8b6831bac016a8352ae9073758f9af
 2021-03-12 00:10:08 +00:00
Winson Chiu
636c57cf22 Revert "Only allow BROWSABLE && DEFAULT Intents to be always opened" am: f83d79928f am: e75b482280 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13727756

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1cc354cfa0eada20825ec61240a7538700e14aa9
 2021-03-12 00:08:44 +00:00
Grace Jia
3e96c1328c Merge "Annotation and doc improvement for adhoc conference APIs." am: 0251d617a5 am: e4bc4e9ca5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1412812

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee57bef7f60bb612b864a72d5bf2d98115b03d28
 2021-03-12 00:05:34 +00:00
Treehugger Robot
62aa26cacb Merge "Added mount to OWNERS for RecyclerView and ViewPager" am: 2273adedcd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629662

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I40e5292a7663baddddf604d1b6d164fa8b4541f7
 2021-03-12 00:05:24 +00:00
mrenouf
85bf625569 Merge "Update OWNERS for long screenshots framework code" am: 4392dd9cb8 am: 695b9ee40e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619622

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5fe8f6ed9302d560959f28d9ebd2f309fb6502ef
 2021-03-12 00:05:22 +00:00
Treehugger Robot
8de105cc8b Merge "Removed EpsQosSessionAttributes#onCreate" am: 5967b657ef am: 0dd1a463f0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626282

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5324674f92f5229affc6af4735da73826c6572bc
 2021-03-12 00:05:08 +00:00
Treehugger Robot
bec7ce5cf4 Merge changes Iac9487e8,Ifa411c7b am: 999506022f am: 7d70dd9c33 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622675

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0742b4bb3c5b2ddaa06830b403d849ed25ef71cd
 2021-03-12 00:04:56 +00:00
Winson Chiu
90b62806ae [automerger skipped] Revert "Only allow BROWSABLE && DEFAULT Intents to be always opened" am: f83d79928f am: e75b482280 -s ours 
am skip reason: Change-Id I78284e0a0dd5c41345753cdd2ed9a518db1df930 with SHA-1 2ef71e3c85 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib77c0e855fe142deeefc2c2e1bede949b2bde26c
 2021-03-12 00:04:24 +00:00
Terry Wang
4993be52c7 Merge "Add AppSearchSessionUnitTest to cover platform scenarios." into sc-dev 2021-03-12 00:00:54 +00:00
Terry Wang
5e8e8e2b0b Merge "Delete depracated method in AppSearchManager." into sc-dev 2021-03-12 00:00:37 +00:00
Sooraj Sasindran
b8812e9243 Merge "update isCrossSimCallingEnabledByUser name" into sc-dev 2021-03-11 23:55:50 +00:00
Remi NGUYEN VAN
c77293b7a9 Merge changes from topic "ethernet_specifier" 
* changes:
  Fix common tests on Q and R
  Add Ethernet, TestNetworkSpecifier API
 2021-03-11 23:51:49 +00:00
Nate Myren
d63065cb6f Merge "Add attributionTag to audio-recordings" into sc-dev 2021-03-11 23:48:44 +00:00
Treehugger Robot
2273adedcd Merge "Added mount to OWNERS for RecyclerView and ViewPager" 2021-03-11 23:38:03 +00:00
Grace Jia
e4bc4e9ca5 Merge "Annotation and doc improvement for adhoc conference APIs." am: 0251d617a5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1412812

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie6f423bfbd4965e4cc27c3e1591ecdef29dcf0c8
 2021-03-11 23:25:32 +00:00
mrenouf
695b9ee40e Merge "Update OWNERS for long screenshots framework code" am: 4392dd9cb8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619622

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe7f623cb291cab2201dc1b61cb5b42edd18b418
 2021-03-11 23:23:04 +00:00
TreeHugger Robot
bfd5793188 [automerger skipped] Merge "Revert "Only allow BROWSABLE && DEFAULT Intents to be always opened"" into rvc-qpr-dev am: 5079f881c0 am: e23f71e88e -s ours 
am skip reason: Change-Id I00b78d596ee05c5a4a228771bbf8082af2b0ab8a with SHA-1 1ad90d5a2d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idf6ad5ea900ee7ab47db9b12e6c9f1f521002fdf
 2021-03-11 23:20:39 +00:00
Tianjie Xu
3ec57ecc05 Merge "Extend the metrics for resume on reboot" am: 1c5faf6141 am: f593e71276 am: 2184af92df 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556763

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I96ac197d6f09ff89f1a74471413e213f6649f126
 2021-03-11 23:20:09 +00:00
Tyler Gunn
f85ff9ee78 Merge "Mark android.net.sip code as deprecated." am: 3b36aa32fa am: 346a19a3ce am: b40dd1553c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540225

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ca4d3dba079f543ffeb2795e6f4e657e6876ae7
 2021-03-11 23:19:43 +00:00