Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
653,435 Commits 3 Branches 0 Tags
cd035a157b98b71c24c8ccb05440acdecfd6486a
Commit Graph

653435 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitri Plotnikov
cd035a157b Merge "Deprecate BatteryStatsHelper and BatterySipper" into sc-dev am: fb1dc9e3db am: 35da44cdac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15081293

Change-Id: I3917869b2f8a62807ce59c36af461d79372bc6cf
 2021-06-23 22:13:35 +00:00
TreeHugger Robot
fa96aa8aec Merge "Add ADAS GNSS bypass functionality" into sc-dev am: 9490b84d13 am: fe6e9674ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14681780

Change-Id: Ibecf6c1edbed7a64ec210fc031f46f16668b47ab
 2021-06-23 22:13:21 +00:00
Matt Casey
11e0920426 resolve merge conflicts of 97bc1be819 to sc-v2-dev-plus-aosp 
Change-Id: I863708cc55493f91722fc1f75868071ed8a7aaef
Merged-In: I5e3587ddb0fa4bd1ef68488485d73641e0582d2f
 2021-06-23 20:58:57 +00:00
Adam Bookatz
87a2f341bb Merge "Revert "Apply colors a bit earlier when switching users"" into sc-dev am: 29852f8aa0 am: 187ba3111b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15067672

Change-Id: I4066618a8e9dfc15d44f0867c139cb0fbc58029c
 2021-06-23 20:22:24 +00:00
Adam Bookatz
b545d8ba10 Merge "Revert "Apply colors a bit earlier when switching users"" into sc-dev am: 29852f8aa0 am: bf3f273da8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15067672

Change-Id: I977c1426a3317f2fd21d4ff85913a90a31a22ce4
 2021-06-23 20:19:14 +00:00
TreeHugger Robot
9e751845df Merge "Fix unmuting both cam and mic at the same time" into sc-dev am: 31bb5762d8 am: 2116e6eab3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15081504

Change-Id: Ie1f09c15253a81a2b80aa1435470ac890fcaa0a0
 2021-06-23 20:18:49 +00:00
Dmitri Plotnikov
35da44cdac Merge "Deprecate BatteryStatsHelper and BatterySipper" into sc-dev am: fb1dc9e3db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15081293

Change-Id: I418692861a8c286d9a08818d752aeec657fae4bd
 2021-06-23 20:18:47 +00:00
TreeHugger Robot
fe6e9674ea Merge "Add ADAS GNSS bypass functionality" into sc-dev am: 9490b84d13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14681780

Change-Id: Icf8b5719a271939b2e09172630b39e9f714e1fb2
 2021-06-23 20:18:33 +00:00
Matt Casey
97bc1be819 Merge "Honor per-user setting for assist gesture and long-press home" into sc-dev am: 49a91f2b9a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15067192

Change-Id: I165a7bbaef2d8d4be5805e33c1a74463e120a574
 2021-06-23 20:18:22 +00:00
Adam Bookatz
187ba3111b Merge "Revert "Apply colors a bit earlier when switching users"" into sc-dev am: 29852f8aa0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15067672

Change-Id: Ifa864403e647b2da9916a80516b22abe9dfca4e4
 2021-06-23 20:18:04 +00:00
Adam Bookatz
bf3f273da8 Merge "Revert "Apply colors a bit earlier when switching users"" into sc-dev am: 29852f8aa0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15067672

Change-Id: I1f88c5d07043a4d94010f764d617e33664823bc1
 2021-06-23 20:17:43 +00:00
TreeHugger Robot
afc59c79f8 Merge "Fix unmuting both cam and mic at the same time" into sc-dev am: 31bb5762d8 am: 586e18cc0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15081504

Change-Id: I41a82ce12fa6d49fc004c586738dd2ae9b97e4eb
 2021-06-23 20:17:36 +00:00
Dmitri Plotnikov
fb1dc9e3db Merge "Deprecate BatteryStatsHelper and BatterySipper" into sc-dev 2021-06-23 20:16:26 +00:00
TreeHugger Robot
9490b84d13 Merge "Add ADAS GNSS bypass functionality" into sc-dev 2021-06-23 20:12:04 +00:00
Matt Casey
49a91f2b9a Merge "Honor per-user setting for assist gesture and long-press home" into sc-dev 2021-06-23 20:04:49 +00:00
Adam Bookatz
29852f8aa0 Merge "Revert "Apply colors a bit earlier when switching users"" into sc-dev 2021-06-23 20:03:43 +00:00
Adam Bookatz
4cfb4ca966 Revert "Apply colors a bit earlier when switching users" 
This reverts commit e02895a32f.

Reason for revert: Regression in multiuser performance metrics

Change-Id: I46b16d21841e33f2203319407c595553081d18fe
Bug: 190830245
 2021-06-23 20:03:01 +00:00
TreeHugger Robot
586e18cc0e Merge "Fix unmuting both cam and mic at the same time" into sc-dev am: 31bb5762d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15081504

Change-Id: Ib639eada5bc9bb560e88555d03643eb654dcddad
 2021-06-23 19:59:01 +00:00
TreeHugger Robot
2116e6eab3 Merge "Fix unmuting both cam and mic at the same time" into sc-dev am: 31bb5762d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15081504

Change-Id: I6290df0d2fcb4bc8181d26cccaadda39754c1613
 2021-06-23 19:58:41 +00:00
TreeHugger Robot
31bb5762d8 Merge "Fix unmuting both cam and mic at the same time" into sc-dev 2021-06-23 19:43:17 +00:00
Sudheer Shanka
bf6b06d5f4 Merge "Avoid calling into phone process with NPMS locks held." into sc-dev am: d5bda8a0d5 am: 2f383c36ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15060769

Change-Id: Ic43f3d6d11dea08a6985da8f3f5954edd477dfa7
 2021-06-23 19:27:00 +00:00
TreeHugger Robot
92c329969b Merge "Camera: Switch camera extension proxy service package name" into sc-dev am: 81419f4be3 am: c5e8864a85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14986716

Change-Id: I79bf31dff37c0136b799ca68ffbc76e0cfc9bd65
 2021-06-23 19:26:45 +00:00
Lucas Dupin
341b83a55b Merge "Correctly serialize population" into sc-dev am: ba23b84687 am: 75bc6a8797 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15081291

Change-Id: I4e7293bf02171829ee8c853e067a330572fb930b
 2021-06-23 19:26:29 +00:00
TreeHugger Robot
c47063f1c6 Merge "Update lock screen user switcher on settings update and re-create view stub after disabling multi-user" into sc-dev am: cdd6adb5c5 am: 1c884cbb56 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14974991

Change-Id: I52561c408de36655d072a989fd2080cf0ab17254
 2021-06-23 19:26:16 +00:00
Lucas Dupin
494fdc68b0 Merge "Disable blurs when in battery saver" into sc-dev am: 26308cd40f am: 4d023b8109 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15070038

Change-Id: Iddbadaa4b9df9521fc35159472c8abcd7c320cdf
 2021-06-23 19:25:10 +00:00
Sudheer Shanka
b9ff18e5d6 Merge "Avoid calling into phone process with NPMS locks held." into sc-dev am: d5bda8a0d5 am: f80d9a285a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15060769

Change-Id: I798daf4db5d63113d732178838085b2fcd213aa1
 2021-06-23 19:06:34 +00:00
TreeHugger Robot
e7f07b4c41 Merge "Camera: Switch camera extension proxy service package name" into sc-dev am: 81419f4be3 am: cdde21bd14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14986716

Change-Id: If86cc969ee3f88aee88809875151a9af9a165288
 2021-06-23 19:06:23 +00:00
Lucas Dupin
bf5f027e53 Merge "Correctly serialize population" into sc-dev am: ba23b84687 am: 6271ec4e51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15081291

Change-Id: Ie174bb0eab45c8ff616d2e214dd11dc08ff65eae
 2021-06-23 19:06:06 +00:00
TreeHugger Robot
aadd17a98a Merge "Update lock screen user switcher on settings update and re-create view stub after disabling multi-user" into sc-dev am: cdd6adb5c5 am: b6bcdc9f11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14974991

Change-Id: Iafa575d2b8915e24f31a26e3686de66c324e2e7a
 2021-06-23 19:05:47 +00:00
Lucas Dupin
29c7878680 Merge "Disable blurs when in battery saver" into sc-dev am: 26308cd40f am: 6c4f149edc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15070038

Change-Id: I8c3cd2e0dfcdab0586e3f7af8c5d069b4686ef92
 2021-06-23 19:05:23 +00:00
Sudheer Shanka
f80d9a285a Merge "Avoid calling into phone process with NPMS locks held." into sc-dev am: d5bda8a0d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15060769

Change-Id: Id2006b8f41c85ff59aa9bc962cefe818f0bd08d9
 2021-06-23 19:01:43 +00:00
Sudheer Shanka
2f383c36ef Merge "Avoid calling into phone process with NPMS locks held." into sc-dev am: d5bda8a0d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15060769

Change-Id: I652869eb0c05f6e40aebba78035ea3f5261e3eff
 2021-06-23 19:01:27 +00:00
TreeHugger Robot
cdde21bd14 Merge "Camera: Switch camera extension proxy service package name" into sc-dev am: 81419f4be3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14986716

Change-Id: I8e7cfbe9efc841da05626109c4f994cccbbc508e
 2021-06-23 19:01:22 +00:00
Sudheer Shanka
d5bda8a0d5 Merge "Avoid calling into phone process with NPMS locks held." into sc-dev 2021-06-23 19:01:16 +00:00
Lucas Dupin
6271ec4e51 Merge "Correctly serialize population" into sc-dev am: ba23b84687 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15081291

Change-Id: Iaadf2a8d0c7d4522704b658bfa77e412b097e356
 2021-06-23 19:00:56 +00:00
TreeHugger Robot
c5e8864a85 Merge "Camera: Switch camera extension proxy service package name" into sc-dev am: 81419f4be3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14986716

Change-Id: I0cdabf24d65dd8ee5d325a454db35cbf15af02e0
 2021-06-23 19:00:39 +00:00
TreeHugger Robot
b6bcdc9f11 Merge "Update lock screen user switcher on settings update and re-create view stub after disabling multi-user" into sc-dev am: cdd6adb5c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14974991

Change-Id: Iecdfa1216a82e1a076a38b77d0583aae99366038
 2021-06-23 19:00:30 +00:00
Lucas Dupin
6c4f149edc Merge "Disable blurs when in battery saver" into sc-dev am: 26308cd40f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15070038

Change-Id: I80ed8b2a22a5eaff72b551a0e42b51fb277d4c6e
 2021-06-23 19:00:14 +00:00
Lucas Dupin
75bc6a8797 Merge "Correctly serialize population" into sc-dev am: ba23b84687 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15081291

Change-Id: If6cedd178266ae97d6a631c02dd9673602adbd3a
 2021-06-23 19:00:05 +00:00
TreeHugger Robot
1c884cbb56 Merge "Update lock screen user switcher on settings update and re-create view stub after disabling multi-user" into sc-dev am: cdd6adb5c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14974991

Change-Id: I484cd529452a89ea0aa5d117c8a68338e0c10e1a
 2021-06-23 18:59:49 +00:00
Lucas Dupin
4d023b8109 Merge "Disable blurs when in battery saver" into sc-dev am: 26308cd40f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15070038

Change-Id: Iaedeea9c69a08cdaed92d527f684da12982b31b8
 2021-06-23 18:59:05 +00:00
TreeHugger Robot
81419f4be3 Merge "Camera: Switch camera extension proxy service package name" into sc-dev 2021-06-23 18:55:59 +00:00
Zhen Zhang
eb20804ff3 Merge "Log storage savings info with the GlobalHibernatedApps atom" into sc-dev am: b70b810af4 am: 879979651d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15025828

Change-Id: I7a1455200d5536c5f00bbff3c01eb6aea798fff9
 2021-06-23 18:53:44 +00:00
Joe Bolinger
2a8fceaa98 Merge "Always execute the user switch HAL operation." into sc-dev am: a95d3af476 am: d7dd743899 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15070224

Change-Id: Ia63c74d2b48e4435632ee515dd9179ee12551ec8
 2021-06-23 18:53:33 +00:00
Darryl Johnson
780f1ceb99 Merge "Have CameraServiceProxy listen directly to DeviceStateManager." into sc-v2-dev am: f872275413 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15017204

Change-Id: I8627c408f8b9e29ef9cefed9904ff682e2894eb9
 2021-06-23 18:53:15 +00:00
Zhen Zhang
db217155fb Merge "Log storage savings info with the GlobalHibernatedApps atom" into sc-dev am: b70b810af4 am: ba93d2616b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15025828

Change-Id: I3e0bbc1bba7fd2e589941cf0a1cdbd654ab6f30c
 2021-06-23 18:53:00 +00:00
Joe Bolinger
57c2dcaef1 Merge "Always execute the user switch HAL operation." into sc-dev am: a95d3af476 am: 16e3f6e89c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15070224

Change-Id: Iece1f7c52bb0f590d14dd96871b3d394d573e4a3
 2021-06-23 18:52:43 +00:00
TreeHugger Robot
624ade133f Merge "Remove Intent.ACSD from KEYCODE_SEARCH action in-app" into sc-dev am: 8890ec0d54 am: aafa98aebd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15027753

Change-Id: I475e8d31a7ffa6fcd9e3180eafaf9b16e200c95c
 2021-06-23 18:51:53 +00:00
TreeHugger Robot
bef23d46bb Merge "Remove Intent.ACSD from KEYCODE_SEARCH action in-app" into sc-dev am: 8890ec0d54 am: 97d85c8aef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15027753

Change-Id: I59ac569c4d8e68f48bf14022318dffeec23c1223
 2021-06-23 18:51:21 +00:00
Lucas Dupin
ba23b84687 Merge "Correctly serialize population" into sc-dev 2021-06-23 18:48:37 +00:00