Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
660,481 Commits 3 Branches 0 Tags
e6e2c080e23b525c4cf4f617e410591ca956063d
Commit Graph

660481 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Hung
e6e2c080e2 Merge "MediaMetricsManager: Authorize log session ids" into sc-v2-dev am: 5a97294940 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15247197

Change-Id: I4bf3aea0626caa25f9fa555c7fda59542a92d398
 2021-07-19 21:46:23 +00:00
Andy Hung
5a97294940 Merge "MediaMetricsManager: Authorize log session ids" into sc-v2-dev 2021-07-19 21:30:31 +00:00
Joshua Mccloskey
5a33c8c58f Merge "Fixed double face auth on swipe" into sc-dev am: 4438cf6799 am: b9745dc605 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301708

Change-Id: Iefb73c901cc57c999c7cea6e4daeec5355590c8a
 2021-07-19 20:34:45 +00:00
Joshua Mccloskey
b16902ffa4 Merge "Fixed double face auth on swipe" into sc-dev am: 4438cf6799 am: 3b84010e82 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301708

Change-Id: I5ad368bfe3a4e4b3d95705aa6d647120fbb1c950
 2021-07-19 20:28:24 +00:00
Joshua Mccloskey
b9745dc605 Merge "Fixed double face auth on swipe" into sc-dev am: 4438cf6799 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301708

Change-Id: Iaa8d50c2a818aa897fb06037afdddc6bd9e1d505
 2021-07-19 20:14:26 +00:00
Joshua Mccloskey
3b84010e82 Merge "Fixed double face auth on swipe" into sc-dev am: 4438cf6799 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301708

Change-Id: Ifa25be9aa20a7ee0381329c0e57bd6c61ddcad32
 2021-07-19 20:13:18 +00:00
TreeHugger Robot
a10f077d57 Merge "Showing brightness slider in collapsed QS in split shade" into sc-v2-dev am: 9314834982 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301454

Change-Id: I169313fefd23c01771de3342829530d0c48453ab
 2021-07-19 20:05:17 +00:00
Joshua Mccloskey
4438cf6799 Merge "Fixed double face auth on swipe" into sc-dev 2021-07-19 20:00:57 +00:00
TreeHugger Robot
9314834982 Merge "Showing brightness slider in collapsed QS in split shade" into sc-v2-dev 2021-07-19 19:54:54 +00:00
TreeHugger Robot
b29020ea30 Merge "4/n: Make CoexCoordinator multi-sensor-aware" into sc-dev am: c4815d0f2d am: f75483555a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15312046

Change-Id: If5f5a04def4a0211ccdfa698c1711407dd94727b
 2021-07-19 19:47:01 +00:00
TreeHugger Robot
826df357e8 Merge "4/n: Make CoexCoordinator multi-sensor-aware" into sc-dev am: c4815d0f2d am: 29baf590b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15312046

Change-Id: Iec10a41b7989e3dafe83c09be127b59864b0a6b9
 2021-07-19 19:46:39 +00:00
TreeHugger Robot
29baf590b2 Merge "4/n: Make CoexCoordinator multi-sensor-aware" into sc-dev am: c4815d0f2d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15312046

Change-Id: I22fd2574840b20627c9eb6e923052ad8a60b70c0
 2021-07-19 19:37:54 +00:00
TreeHugger Robot
f75483555a Merge "4/n: Make CoexCoordinator multi-sensor-aware" into sc-dev am: c4815d0f2d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15312046

Change-Id: I586a179221fbbe2684d20f5447041f7e8a44e08a
 2021-07-19 19:37:26 +00:00
Pinyao Ting
3c2ea36e81 Merge "Refrain from returning mutable pending intent in getShortcutIntent" into sc-dev am: c4adbc278e am: e0ec500772 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15315840

Change-Id: Icb9931f4936c5b5ef8270e3f79e7631a2317010e
 2021-07-19 19:28:36 +00:00
Pinyao Ting
c31a5b89a1 Merge "Refrain from returning mutable pending intent in getShortcutIntent" into sc-dev am: c4adbc278e am: 2a4f76ca10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15315840

Change-Id: I05c46ca71231642e2c815ec05e3dab19e48b853d
 2021-07-19 19:27:54 +00:00
Automerger Merge Worker
49c522cd77 Merge "Merge "Revert "Clean up previous DA organizer when registering"" into sc-dev am: 37ae9cfc89 am: c817fba8b2" into sc-v2-dev-plus-aosp 2021-07-19 19:27:43 +00:00
Winson Chung
2fdba32511 Merge "Revert "Clean up previous DA organizer when registering"" into sc-dev am: 37ae9cfc89 am: c817fba8b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15329893

Change-Id: I88ecfa6f6cb80cd7d64ef286862077aebced187a
 2021-07-19 19:27:38 +00:00
Winson Chung
d391e14f41 Merge "Revert "Clean up previous DA organizer when registering"" into sc-dev am: 37ae9cfc89 am: 757ad01312 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15329893

Change-Id: I95fe6365b02fd5b58d41e04b1432e57d55d37423
 2021-07-19 19:27:19 +00:00
TreeHugger Robot
c4815d0f2d Merge "4/n: Make CoexCoordinator multi-sensor-aware" into sc-dev 2021-07-19 19:25:44 +00:00
Pinyao Ting
e0ec500772 Merge "Refrain from returning mutable pending intent in getShortcutIntent" into sc-dev am: c4adbc278e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15315840

Change-Id: Id2d3ccdfb1eba674fa34c2301112c25520a47d86
 2021-07-19 19:16:04 +00:00
Pinyao Ting
2a4f76ca10 Merge "Refrain from returning mutable pending intent in getShortcutIntent" into sc-dev am: c4adbc278e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15315840

Change-Id: I2fe1a7bc88e3247c68395ceab8436a474fbef74d
 2021-07-19 19:15:23 +00:00
Pinyao Ting
c4adbc278e Merge "Refrain from returning mutable pending intent in getShortcutIntent" into sc-dev 2021-07-19 19:09:17 +00:00
Winson Chung
757ad01312 Merge "Revert "Clean up previous DA organizer when registering"" into sc-dev am: 37ae9cfc89 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15329893

Change-Id: I847df1abdf8d117eb029211f85672a4efc6335d0
 2021-07-19 19:07:36 +00:00
Winson Chung
c817fba8b2 Merge "Revert "Clean up previous DA organizer when registering"" into sc-dev am: 37ae9cfc89 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15329893

Change-Id: I87e8f3c835072b98aa713bf10cdb3d465395ddf9
 2021-07-19 19:06:40 +00:00
Winson Chung
37ae9cfc89 Merge "Revert "Clean up previous DA organizer when registering"" into sc-dev 2021-07-19 18:42:00 +00:00
Winson Chung
0b40777cd1 Revert "Clean up previous DA organizer when registering" 
This reverts commit da436d4a01.

Reason for revert: b/194083907, b/193993655

Bug: 194083907
Bug: 193993655
Change-Id: I75352215d995707b3bc23e04434c85a0fd9db6b3
 2021-07-19 18:39:16 +00:00
Automerger Merge Worker
ebd17a97ff Merge "Merge "Workaround for back arrow being stuck on screen" into sc-dev am: db294649f8 am: 50293d4b90" into sc-v2-dev-plus-aosp 2021-07-19 18:27:43 +00:00
Winson Chung
86e171f243 Merge "Workaround for back arrow being stuck on screen" into sc-dev am: db294649f8 am: 50293d4b90 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15315836

Change-Id: If177e27d1e92740bf616bede073300e22db7e7d1
 2021-07-19 18:27:38 +00:00
Winson Chung
53538e4013 Merge "Workaround for back arrow being stuck on screen" into sc-dev am: db294649f8 am: 1640c657d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15315836

Change-Id: If69866ed8163315e67357b7c1d5d824bb27a3d06
 2021-07-19 18:27:16 +00:00
Winson Chung
1640c657d2 Merge "Workaround for back arrow being stuck on screen" into sc-dev am: db294649f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15315836

Change-Id: I685916f8933348bcbeab2fd20a81429edfbceeea
 2021-07-19 18:15:02 +00:00
Winson Chung
50293d4b90 Merge "Workaround for back arrow being stuck on screen" into sc-dev am: db294649f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15315836

Change-Id: I4b956a2337a0b7dd54fcc34121feb5e2ed822fa8
 2021-07-19 18:14:41 +00:00
Winson Chung
a972d7125e Merge "Add null check to work around async unregistration of receiver" into sc-v2-dev am: f9a8735e5b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15317993

Change-Id: I22471dfbdf57edc583ae56fe7a4f88d9748dc0e3
 2021-07-19 18:02:24 +00:00
Kensuke Miyagi
21c99a86b5 Merge "Fix issue of TvInputManagerService not binding to TvInput services in Kids" into sc-dev am: afd8e9bb44 am: 011135ed99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15315830

Change-Id: Ib74720db3b676e22d8a7f9d6f9aaaeb10de0b69d
 2021-07-19 18:02:14 +00:00
Automerger Merge Worker
91507dd73e Merge "Merge "Fix "already registered" error" am: 0df5bbfe90 am: c4b00b8f57 am: f5bc120ad5" into sc-v2-dev-plus-aosp 2021-07-19 18:01:39 +00:00
Phil Weaver
8254cbd020 Merge "Fix "already registered" error" am: 0df5bbfe90 am: c4b00b8f57 am: f5bc120ad5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1751360

Change-Id: Ie8fb5498c7f19605097e4515a14cfdecded2bcf7
 2021-07-19 18:01:36 +00:00
Automerger Merge Worker
606ae04e89 Merge "Merge "Null check color_space_ptr in draw functor v2" into sc-dev am: de41c86deb am: 2f69ce0411" into sc-v2-dev-plus-aosp 2021-07-19 18:01:35 +00:00
Kensuke Miyagi
d41fb2fb8f Merge "Fix issue of TvInputManagerService not binding to TvInput services in Kids" into sc-dev am: afd8e9bb44 am: 0977fd36fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15315830

Change-Id: I4d753eb529cec39208bdf51113f6ecfe336950c0
 2021-07-19 18:01:20 +00:00
TreeHugger Robot
2389b2a54c Merge "Null check color_space_ptr in draw functor v2" into sc-dev am: de41c86deb am: 2f69ce0411 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15328753

Change-Id: I4a76e2328b6e82c0d3cab7bb5bb54ea76884b9d8
 2021-07-19 18:01:13 +00:00
TreeHugger Robot
47e57e0b4a Merge "Null check color_space_ptr in draw functor v2" into sc-dev am: de41c86deb am: 166bce8225 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15328753

Change-Id: I5a541344971117b9dae52b1f715ca26eec7d78a3
 2021-07-19 18:01:05 +00:00
Phil Weaver
f5bc120ad5 Merge "Fix "already registered" error" am: 0df5bbfe90 am: c4b00b8f57 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1751360

Change-Id: Icc6dc6d5157c133097e67aad1837c3861fd02080
 2021-07-19 18:00:44 +00:00
Winson Chung
db294649f8 Merge "Workaround for back arrow being stuck on screen" into sc-dev 2021-07-19 18:00:08 +00:00
Winson Chung
f9a8735e5b Merge "Add null check to work around async unregistration of receiver" into sc-v2-dev 2021-07-19 17:59:29 +00:00
Phil Weaver
c4b00b8f57 Merge "Fix "already registered" error" am: 0df5bbfe90 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1751360

Change-Id: I968842b29cbc5dfbcc9b904291dd9a0e67cf8606
 2021-07-19 17:45:46 +00:00
Kensuke Miyagi
011135ed99 Merge "Fix issue of TvInputManagerService not binding to TvInput services in Kids" into sc-dev am: afd8e9bb44 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15315830

Change-Id: I288e5f76b32842a0fe4c490c73534cd977ea0242
 2021-07-19 17:45:16 +00:00
TreeHugger Robot
2f69ce0411 Merge "Null check color_space_ptr in draw functor v2" into sc-dev am: de41c86deb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15328753

Change-Id: I513f58b2da3169cb1426773eb991c328539075ac
 2021-07-19 17:45:03 +00:00
Kensuke Miyagi
0977fd36fd Merge "Fix issue of TvInputManagerService not binding to TvInput services in Kids" into sc-dev am: afd8e9bb44 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15315830

Change-Id: I7edf1f77e47b10bd850a56a7d6ab6bcd594b3bc5
 2021-07-19 17:44:12 +00:00
TreeHugger Robot
166bce8225 Merge "Null check color_space_ptr in draw functor v2" into sc-dev am: de41c86deb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15328753

Change-Id: If09de67852c0f06bd059990bf3d37c7d5fb07b90
 2021-07-19 17:43:48 +00:00
Kensuke Miyagi
afd8e9bb44 Merge "Fix issue of TvInputManagerService not binding to TvInput services in Kids" into sc-dev 2021-07-19 17:32:55 +00:00
Automerger Merge Worker
75073b8d08 Merge "Merge "Update boot image and system server profiles [M5C5P90S0PP]" into sc-dev am: db2dd6d551 am: 24c46e0da6" into sc-v2-dev-plus-aosp 2021-07-19 17:28:30 +00:00
TreeHugger Robot
92797f1088 Merge "Update boot image and system server profiles [M5C5P90S0PP]" into sc-dev am: db2dd6d551 am: 24c46e0da6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15325625

Change-Id: I1fae04c1b5ba1b8834359921412ceef63832712e
 2021-07-19 17:27:57 +00:00