Commit Graph

742398 Commits

Author SHA1 Message Date
Caitlin Cassidy
dbd0419bab Merge changes Iceea7c10,Iba98b916,I912caa44,Id5aef5c4,Iddc05936, ...
* changes:
  [Media TTT] Add NoLongerCloseToReceiver callback.
  [Media TTT] Add TransferToThisDeviceSucceeded callback.
  [Media TTT] Add an undo callback to the interface for when a transfer has succeeded. The callback will be invoked when the user presses the undo button.
  [Media TTT] Add the #transferToReceiverSucceeded callback.
  [Media TTT] Add transferToThisDeviceTriggered callback.
  [Media TTT] Update chip states to not require otherDeviceName if they don't need it. Define a #getChipTextString method instead.
2022-01-24 20:04:34 +00:00
Automerger Merge Worker
8919e54dbe Merge "Merge "Monitor interface added and update bpf interface map" am: d6ba5ab1b5 am: 0e5a1b21cf am: 402c615d7a am: 4be38b0eac" 2022-01-24 20:00:31 +00:00
TreeHugger Robot
6bdd7e1acd [automerger skipped] Merge "Service: transmits empty station list" into sc-v2-dev am: 489cec0276 -s ours am: 167dbb24d6 -s ours
am skip reason: Merged-In Ida0d7637e32b4b9064cddbd3e8d8d4b8d347023c with SHA-1 02f65dd642 is already in history

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

Change-Id: Id5cd0abd1a7d46f3c86210d30aaabf4b800b06f5
2022-01-24 20:00:17 +00:00
Automerger Merge Worker
e62bad3fa4 Merge "Merge "Monitor interface added and update bpf interface map" am: d6ba5ab1b5 am: 0e5a1b21cf am: 402c615d7a am: 4be38b0eac" 2022-01-24 20:00:11 +00:00
Maciej Żenczykowski
82478bdf47 Merge "Monitor interface added and update bpf interface map" am: d6ba5ab1b5 am: 0e5a1b21cf am: 402c615d7a am: 4be38b0eac
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1954391

Change-Id: Ie201a0bbc48615f8c74c4a69ea154f8c9a795ab7
2022-01-24 20:00:07 +00:00
Josh Tsuji
b0caae303c Merge "Check that PowerManager#isInteractive is false before showing the AOD UI for screen off." 2022-01-24 19:59:44 +00:00
Maciej Żenczykowski
3a79de0568 Merge "Monitor interface added and update bpf interface map" am: d6ba5ab1b5 am: 0e5a1b21cf am: 402c615d7a am: 4be38b0eac
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1954391

Change-Id: Ie21cd49b0b58dbe8c40f6964c427ec8f2b996408
2022-01-24 19:59:44 +00:00
TreeHugger Robot
167dbb24d6 [automerger skipped] Merge "Service: transmits empty station list" into sc-v2-dev am: 489cec0276 -s ours
am skip reason: Merged-In Ida0d7637e32b4b9064cddbd3e8d8d4b8d347023c with SHA-1 02f65dd642 is already in history

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

Change-Id: I0cc1b1bae5faff119d3b36a80240779d95ab2b10
2022-01-24 19:59:43 +00:00
Yan Yan
9649474755 Merge "Improve the API doc for setVcnUnderlyingNetworkPriorities" am: b85c5d7634 am: e6286ba332 am: 59bb050977 am: 2580f4afc2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1945490

Change-Id: I567de4b56f6b92a1f0f28ca2da23924f84571db8
2022-01-24 19:59:08 +00:00
TreeHugger Robot
81d08dad4a [automerger skipped] Merge changes from topic "presubmit-am-9ac0d720d9e1426daa03a0d40542b907" into sc-v2-dev-plus-aosp am: b5e3ae424c -s ours
am skip reason: Merged-In Ida0d7637e32b4b9064cddbd3e8d8d4b8d347023c with SHA-1 c7022e19a8 is already in history

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

Change-Id: I7688e2ba82fcaf592e45f3be765fe8549b14e882
2022-01-24 19:58:26 +00:00
Rachel Lee
abe5a0016f Merge changes from topic "scdocs"
* changes:
  Use AVsyncId typedef in hwui.
  Use AVsyncId typedef.
2022-01-24 19:54:35 +00:00
Eric Laurent
7656a21d81 Merge "audio: add Bluetooth LE Audio broadcast device" 2022-01-24 19:47:50 +00:00
Maciej Żenczykowski
4be38b0eac Merge "Monitor interface added and update bpf interface map" am: d6ba5ab1b5 am: 0e5a1b21cf am: 402c615d7a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1954391

Change-Id: I9e4c22d389039ea5673b489de5e9147be942349d
2022-01-24 19:40:45 +00:00
Yan Yan
2580f4afc2 Merge "Improve the API doc for setVcnUnderlyingNetworkPriorities" am: b85c5d7634 am: e6286ba332 am: 59bb050977
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1945490

Change-Id: I38301bd886ab0733bc66d5fd36f7c6368acf0fa5
2022-01-24 19:40:03 +00:00
TreeHugger Robot
b5e3ae424c Merge changes from topic "presubmit-am-9ac0d720d9e1426daa03a0d40542b907" into sc-v2-dev-plus-aosp
* changes:
  [automerged blank] Service: transmits empty station list 2p: 02f65dd642
  Service: transmits empty station list
2022-01-24 19:39:34 +00:00
TreeHugger Robot
489cec0276 Merge "Service: transmits empty station list" into sc-v2-dev 2022-01-24 19:39:33 +00:00
TreeHugger Robot
cbfc6f5891 Merge changes Ibb968d5c,I38521e9a
* changes:
  [Media TTT] Add the #transferToReceiverTriggered callback.
  [Media TTT] Don't use futures for determining whether a transfer has succeeded or not.
2022-01-24 19:36:40 +00:00
TreeHugger Robot
c11852d456 Merge changes Ic4074394,I1be9f1ab
* changes:
  [Media TTT] Add error state.
  [Media TTT] Add the #closeToReceiverToEndCast callback.
2022-01-24 19:36:24 +00:00
Minche Li
7f2d7f6a23 Merge "Dumps magnification information when calling dumpsys accessibility" 2022-01-24 19:34:34 +00:00
Roopa Sattiraju
c5399ffe76 Merge "Initialize FrameworkInitializer for Bluetooth" 2022-01-24 19:31:20 +00:00
Maciej Żenczykowski
402c615d7a Merge "Monitor interface added and update bpf interface map" am: d6ba5ab1b5 am: 0e5a1b21cf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1954391

Change-Id: I11da01809dc028e3a5d4165b623b3fa6e51da4ae
2022-01-24 19:29:08 +00:00
Darrell Shi
a67a0dd0de Merge "Clean up DreamService." 2022-01-24 19:29:04 +00:00
Yan Yan
59bb050977 Merge "Improve the API doc for setVcnUnderlyingNetworkPriorities" am: b85c5d7634 am: e6286ba332
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1945490

Change-Id: I7d88ec6377f5bf1972d8a981a005ab4aa69982ae
2022-01-24 19:27:11 +00:00
Andrew Cheng
2b450612fc Merge "New @SystemApi's in BluetoothMapClient" am: f97b80ebd7 am: 490121697e am: b92748937f am: 87bbfa2701
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1954736

Change-Id: I50e2caca59ffd94db381826f68e3108bbb2850fb
2022-01-24 19:22:42 +00:00
Badhri Jagan Sridharan
d368d4ee67 Merge "Add systemApis to allow data transfer over USB-C while being docked" 2022-01-24 19:19:25 +00:00
Maciej Żenczykowski
0e5a1b21cf Merge "Monitor interface added and update bpf interface map" am: d6ba5ab1b5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1954391

Change-Id: I9e22aa42dc0b878ea6a89c9003acebcf07a508bb
2022-01-24 19:15:00 +00:00
Maciej Żenczykowski
d6ba5ab1b5 Merge "Monitor interface added and update bpf interface map" 2022-01-24 19:05:27 +00:00
Yan Yan
e6286ba332 Merge "Improve the API doc for setVcnUnderlyingNetworkPriorities" am: b85c5d7634
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1945490

Change-Id: Iad3b19f722a20cdd6ebcfaaf3c5a551f3bf4d197
2022-01-24 19:02:46 +00:00
Makoto Onuki
615951d16e Merge "Add a check to detect "duplicate app instances" bug" 2022-01-24 19:01:51 +00:00
Andrew Cheng
87bbfa2701 Merge "New @SystemApi's in BluetoothMapClient" am: f97b80ebd7 am: 490121697e am: b92748937f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1954736

Change-Id: I47b5102392b9469ee3e34c1b3288c976a32e8b2e
2022-01-24 19:01:46 +00:00
Yohei Yukawa
dcd0264584 Merge "Minimum impl of nav buttons rendered by IME" 2022-01-24 19:00:42 +00:00
Tiger Huang
2b4f585211 Merge "Let the dimming window can provide multiple appearance regions" 2022-01-24 19:00:08 +00:00
Maurice Lam
e3d643aaee Merge "Add ActivityListener to VirtualDeviceManager" 2022-01-24 18:53:29 +00:00
Michał Brzeziński
aeaaa42c19 Merge "Resetting shade state when unfolding on keyguard" 2022-01-24 18:47:51 +00:00
Andrew Cheng
b92748937f Merge "New @SystemApi's in BluetoothMapClient" am: f97b80ebd7 am: 490121697e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1954736

Change-Id: Ia99bffadb72600a0df7af5ce58a3d77e42431b79
2022-01-24 18:45:48 +00:00
Kevin Han
625eef9395 Merge "Add API to get hibernation eligibility" 2022-01-24 18:43:43 +00:00
Darrell Shi
0cfd734ba1 Merge "Add ComplicationType in ComplicationProvider." 2022-01-24 18:40:03 +00:00
Philip Junker
83704e06b3 Merge changes from topic "keyLayoutAPI"
* changes:
  Add TestAPIs to test InputDevice#getKeyCodeForKeyLocation().
  Add API to get KeyCode produced by physical key location.
2022-01-24 18:39:18 +00:00
Yohei Yukawa
7e6787795e Merge "Introduce IInputMethodInvoker" 2022-01-24 18:37:38 +00:00
Yan Yan
b85c5d7634 Merge "Improve the API doc for setVcnUnderlyingNetworkPriorities" 2022-01-24 18:37:31 +00:00
Ming-Shin Lu
da0a2c7c31 Merge "Fix testGetSettingsContextOnDualDisplayContent flakiness" 2022-01-24 18:25:34 +00:00
Andrew Cheng
490121697e Merge "New @SystemApi's in BluetoothMapClient" am: f97b80ebd7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1954736

Change-Id: I3a0c6f4206693f6c68d4a39575c366b1c4e14d74
2022-01-24 18:23:38 +00:00
Anton Hansson
9f8924f79f Merge "Split android-non-updatable-stubs-defaults in two" am: 70ab0685cf am: e55397e910 am: 8906255544 am: 7312a200ec
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958860

Change-Id: I7c1b3a9ebb2a8cf9dd64ec05f70450442cc83fcd
2022-01-24 18:22:22 +00:00
Andrew Cheng
f97b80ebd7 Merge "New @SystemApi's in BluetoothMapClient" 2022-01-24 18:11:45 +00:00
Michael Wachenschwanz
9033b364a6 Merge "Small fixes to PowerProfile and ModemPowerProfile" 2022-01-24 18:06:04 +00:00
Anton Hansson
7312a200ec Merge "Split android-non-updatable-stubs-defaults in two" am: 70ab0685cf am: e55397e910 am: 8906255544
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958860

Change-Id: I9d7b3b14357d4a2db3d18bbc61a4b10c986a3634
2022-01-24 18:04:22 +00:00
Nataniel Borges
6c218cd563 Merge "Run CloseImeToHome 5x as other flicker tests" 2022-01-24 17:54:15 +00:00
Jeff DeCew
931d918472 Merge "Always execute the dismiss end runnable on silent header clear." 2022-01-24 17:53:33 +00:00
Anton Hansson
8906255544 Merge "Split android-non-updatable-stubs-defaults in two" am: 70ab0685cf am: e55397e910
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958860

Change-Id: Ia4926c922cd1663690f118b7fa996787fc995b08
2022-01-24 17:47:38 +00:00
Nataniel Borges
2a7fc664a0 Merge "Add API for writing WM trace to file" 2022-01-24 17:41:59 +00:00