Commit Graph

760782 Commits

Author SHA1 Message Date
Elis Elliott
ff3f75ea46 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: I70c2cb5bcbf3c20eb935e315d143b86054d828f3
2022-03-24 00:37:59 +00:00
Automerger Merge Worker
beb057bc27 Merge "Merge "Check for null callback" into tm-dev am: 1ffa981ea5" 2022-03-24 00:37:39 +00:00
Lucas Silva
f7788c107d Merge "Implement dream to bouncer animation." into tm-dev am: 7dc1b2d651 am: 0876cbf511
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17138853

Change-Id: Ia861127591eaa106978bdae9bc94c60238bfdbc5
2022-03-24 00:36:53 +00:00
Ytai Ben-tsvi
59aa284a5a 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: I025f7298a1dab0097520ebaacd01b8f7039009ce
2022-03-24 00:36:31 +00:00
Rambo Wang
89fee4ddc7 [automerger skipped] Merge "Introduce CarrierPrivilegesCallback to replace CarrierPrivilegesListener" am: cabb6b9362 am: 592bab637d am: 72f706f60a -s ours am: a7a5cb7214 -s ours am: 7678f534e2 -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: I86f028e611c675c1c99eb824c1deceddb56a31a7
2022-03-24 00:36:09 +00:00
Automerger Merge Worker
f4949f6572 Merge "Merge "Store initial bouncer showing state." into tm-dev am: 8a4163d495" 2022-03-24 00:36:08 +00:00
Bryce Lee
7c291f884b 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: I81adcebd2c6345c51fdaff7df81304bdc1e01eae
2022-03-24 00:35:22 +00:00
Yan Han
583cd30190 Merge "AudioDeviceVolumeManager: Add APIs for listeners for device volume behavior changes" into tm-dev am: f928348826 am: 5c1420977a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17033149

Change-Id: I245459ea8fdf93e8ee76d14798c3312a1c62e816
2022-03-24 00:35:20 +00:00
Automerger Merge Worker
1cac4f56d6 Merge "Merge "BluetoothMidi: Remove unsafe code" into tm-dev am: 2bea42c4bd" 2022-03-24 00:34:54 +00:00
Robert Wu
fb0bc89187 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: Ic7e0d01a3907f1556fee5fffbb3f45669f3eae27
2022-03-24 00:34:06 +00:00
Chavi Weingarten
690b017b1f Merge "Add DISPLAY_HASH_SERVICE to ServiceName list" into tm-dev am: 325cbe552f am: 166eec9115
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17335440

Change-Id: I26ae9c7cd3b8cee3cfe7059c06388f4d3a228374
2022-03-24 00:34:04 +00:00
Automerger Merge Worker
c8c7efaded Merge "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" 2022-03-24 00:33:56 +00:00
Automerger Merge Worker
5abeed2ed9 Merge "[automerger skipped] Merge "Disable all input on ActivityRecord during untrusted animation" into tm-dev am: a3e1134c46 am: 388f1da673 -s ours" 2022-03-24 00:33:34 +00:00
Caitlin Cassidy
60a6395e1e 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: I27d0cd994d94a8e5c4aba0e08d4731cf6662df95
2022-03-24 00:33:15 +00:00
Chris Li
1cb262da82 [automerger skipped] Merge "Disable all input on ActivityRecord during untrusted animation" into tm-dev am: a3e1134c46 am: 388f1da673 -s ours
am skip reason: skipped by user lihongyu

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

Change-Id: I9eb026f1de5aea083e8cb0031d1c6099d3acb3b3
2022-03-24 00:33:02 +00:00
Remi NGUYEN VAN
815e1b2f37 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: I3c16a4a2d841b3485278a97c48070558f12d8cce
2022-03-24 00:32:21 +00:00
Jon Eckenrode
d03aaba7b2 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: I637c87ebd1728dd353e60967d842c578d7ee9a81
2022-03-24 00:31:14 +00:00
Matt Casey
1b180e4cac 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: I03daffbb29bc628205a83b495b173894c40c1fcb
2022-03-24 00:30:04 +00:00
Lucas Silva
79f22bb682 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: Id35f89f5986f8e9575766bd6640d55ceac2841c5
2022-03-24 00:28:56 +00:00
Rambo Wang
be11b59d02 [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: I9e84048f8e9b252cdce4d31d03a870182a59248d
2022-03-24 00:28:21 +00:00
Yan Han
f9b2a55eff 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: I078478566d35088c5d6284c75da09f91c1f77c35
2022-03-24 00:27:31 +00:00
Chavi Weingarten
6f7f15260f 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: I5db8e8ae3af7a7cfff5dd3348ac13358c1cbfc1f
2022-03-24 00:26:19 +00:00
Chris Li
caadbbe5d0 Merge "[conflict] Merge "Disable all input on ActivityRecord during untrusted animation" into tm-dev am: a3e1134c46" 2022-03-24 00:21:21 +00:00
Salud Lemus
82e396dabd Merge "Restrict API for financed device owner" 2022-03-23 17:58:58 +00:00
Elis Elliott
cb2985a2ae Merge "Protect CAN_INTERACT_ACROSS_PROFILES_CHANGED broadcast." into tm-dev 2022-03-23 17:08:01 +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
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
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
Steve Elliott
9019432aed Merge "Inject LockScreenUserManager iface instead of impl" into tm-dev am: 6a0d65a739 am: bfbcfb92ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17323564

Change-Id: I4903e771888ac865c4ee1ba7611976ab165c7d7c
2022-03-23 14:10:52 +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
2f49be6dde [conflict] 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: Iae740ca49a726ab5a022c44cfe748288aa9507b2
2022-03-23 13:56:01 +00:00