Commit Graph

755894 Commits

Author SHA1 Message Date
Steve Elliott
aa470fd094 Merge "Remove unneeded notif vis checks" into tm-dev am: c8a32ef1f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17350683

Change-Id: Ie45a4b6eeebce387c38ba6e0409be8bec516dfed
2022-03-23 17:42:56 +00:00
Steve Elliott
c8a32ef1f8 Merge "Remove unneeded notif vis checks" into tm-dev 2022-03-23 17:36:13 +00:00
Sooraj Sasindran
a4111f5311 Merge "Get device owner app admin" into tm-dev am: 2844eaf9f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17323775

Change-Id: If1d010b01aebdd79e8a91bb2e2163293b131ef71
2022-03-23 17:30:10 +00:00
John Wu
fa150bbc63 Merge "Revert "Update AndroidKeyStoreMaintenance framework API"" am: b8ebf69571 am: 2e64dda571 am: 289609bdb3 am: 7128e88488
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2017095

Change-Id: Ie877dfd0f3b9bc7674b54c4cc14da3abf886f93d
2022-03-23 17:29:55 +00:00
Lucas Dupin
f3e68d9a71 Merge "Asynchronously bind/unbind service" into tm-dev am: f4dbcd621f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17188342

Change-Id: Iafdc1b7b860930c68a86dde988d6bd7d4631367a
2022-03-23 17:29:34 +00:00
Elis Elliott
28c62951e8 Merge "Protect CAN_INTERACT_ACROSS_PROFILES_CHANGED broadcast." into tm-dev am: cb2985a2ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17135164

Change-Id: I12f5506df34f71d9d8a40094eb962e15263f60f6
2022-03-23 17:29:11 +00:00
Sooraj Sasindran
2844eaf9f7 Merge "Get device owner app admin" into tm-dev 2022-03-23 17:21:00 +00:00
John Wu
7128e88488 Merge "Revert "Update AndroidKeyStoreMaintenance framework API"" am: b8ebf69571 am: 2e64dda571 am: 289609bdb3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2017095

Change-Id: Iddeb472553b4713fc51613effa6e565188119bf8
2022-03-23 17:20:24 +00:00
Lucas Dupin
f4dbcd621f Merge "Asynchronously bind/unbind service" into tm-dev 2022-03-23 17:11:24 +00:00
Elis Elliott
cb2985a2ae Merge "Protect CAN_INTERACT_ACROSS_PROFILES_CHANGED broadcast." into tm-dev 2022-03-23 17:08:01 +00:00
John Wu
289609bdb3 Merge "Revert "Update AndroidKeyStoreMaintenance framework API"" am: b8ebf69571 am: 2e64dda571
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2017095

Change-Id: Iaf6508517a2078145f639cd7694a3ffa0cd9e997
2022-03-23 17:02:17 +00:00
Ytai Ben-tsvi
71fdd608c3 Merge "Check for null callback" into tm-dev am: 1ffa981ea5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17300633

Change-Id: I546cff354f78a11994dd2d28afcaf16a9dad0817
2022-03-23 16:40:54 +00:00
Bryce Lee
d370f3b355 Merge "Store initial bouncer showing state." into tm-dev am: 8a4163d495
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17128838

Change-Id: Icdcc09caf480155b4a8036bd9457c3e9e2542576
2022-03-23 16:40:28 +00:00
Robert Wu
88ce6d7ae7 Merge "BluetoothMidi: Remove unsafe code" into tm-dev am: 2bea42c4bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17161596

Change-Id: I11a937f9d9526297bfa8172963ca44020ec548b1
2022-03-23 16:39:33 +00:00
John Wu
2e64dda571 Merge "Revert "Update AndroidKeyStoreMaintenance framework API"" am: b8ebf69571
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2017095

Change-Id: I80b9a9a9f84466c49e4dfe80d14cd302fcc7f4e3
2022-03-23 16:39:08 +00:00
Ytai Ben-tsvi
1ffa981ea5 Merge "Check for null callback" into tm-dev 2022-03-23 16:36:16 +00:00
Bryce Lee
8a4163d495 Merge "Store initial bouncer showing state." into tm-dev 2022-03-23 16:16:03 +00:00
Robert Wu
2bea42c4bd Merge "BluetoothMidi: Remove unsafe code" into tm-dev 2022-03-23 16:06:50 +00:00
John Wu
b8ebf69571 Merge "Revert "Update AndroidKeyStoreMaintenance framework API"" 2022-03-23 16:06:00 +00:00
Caitlin Cassidy
17021c6645 Merge "[Media TTT] Update the test adb commands to be able to see the default icon on the sender chip (used for a11y testing)." into tm-dev am: fd5d2c2826
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17293233

Change-Id: Ie782f3df4e076ff20307b709a24c0970792202c2
2022-03-23 15:54:43 +00:00
Caitlin Cassidy
fd5d2c2826 Merge "[Media TTT] Update the test adb commands to be able to see the default icon on the sender chip (used for a11y testing)." into tm-dev 2022-03-23 15:36:09 +00:00
Remi NGUYEN VAN
04d3b1cae1 Merge "Add OWNERS block for code move" am: 9860ef9b01 am: 8014f95d96 am: 9a06a0290e am: c95d61b437
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2036343

Change-Id: I0812e5d44a60100c54e9b72f54185acc55657575
2022-03-23 15:18:59 +00:00
Jon Eckenrode
5bbdb625e6 Merge "Revised the API documentation of the getMetrics and getSize methods to account for differences in API levels." am: 7ac639b11b am: d3fd072f68 am: bfad78abc6 am: 11bc9c9d16
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1957098

Change-Id: I9606045da41de0aa74c4faee7e4b3b3e8a6885fa
2022-03-23 15:18:48 +00:00
Matt Casey
abf46440cf Merge "Give LongScreenshotActivity a "Capture more" label" into tm-dev am: 64511afd04
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17322314

Change-Id: Ic664b3f94b6f3c22c3633dc79503746abb97bb2f
2022-03-23 15:18:26 +00:00
Remi NGUYEN VAN
c95d61b437 Merge "Add OWNERS block for code move" am: 9860ef9b01 am: 8014f95d96 am: 9a06a0290e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2036343

Change-Id: Id3983d9666b94ede480d20643e7e3e8127b4ff62
2022-03-23 15:12:14 +00:00
Jon Eckenrode
11bc9c9d16 Merge "Revised the API documentation of the getMetrics and getSize methods to account for differences in API levels." am: 7ac639b11b am: d3fd072f68 am: bfad78abc6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1957098

Change-Id: I38e40ff8310cf9a4e1a1ee9b527c62ce62f8fed4
2022-03-23 15:11:39 +00:00
Matt Casey
64511afd04 Merge "Give LongScreenshotActivity a "Capture more" label" into tm-dev 2022-03-23 15:10:00 +00:00
Lucas Silva
0876cbf511 Merge "Implement dream to bouncer animation." into tm-dev am: 7dc1b2d651
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17138853

Change-Id: Iea77ed40e7d8db06449d9f235faaf8147778e8a1
2022-03-23 15:04:05 +00:00
Rambo Wang
7678f534e2 [automerger skipped] Merge "Introduce CarrierPrivilegesCallback to replace CarrierPrivilegesListener" am: cabb6b9362 am: 592bab637d am: 72f706f60a -s ours am: a7a5cb7214 -s ours
am skip reason: Merged-In I38d03e3921112c313f3c1d204ed04f6e1756ff39 with SHA-1 5f0502d313 is already in history

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

Change-Id: I02f83d28493676cc4f128d3164705d744554887e
2022-03-23 15:03:53 +00:00
Yan Han
5c1420977a Merge "AudioDeviceVolumeManager: Add APIs for listeners for device volume behavior changes" into tm-dev am: f928348826
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17033149

Change-Id: I85d5226052996346ea0788f6c7ec0b460de055c9
2022-03-23 15:03:39 +00:00
Lucas Silva
7dc1b2d651 Merge "Implement dream to bouncer animation." into tm-dev 2022-03-23 15:03:23 +00:00
Remi NGUYEN VAN
9a06a0290e Merge "Add OWNERS block for code move" am: 9860ef9b01 am: 8014f95d96
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2036343

Change-Id: I666226411621abb82d6a1f5a0b2796063971992e
2022-03-23 14:56:14 +00:00
Jon Eckenrode
bfad78abc6 Merge "Revised the API documentation of the getMetrics and getSize methods to account for differences in API levels." am: 7ac639b11b am: d3fd072f68
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1957098

Change-Id: I534e88ec19327a174068807996f133740966741e
2022-03-23 14:55:41 +00:00
Rambo Wang
a7a5cb7214 [automerger skipped] Merge "Introduce CarrierPrivilegesCallback to replace CarrierPrivilegesListener" am: cabb6b9362 am: 592bab637d am: 72f706f60a -s ours
am skip reason: Merged-In I38d03e3921112c313f3c1d204ed04f6e1756ff39 with SHA-1 5f0502d313 is already in history

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

Change-Id: I086b8fd0ad2e476e21563927386ee61fc8c819c4
2022-03-23 14:45:57 +00:00
Yan Han
f928348826 Merge "AudioDeviceVolumeManager: Add APIs for listeners for device volume behavior changes" into tm-dev 2022-03-23 14:44:24 +00:00
Chavi Weingarten
166eec9115 Merge "Add DISPLAY_HASH_SERVICE to ServiceName list" into tm-dev am: 325cbe552f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17335440

Change-Id: I1a8cfa550289d4eb18881e501b1920a59447be6d
2022-03-23 14:38:59 +00:00
Remi NGUYEN VAN
8014f95d96 Merge "Add OWNERS block for code move" am: 9860ef9b01
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2036343

Change-Id: I9756ef452ce097a634dbb84797dfe9b8d6cabb13
2022-03-23 14:33:13 +00:00
Jon Eckenrode
d3fd072f68 Merge "Revised the API documentation of the getMetrics and getSize methods to account for differences in API levels." am: 7ac639b11b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1957098

Change-Id: I124703352d349e1c46ac13c6fdf50284af4b6be0
2022-03-23 14:32:25 +00:00
Rambo Wang
72f706f60a Merge "Introduce CarrierPrivilegesCallback to replace CarrierPrivilegesListener" am: cabb6b9362 am: 592bab637d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2037268

Change-Id: I33770b31f15362225e0190557afbbdda144f742f
2022-03-23 14:26:27 +00:00
Chavi Weingarten
325cbe552f Merge "Add DISPLAY_HASH_SERVICE to ServiceName list" into tm-dev 2022-03-23 14:22:47 +00:00
Remi NGUYEN VAN
9860ef9b01 Merge "Add OWNERS block for code move" 2022-03-23 14:19:10 +00:00
Jon Eckenrode
7ac639b11b Merge "Revised the API documentation of the getMetrics and getSize methods to account for differences in API levels." 2022-03-23 14:16:19 +00:00
Rambo Wang
592bab637d Merge "Introduce CarrierPrivilegesCallback to replace CarrierPrivilegesListener" am: cabb6b9362
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2037268

Change-Id: I4035975b182b7ab0e93426126cbab487f4f286b3
2022-03-23 14:04:51 +00:00
Chris Li
388f1da673 Merge "Disable all input on ActivityRecord during untrusted animation" into tm-dev am: a3e1134c46
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17258046

Change-Id: I59e222a005f6ce8e39dc89a88af393737fe4b818
2022-03-23 13:49:17 +00:00
Steve Elliott
bfbcfb92ed Merge "Inject LockScreenUserManager iface instead of impl" into tm-dev am: 6a0d65a739
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17323564

Change-Id: I65bf65e73c17e0e3202e246427e703db4db32034
2022-03-23 13:48:38 +00:00
Chris Li
a3e1134c46 Merge "Disable all input on ActivityRecord during untrusted animation" into tm-dev 2022-03-23 13:47:59 +00:00
Rambo Wang
cabb6b9362 Merge "Introduce CarrierPrivilegesCallback to replace CarrierPrivilegesListener" 2022-03-23 13:44:09 +00:00
Steve Elliott
6a0d65a739 Merge "Inject LockScreenUserManager iface instead of impl" into tm-dev 2022-03-23 13:25:29 +00:00
Steve Elliott
cae38bac77 Remove unneeded notif vis checks
The visibility of ExpandableNotificationRows does not need to be checked
inside of NotificationStackSizeCalculator; it is already handled as part
of the Notification Pipeline (inside of KeyguardCoordinator). The View
layer (NSSL and associated classes, such as this one) can assume that
any Notifications that are present should actually be there.

Fixes: 226132311
Test: Verify multiple notifications visible on the lockscreen
Change-Id: I1117f3c139422a9110a9f5353fc27bbcbb534f75
2022-03-23 08:54:21 -04:00
Virkumar Karavate
9f62497f95 Merge "(Re-Introduce locking)[TEMP] Re-Introduce synchronization locking" am: 14087b39d1 am: b646fcd689 am: 9723c61343 am: 1283caacb6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2036103

Change-Id: I400171202859f4c2d8c16b975624313b8e4b3ff2
2022-03-23 12:54:05 +00:00