Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
657,699 Commits 3 Branches 0 Tags
c0cdcbfefb08eeea2d2b689888f72043e95508bb
Commit Graph

657699 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Wachenschwanz
62a9ff6718 Move RPM stats collection out of BatteryStatsImpl.mLock 
Querying RPM stats on device with a large number of StateResidency info
can take a long time. Move the query to outside of the BatteryStats
lock to reduce the chance of lock contention.

Bug: 185970842
Test: atest android.cts.statsd.validation.ValidationTests#testPartialWakelock

Change-Id: I1c69b3f9c071e5d758cf4b22855c4b0ec221a5cf
 2021-07-02 15:58:27 -07:00
Jiabin Huang
3832851c97 Merge "Add context in AudioManager.hasHapticChannels." into sc-dev am: 1d4e2f5bb0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15180281

Change-Id: I6d421586c4822cb636883f3cbe54e3d1b22d4a4e
 2021-07-02 22:55:31 +00:00
Silin Huang
38a620562e Merge "Add westworld log to quick access wallet UI." into sc-dev am: bceb8dc9b0 am: 504b8ff694 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15190472

Change-Id: Ia75a20bbbc18a2b4b77e7e6392aff96f3e552bea
 2021-07-02 22:55:14 +00:00
TreeHugger Robot
2e11621ce4 Merge "Fix NPE in TvPipController" into sc-dev am: 03b61d22b6 am: 6be2b2eff1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15156230

Change-Id: I30b4e828f7c4bd070f041fcaff077bfce00f76eb
 2021-07-02 22:54:42 +00:00
Jiabin Huang
0de6ce63c5 Merge "Add context in AudioManager.hasHapticChannels." into sc-dev am: 1d4e2f5bb0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15180281

Change-Id: I292957c33428be833cca3ded07a08163d3f60f60
 2021-07-02 22:54:31 +00:00
Jiabin Huang
1d4e2f5bb0 Merge "Add context in AudioManager.hasHapticChannels." into sc-dev 2021-07-02 22:54:18 +00:00
Silin Huang
58b4907a24 Merge "Add westworld log to quick access wallet UI." into sc-dev am: bceb8dc9b0 am: 2c8c799bdf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15190472

Change-Id: I24c6ecaf481e35713b76bd0147ba33f0bbfe5567
 2021-07-02 22:45:06 +00:00
TreeHugger Robot
61da8bd6ce Merge "Fix NPE in TvPipController" into sc-dev am: 03b61d22b6 am: 9d81fc0b69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15156230

Change-Id: Id08aee30414574c787eb5210585f74211767765f
 2021-07-02 22:44:55 +00:00
Silin Huang
504b8ff694 Merge "Add westworld log to quick access wallet UI." into sc-dev am: bceb8dc9b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15190472

Change-Id: I893e5b3fb196d71490df02b3c96e43cc7f408852
 2021-07-02 22:41:05 +00:00
TreeHugger Robot
6be2b2eff1 Merge "Fix NPE in TvPipController" into sc-dev am: 03b61d22b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15156230

Change-Id: I020a1fe1734400f83b6a7fde85717da1e0826bf8
 2021-07-02 22:40:42 +00:00
Silin Huang
2c8c799bdf Merge "Add westworld log to quick access wallet UI." into sc-dev am: bceb8dc9b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15190472

Change-Id: I8c2313c61d69e2ec93219489525e154f2ba78b86
 2021-07-02 22:39:56 +00:00
TreeHugger Robot
9d81fc0b69 Merge "Fix NPE in TvPipController" into sc-dev am: 03b61d22b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15156230

Change-Id: Ie73828ded3e77c3c1f371d45033234639562673b
 2021-07-02 22:39:25 +00:00
Rahul Sabnis
f85699dc0f Merge "Update BluetoothAdapter and BluetoothDevice documentation" am: 0591dcac60 am: 301ad0c728 am: bd5568f800 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1713250

Change-Id: Idb7e0d7d4b5ddafe9f461851655e2b01693eeecf
 2021-07-02 22:32:05 +00:00
TreeHugger Robot
41ad4362e3 Merge "Add carrier config for using user data to detect RRC state" into sc-dev am: 30debe6591 am: 1b932f7e1d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15188498

Change-Id: Ie5c830186e81c5bb20c9ab72e2bf0aa84bd6fb80
 2021-07-02 22:31:46 +00:00
TreeHugger Robot
081038cec6 Merge "Add carrier config for using user data to detect RRC state" into sc-dev am: 30debe6591 am: 6041ce5c26 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15188498

Change-Id: Id34792fbecd90e64dc7bba6e5dfd3f02356e1318
 2021-07-02 22:31:28 +00:00
Rahul Sabnis
bd5568f800 Merge "Update BluetoothAdapter and BluetoothDevice documentation" am: 0591dcac60 am: 301ad0c728 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1713250

Change-Id: I3c67ce35ae5c26ff497365fb3ab683474e2b4b69
 2021-07-02 22:31:26 +00:00
Silin Huang
bceb8dc9b0 Merge "Add westworld log to quick access wallet UI." into sc-dev 2021-07-02 22:26:18 +00:00
TreeHugger Robot
03b61d22b6 Merge "Fix NPE in TvPipController" into sc-dev 2021-07-02 22:25:09 +00:00
Rahul Sabnis
301ad0c728 Merge "Update BluetoothAdapter and BluetoothDevice documentation" am: 0591dcac60 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1713250

Change-Id: I5b0621bdeeb234d85395039a70b4953640ca2a09
 2021-07-02 22:17:24 +00:00
TreeHugger Robot
6041ce5c26 Merge "Add carrier config for using user data to detect RRC state" into sc-dev am: 30debe6591 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15188498

Change-Id: I304190a9932d98591dd70f3510a21d944b0539f6
 2021-07-02 22:16:34 +00:00
TreeHugger Robot
1b932f7e1d Merge "Add carrier config for using user data to detect RRC state" into sc-dev am: 30debe6591 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15188498

Change-Id: I239425497dbb31850fd3e2d96493eb947be580d0
 2021-07-02 22:15:52 +00:00
TreeHugger Robot
30debe6591 Merge "Add carrier config for using user data to detect RRC state" into sc-dev 2021-07-02 22:05:39 +00:00
Rahul Sabnis
0591dcac60 Merge "Update BluetoothAdapter and BluetoothDevice documentation" 2021-07-02 22:01:50 +00:00
Lyn Han
ace4bdb5ce Merge "Enable qs open while shade expansion is still running" into sc-v2-dev am: ef459ac0b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15191039

Change-Id: Ie7c225231f0771a55daf58896ffb03c1ee490bb4
 2021-07-02 21:40:29 +00:00
Ying Xu
abc52173d5 Merge "Disable W+ in QS." into sc-dev am: d003be9369 am: b501817e9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15188979

Change-Id: Ib9512b722deeec96e361f6191b89142940afe2e1
 2021-07-02 21:40:14 +00:00
Yinglei Wang
b4618ab318 Merge "Allow app usage of AccessibilityInteractionClient#getInstance and clearCache before T" into sc-dev am: 69d877992b am: 1943d7c240 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15181867

Change-Id: I81ee6198c23ce30f7b0d84008ee92aa8c9f3cbc9
 2021-07-02 21:39:49 +00:00
Lucas Dupin
520c39d66c Remove zoom from wake-up transition 
The S spec doesn't have it. It's reminescent from the R spec.

Fixes: 192365994
Test: manual
Change-Id: I4a476ce5c6ea9eca46902d44f132f8abe3884bf4
 2021-07-02 14:39:01 -07:00
Adam Bookatz
bb340dab72 Merge "Revert "Enable remote animation for keyguard going away transition."" into sc-dev am: d24386cd85 am: 56451aecc1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15144072

Change-Id: I4d7b9315d17a7a4f8bcd34c703226701450da9a1
 2021-07-02 21:37:21 +00:00
Fabian Kozynski
6a0235dcf1 Merge "Remove last row bottom padding in QS" into sc-dev am: 49ed060f04 am: 6a15124995 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15188484

Change-Id: Ia94dd0b83cfa8255aef2e8278f6094350be64113
 2021-07-02 21:36:36 +00:00
Lyn Han
ef459ac0b8 Merge "Enable qs open while shade expansion is still running" into sc-v2-dev 2021-07-02 21:28:49 +00:00
Ying Xu
117c825233 Merge "Disable W+ in QS." into sc-dev am: d003be9369 am: 5466eef4c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15188979

Change-Id: I05bad47eb1657f060a1b8588e350743b88dfaa17
 2021-07-02 21:28:38 +00:00
Yinglei Wang
2f82a8c62e Merge "Allow app usage of AccessibilityInteractionClient#getInstance and clearCache before T" into sc-dev am: 69d877992b am: 89704a595e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15181867

Change-Id: I492a47a93692fbc9ae4b777bb05b45d30334e637
 2021-07-02 21:28:32 +00:00
Ying Xu
b501817e9d Merge "Disable W+ in QS." into sc-dev am: d003be9369 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15188979

Change-Id: I07f2e5d7bfdb46bb9f21397276f0240183c4dd7c
 2021-07-02 21:28:17 +00:00
Adam Bookatz
083b9a0823 Merge "Revert "Enable remote animation for keyguard going away transition."" into sc-dev am: d24386cd85 am: 144533ffa5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15144072

Change-Id: Iaf8b2214d48e98b1ff8bab029a4fb967fbe144b3
 2021-07-02 21:28:16 +00:00
Fabian Kozynski
e8e4a4daea Merge "Remove last row bottom padding in QS" into sc-dev am: 49ed060f04 am: 2a40819b6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15188484

Change-Id: I944abf2f5c60af2f8e2aeed0a1961ac313ee9ccc
 2021-07-02 21:28:06 +00:00
Ying Xu
5466eef4c8 Merge "Disable W+ in QS." into sc-dev am: d003be9369 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15188979

Change-Id: Ied6c36d7b984422115be23547ea3dd7e9270b12a
 2021-07-02 21:27:47 +00:00
Yinglei Wang
1943d7c240 Merge "Allow app usage of AccessibilityInteractionClient#getInstance and clearCache before T" into sc-dev am: 69d877992b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15181867

Change-Id: I9dbabae9045f67d595836608de23065030ee17ba
 2021-07-02 21:27:43 +00:00
Jay Sullivan
92420b99a6 Merge "Fix isAutoRevokeWhitelisted vulnerability" into sc-dev am: c567ac9165 am: 64095627e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15102869

Change-Id: Ib92e5e9bf7a41fb938def73f65b357177b9e023e
 2021-07-02 21:27:42 +00:00
Yinglei Wang
89704a595e Merge "Allow app usage of AccessibilityInteractionClient#getInstance and clearCache before T" into sc-dev am: 69d877992b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15181867

Change-Id: I44b685070e45c597d4faaf6f26ef5d98362a9473
 2021-07-02 21:27:26 +00:00
Ying Xu
d003be9369 Merge "Disable W+ in QS." into sc-dev 2021-07-02 21:25:23 +00:00
Yinglei Wang
69d877992b Merge "Allow app usage of AccessibilityInteractionClient#getInstance and clearCache before T" into sc-dev 2021-07-02 21:21:33 +00:00
Adam Bookatz
56451aecc1 Merge "Revert "Enable remote animation for keyguard going away transition."" into sc-dev am: d24386cd85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15144072

Change-Id: I97389a1e3a5db3a3aa322c455783dcfa4b8dff84
 2021-07-02 21:18:43 +00:00
Fabian Kozynski
6a15124995 Merge "Remove last row bottom padding in QS" into sc-dev am: 49ed060f04 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15188484

Change-Id: Idf622e619e2ddcc17f1d21d1debc066f2b63f042
 2021-07-02 21:18:22 +00:00
Adam Bookatz
144533ffa5 Merge "Revert "Enable remote animation for keyguard going away transition."" into sc-dev am: d24386cd85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15144072

Change-Id: I6ecced27076e1481da22489ce7127aa5771de941
 2021-07-02 21:17:09 +00:00
Adam Bookatz
d24386cd85 Merge "Revert "Enable remote animation for keyguard going away transition."" into sc-dev 2021-07-02 21:14:29 +00:00
Winson Chung
a4b441144d Ensure that the pip transaction matrix has only scale & rotation info 
Bug: 191672541
Test: Swipe up from an app w/ auto-enter and no source hint rect
Change-Id: I4d8eccd56a31eea922e99ccb4dcbc64ed58e37d4
 2021-07-02 14:10:33 -07:00
Fabian Kozynski
2a40819b6f Merge "Remove last row bottom padding in QS" into sc-dev am: 49ed060f04 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15188484

Change-Id: I3c73a6366057747fca439ad1c031482f5df8e668
 2021-07-02 21:08:11 +00:00
Fabian Kozynski
49ed060f04 Merge "Remove last row bottom padding in QS" into sc-dev 2021-07-02 21:08:02 +00:00
Jay Sullivan
64095627e5 Merge "Fix isAutoRevokeWhitelisted vulnerability" into sc-dev am: c567ac9165 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15102869

Change-Id: Ifd829f50a32e51afe197207e4b4d194af386bc67
 2021-07-02 21:07:58 +00:00
Jay Sullivan
2ac3185c90 Merge "Fix isAutoRevokeWhitelisted vulnerability" into sc-dev am: c567ac9165 am: f7e502deab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15102869

Change-Id: I3e5a349ee6aaddd563917fb4352a2127ae2c5c84
 2021-07-02 21:07:41 +00:00