Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
779,528 Commits 3 Branches 0 Tags
6bb34e9b92cd54c06b201342f6fade5b8f799fcc
Commit Graph

779528 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Silvia Vinyes
6bb34e9b92 Merge "Ensure only internal display display interactions are logged." into tm-qpr-dev 2022-11-11 13:58:23 +00:00
Ilya Matyukhin
2e38249906 Add tests for the FingerprintManager path in UdfpsController 
Bug: 218388821
Test: atest UdfpsControllerTest
Change-Id: I0de372b2897231ee2832a07d660e233f4ed9fd05
 2022-11-11 06:51:42 +00:00
Shawn Lin
58de71a4a9 Merge "Fix cutout not updating when switching cutout emulation" into tm-qpr-dev 2022-11-11 06:14:28 +00:00
Tiger Huang
d76c6279e1 Merge "Don't send mSizeCompatScale to client if it is from SizeCompatBounds" into tm-qpr-dev 2022-11-11 05:04:05 +00:00
TreeHugger Robot
680dc13217 Merge "Fix NPEs in DataCallResponse" into tm-qpr-dev 2022-11-11 00:11:59 +00:00
TreeHugger Robot
70b8153a79 Merge "Add active unlock chipbar flag" into tm-qpr-dev 2022-11-10 23:30:43 +00:00
Ling Ma
b5f022c6b8 Remove dup flag 
Test: m
Fix: 258710550
Change-Id: Ia0411701bec4fcb3f928806a8de6dd5451714daa
 2022-11-10 22:07:29 +00:00
Shawn Lee
4264971f61 Merge "Revert "Revert "Extract camera launch code from NPVC into Centra..."" into tm-qpr-dev 2022-11-10 21:19:49 +00:00
Rex Hoffman
f668c05934 Merge "Enable new_robolectric" into tm-dev am: f98c04b242 am: 8e11100430 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20413421

Change-Id: I8df007790b7d3f632e38e5b670e28a63005f1acf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 21:12:52 +00:00
Ling Ma
5ea7759345 Merge "Add the secondary sub to internet dialog" into tm-qpr-dev 2022-11-10 20:57:30 +00:00
Ling Ma
44a29abfc0 Merge "Add MOBILE_DATA_POLICY_AUTO_DATA_SWITCH" into tm-qpr-dev 2022-11-10 20:57:30 +00:00
Ling Ma
720643665a Merge "Apply SIMPLE strategy to TextView's description" into tm-qpr-dev 2022-11-10 20:57:30 +00:00
Matt Pietal
2c34290e87 Merge changes I645115ab,I73b51987,Id1b79253 into tm-qpr-dev 
* changes:
  Scrims - Don't blend with bouncer when shade is collapsing
  Transitions - Add dreaming state
  Transitions - Make them cancelable
 2022-11-10 20:51:06 +00:00
Rex Hoffman
8e11100430 Merge "Enable new_robolectric" into tm-dev am: f98c04b242 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20413421

Change-Id: I8090fd4039d2ca1e67fa57ef9376d020077c6b2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 20:43:35 +00:00
Aaron Liu
7b0af20371 Merge "[Bouncer] Move bouncer title to bottom." into tm-qpr-dev 2022-11-10 20:08:41 +00:00
Rex Hoffman
f98c04b242 Merge "Enable new_robolectric" into tm-dev 2022-11-10 20:05:44 +00:00
Evan Laird
559acbfde9 Merge "Enable network type icon overlays by carrier Id" into tm-qpr-dev 2022-11-10 20:01:23 +00:00
Aaron Liu
d4286fa1a8 Merge "[Bouncer] Set message for dismiss api." into tm-qpr-dev 2022-11-10 19:47:54 +00:00
Vinit Nayak
3f1d875795 Merge "Improve Split portrait gesture animation" into tm-qpr-dev 2022-11-10 19:19:39 +00:00
Sarah Chin
df51305f90 Fix NPEs in DataCallResponse 
Fix NPEs in the equals method for DataCallResponse. Only check the size
for QOS bearer sessions and traffic descriptors if they are both not
null. Also fix the hash code to return the same hash regardless of list
orders.

Test: atest DataCallResponseTest
Bug: 257975797
Change-Id: I6403f71126e3e5ab300c565cf0c528268cbfe69d
Merged-In: I6403f71126e3e5ab300c565cf0c528268cbfe69d
 2022-11-10 19:19:35 +00:00
Yalan Yiue
2d5c31acdf Merge "[Partial Screensharing] Hide 'show touches' in SysUI Recorder" into tm-qpr-dev 2022-11-10 19:11:22 +00:00
TreeHugger Robot
2aea66b332 Merge "Don't dismiss the keyguard from the binder thread" into tm-qpr-dev 2022-11-10 18:57:13 +00:00
TreeHugger Robot
0f8d00ae59 Merge "Show the "Face unlock unavailable" message on bouncer as well" into tm-qpr-dev 2022-11-10 18:25:21 +00:00
Michał Brzeziński
193046441b Merge "Fixing scrims jumping when media player state changes" into tm-qpr-dev 2022-11-10 18:22:55 +00:00
Shawn Lee
404f12ff3a Revert "Revert "Extract camera launch code from NPVC into Centra..." 
Revert^2 "Update super call in CentralSurfacesGoogle"

87dfd8726991986ea9ac099675c0d26580d9b28a

Change-Id: I71bb90c6e6d7025b1062014fc5f9914c41d4db46
 2022-11-10 18:11:58 +00:00
Yasin Kilicdere
e9bad1ca98 Merge "Add traces to WallpaperManagerService and WallpaperService." into tm-qpr-dev 2022-11-10 17:57:36 +00:00
Michael Mikhail
d1cf8adeda Merge "[Media TTT] Displayed View Keeps Screen On" into tm-qpr-dev 2022-11-10 17:26:26 +00:00
TreeHugger Robot
a6cdf01a6b Merge "Fixed permananent failure behaviors" into tm-qpr-dev 2022-11-10 17:25:24 +00:00
Kriti Dang
7239296def Merge "Retrive the value of user-pref, if its not stored in persistentDataStore" into tm-qpr-dev 2022-11-10 17:14:55 +00:00
Kriti Dang
b1f110a768 Merge "Revert "DO NOT MERGE: Revert "Removing the initialising the mode with system pref mode.""" into tm-qpr-dev 2022-11-10 17:14:55 +00:00
Fabian Kozynski
07c35c080f [automerger skipped] Merge "Disable click on privacy chip before provision" into sc-dev am: 39357500b7 -s ours am: 1afdf37316 -s ours am: 5354054d12 -s ours am: b88d1edcf5 -s ours am: 3d8fd88272 -s ours 
am skip reason: Merged-In I8099dfd259b149cd18509677d623de7a352f5de0 with SHA-1 bf4d73f6ba is already in history

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

Change-Id: I37f89a43532ef333cb65bbd62c154932244a69bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 17:12:03 +00:00
Fabian Kozynski
eabe13f80b [automerger skipped] Disable click on privacy chip before provision am: daf67271ee -s ours am: 3f4a4083e3 -s ours am: ec9ad94152 -s ours am: 6135ae4a38 -s ours am: a8120f3a4d -s ours 
am skip reason: Merged-In I8099dfd259b149cd18509677d623de7a352f5de0 with SHA-1 bf4d73f6ba is already in history

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

Change-Id: I87b003218a6bcf96019a774356dc6bdf23849f45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 17:11:50 +00:00
Fabian Kozynski
3d8fd88272 [automerger skipped] Merge "Disable click on privacy chip before provision" into sc-dev am: 39357500b7 -s ours am: 1afdf37316 -s ours am: 5354054d12 -s ours am: b88d1edcf5 -s ours 
am skip reason: Merged-In I8099dfd259b149cd18509677d623de7a352f5de0 with SHA-1 bf4d73f6ba is already in history

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

Change-Id: I793ccf4f6b248d2417dfe07a7d9661dc87504c5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 16:43:14 +00:00
Fabian Kozynski
a8120f3a4d [automerger skipped] Disable click on privacy chip before provision am: daf67271ee -s ours am: 3f4a4083e3 -s ours am: ec9ad94152 -s ours am: 6135ae4a38 -s ours 
am skip reason: Merged-In I8099dfd259b149cd18509677d623de7a352f5de0 with SHA-1 bf4d73f6ba is already in history

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

Change-Id: I45a4eedd7af3193445464c06dc1673a37b7b97f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 16:43:12 +00:00
Beverly
2ca85f9a80 Add active unlock chipbar flag 
To make it easier to teamfood.

Test: manually check flag in app
Bug: 256513609
Bug: 240196500
Change-Id: I0dd53c4bc601ef2a91402092bf48745b678148be
Merged-In: I0dd53c4bc601ef2a91402092bf48745b678148be
 2022-11-10 16:37:02 +00:00
Fabian Kozynski
b88d1edcf5 [automerger skipped] Merge "Disable click on privacy chip before provision" into sc-dev am: 39357500b7 -s ours am: 1afdf37316 -s ours am: 5354054d12 -s ours 
am skip reason: Merged-In I8099dfd259b149cd18509677d623de7a352f5de0 with SHA-1 bf4d73f6ba is already in history

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

Change-Id: Ie79f598c7f3b076bdbb38ae3d02c95eda31e12c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 15:56:33 +00:00
Fabian Kozynski
6135ae4a38 [automerger skipped] Disable click on privacy chip before provision am: daf67271ee -s ours am: 3f4a4083e3 -s ours am: ec9ad94152 -s ours 
am skip reason: Merged-In I8099dfd259b149cd18509677d623de7a352f5de0 with SHA-1 bf4d73f6ba is already in history

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

Change-Id: I0b1dea98270d93b3187ed63e711409030c24bda4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 15:55:45 +00:00
Fabian Kozynski
5354054d12 [automerger skipped] Merge "Disable click on privacy chip before provision" into sc-dev am: 39357500b7 -s ours am: 1afdf37316 -s ours 
am skip reason: Merged-In I8099dfd259b149cd18509677d623de7a352f5de0 with SHA-1 bf4d73f6ba is already in history

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

Change-Id: I6ff27e2d1318aac7a78609a1ec48614ccf6dba7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 15:28:40 +00:00
Fabian Kozynski
ec9ad94152 [automerger skipped] Disable click on privacy chip before provision am: daf67271ee -s ours am: 3f4a4083e3 -s ours 
am skip reason: Merged-In I8099dfd259b149cd18509677d623de7a352f5de0 with SHA-1 bf4d73f6ba is already in history

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

Change-Id: I2b7706b9ae0f0121b4c7df09e91c01b741435cf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 15:28:27 +00:00
Evan Laird
bb7f96387d Enable network type icon overlays by carrier Id 
This CL builds out a new configuration resource
`carrierid_icon_overrides`, and a format that allows for overriding a
known network type with an arbitrary icon.

We store a mapping of all known carrierId overrides that exist, and
check for an override for the `carrierId & networkType` combination at
runtime.

This CL also caches the calculation in SystemUI since it represents a
new expensive calculation potential at the time of display for the icon.

Lastly, add demo mode command parsing for carrierId

Test: atest MobileStateTest; atest NetworkControllerDataTest
Test: manual using `-e carrierid <id>` network subcommand
Bug: 241996752
Change-Id: Id0e8acf179db5c3a70f4caf31e58f8d8040690a0
 2022-11-10 10:04:50 -05:00
Fabian Kozynski
1afdf37316 [automerger skipped] Merge "Disable click on privacy chip before provision" into sc-dev am: 39357500b7 -s ours 
am skip reason: Merged-In I8099dfd259b149cd18509677d623de7a352f5de0 with SHA-1 bf4d73f6ba is already in history

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

Change-Id: Ib99c0417de67f2dbfbd8ad71ab38ea503d210936
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 14:59:46 +00:00
Fabian Kozynski
3f4a4083e3 [automerger skipped] Disable click on privacy chip before provision am: daf67271ee -s ours 
am skip reason: Merged-In I8099dfd259b149cd18509677d623de7a352f5de0 with SHA-1 bf4d73f6ba is already in history

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

Change-Id: I7d395ec75d402c5a207b340ed5e34dca5f1abbb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 14:59:42 +00:00
Jason Mylen
b4c0589530 Merge "Remove conflicting vibration-only haptic causing inconsistent touch feedback." into tm-qpr-dev 2022-11-10 14:43:01 +00:00
Fabian Kozynski
7515e83e2b Merge changes I61922e99,I656b81fe into tm-qpr-dev 
* changes:
  Add code for collecting panel activity component
  Add meta data for panel
 2022-11-10 14:25:02 +00:00
Fabian Kozynski
39357500b7 Merge "Disable click on privacy chip before provision" into sc-dev 2022-11-10 14:19:46 +00:00
Matt Pietal
314d44fec2 Scrims - Don't blend with bouncer when shade is collapsing 
In the case of having transitioned back to KEYGUARD state, never blend
with the bouncer scrims unless the bouncer is actively in
transit. This prevents the scrim from flashing after collapsing the
shade over lockscreen.

Fixes: 248405303
Test: atest ScrimControllerTest
Test: manually display shade, lockscreen, bouncer and change dark modes
Change-Id: I645115abeb09822a99508b9d9f1fc974b7ce31be
 2022-11-10 13:33:39 +00:00
Naomi Musgrave
f509069081 Merge "Ignore failing tests to unblock presubmit" into sc-dev am: 6c525cb8cd am: abe61d163b am: 4bcc341683 am: 34554688b3 am: 36a89352b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20403503

Change-Id: I5731a9093631a5b38f025ea4bd3e5da30fbb2529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 13:15:08 +00:00
Naomi Musgrave
24906beaf4 Merge changes from topic "presubmit-am-8a8e3596ba7142d4b3706c0f64416d32" into sc-qpr1-dev am: 4937db2448 am: 4f9eeddd24 am: 7dbcebf2ae am: 35bed006a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20403503

Change-Id: I617347ee10a1c87cd04d443ffb23953ee5ae927b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 13:14:56 +00:00
Matt Pietal
a9094c9563 Transitions - Add dreaming state 
Add support for states in and out of dreaming. At the moment, AOD is
equivalent to DOZING but these will be separated out in the future.

Test: atest KeyguardTransitionRepositoryTest
KeyguardRepositoryImplTest
Bug: 195430376

Change-Id: I73b51987f01540cc3d321f23286a3344d0847f9c
 2022-11-10 13:13:41 +00:00
Matt Pietal
d3783f7bac Transitions - Make them cancelable 
Data layer - Add 'isKeyguardGoingAway' information, allow transitions
to be cancelable and add in Cancel state.

Domain layer - Listen for state transitions and then attempt to
cancel/interrupt them under the right circumstances, such as when the
power button is pressed in the middle of an aod -> lockscreen
transition.

Bouncer fixes - hide() was never called when using the back gesture,
resulting in incorrect bouncer state.

Test: atest KeyguardTransitionRepositoryTest
KeyguardRepositoryImplTest KeyguardBouncerTest BouncerInteractorTest
Bug: 195430376

Change-Id: Id1b79253ab6334e8e5941c89e94e267126b08ecb
 2022-11-10 13:02:19 +00:00