Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
769,398 Commits 3 Branches 0 Tags
14abfb27e9ea805ba540f75bfaf8a1b8acaae4fa
Commit Graph

769398 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
14abfb27e9 Merge "Merge "Prevent deadlocks during VirtualDisplay creation" into tm-dev am: fc6eb70e0e am: e1a0bf366d" into tm-d1-dev-plus-aosp 2022-05-30 00:59:41 +00:00
Antony Sargent
4c50bc7922 Merge "Prevent deadlocks during VirtualDisplay creation" into tm-dev am: fc6eb70e0e am: de2d849abd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18246032

Change-Id: Ie6e5871776583b46bc3ad5c5a88ac808baf3d984
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 00:59:11 +00:00
Antony Sargent
cd3c6ef80b Merge "Prevent deadlocks during VirtualDisplay creation" into tm-dev am: fc6eb70e0e am: e1a0bf366d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18246032

Change-Id: Ib83afc1c0a4cdd3d78dd226d343b9fbfe56a4e6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 00:59:10 +00:00
Antony Sargent
de2d849abd Merge "Prevent deadlocks during VirtualDisplay creation" into tm-dev am: fc6eb70e0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18246032

Change-Id: If653afb4a286de6046e9bf4392a2fa924de5c92b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 00:35:54 +00:00
Antony Sargent
e1a0bf366d Merge "Prevent deadlocks during VirtualDisplay creation" into tm-dev am: fc6eb70e0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18246032

Change-Id: Ieafea2c80f875c16215ed05f77c22ec7445fe8af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 00:34:42 +00:00
Antony Sargent
fc6eb70e0e Merge "Prevent deadlocks during VirtualDisplay creation" into tm-dev 2022-05-30 00:09:18 +00:00
Antony Sargent
725dad7d71 Prevent deadlocks during VirtualDisplay creation 
When creating a VirtualDisplay for a VirtualDevice, we need to do some
extra work like setting up for input injection, creating a
DisplayWindowPolicyController, and grabbing a wakelock to keep the
display awake. Some parts of this extra work end up calling back into
the DisplayManagerService from another thread, but since we're already
holding the mSyncRoot lock we sometimes get into situations where
those threads get blocked trying to acquire mSyncRoot, while holding a
lock that another thread ends up needing like the global window
manager one, so we get deadlock.

The fix in this CL is to break up the extra work the
VirtualDeviceManagerService needs to do into two parts: one part that
happens before the VirtualDisplay is created, and one part
after. Neither of these needs mSyncRoot to be held.

Fixes: 230544802
Test: atest CreateVirtualDisplayTest
Change-Id: I6a6e03f816567579510b3f1ef0705375549a3c88
 2022-05-29 11:18:36 -07:00
Automerger Merge Worker
2a6a3d3a7a Merge "Merge "Allow LNB to be opened before Frontend" into tm-dev am: 9dd35d01f8 am: 88f77abcd2" into tm-d1-dev-plus-aosp 2022-05-28 19:38:29 +00:00
Henry Fang
6e8d987826 Merge "Allow LNB to be opened before Frontend" into tm-dev am: 9dd35d01f8 am: 42094ae71b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18635147

Change-Id: Idc732190ae6be8c060251bf32f95815d033aeccb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 19:38:22 +00:00
Henry Fang
db18c32d46 Merge "Allow LNB to be opened before Frontend" into tm-dev am: 9dd35d01f8 am: 88f77abcd2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18635147

Change-Id: I2fc96c9bbc788ebfd5db6f05a8a8f1c80dbf6ab4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 19:38:22 +00:00
Henry Fang
88f77abcd2 Merge "Allow LNB to be opened before Frontend" into tm-dev am: 9dd35d01f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18635147

Change-Id: Ibf857efb8a0496a0f47464e55b65fdaafb56ec67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 19:18:24 +00:00
Henry Fang
42094ae71b Merge "Allow LNB to be opened before Frontend" into tm-dev am: 9dd35d01f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18635147

Change-Id: I4cedca76a4dc4584643c2b72377dfa73f2107030
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 19:17:01 +00:00
Henry Fang
9dd35d01f8 Merge "Allow LNB to be opened before Frontend" into tm-dev 2022-05-28 18:43:29 +00:00
Hongwei Wang
6a4b71e0d8 Merge "Fix the animation position when launch into PiP" into tm-dev am: 83979ad7b7 am: bc6f5f1842 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18637060

Change-Id: I46b338b4b79d05ac7312f4e7548c4c289004dad1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 07:03:07 +00:00
Hongwei Wang
7f48b2a982 Merge "Fix the animation position when launch into PiP" into tm-dev am: 83979ad7b7 am: 21482ebd2c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18637060

Change-Id: I48a26d7d7902f4842928df583557e7acf43576df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 06:55:52 +00:00
Hongwei Wang
bc6f5f1842 Merge "Fix the animation position when launch into PiP" into tm-dev am: 83979ad7b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18637060

Change-Id: I4773a2751725d4e554c84e9fd9ca26ff6e561e25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 06:40:58 +00:00
Hongwei Wang
21482ebd2c Merge "Fix the animation position when launch into PiP" into tm-dev am: 83979ad7b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18637060

Change-Id: I8f5078e5e3607ba2c4a2abf605eb187c4e3de8f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 06:39:33 +00:00
Hongwei Wang
83979ad7b7 Merge "Fix the animation position when launch into PiP" into tm-dev 2022-05-28 06:14:33 +00:00
Automerger Merge Worker
bfb230aeb7 Merge "Merge "Check if the ANR dump is still ongoing before reporting it" into tm-dev am: f3dabda4b0 am: 44592782d5" into tm-d1-dev-plus-aosp 2022-05-28 04:36:32 +00:00
Jing Ji
cb1df73cad Merge "Check if the ANR dump is still ongoing before reporting it" into tm-dev am: f3dabda4b0 am: 133ab48a8f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18634945

Change-Id: I5af2c62af924c415120bb163c79d8db5ee11080c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 04:36:17 +00:00
Jing Ji
0e4791d5dc Merge "Check if the ANR dump is still ongoing before reporting it" into tm-dev am: f3dabda4b0 am: 44592782d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18634945

Change-Id: Ief61e6e360a86070220859d260d719391c47b32b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 04:36:14 +00:00
Jing Ji
44592782d5 Merge "Check if the ANR dump is still ongoing before reporting it" into tm-dev am: f3dabda4b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18634945

Change-Id: If558c9b0c38c8ee88578eb66c5e44411fbb04901
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 04:05:35 +00:00
Jing Ji
133ab48a8f Merge "Check if the ANR dump is still ongoing before reporting it" into tm-dev am: f3dabda4b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18634945

Change-Id: If4274e70f648c166c97619c28498c3720f5f7374
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 04:04:14 +00:00
Jing Ji
f3dabda4b0 Merge "Check if the ANR dump is still ongoing before reporting it" into tm-dev 2022-05-28 03:48:07 +00:00
Automerger Merge Worker
e82dfc606b Merge "Merge "Always restart apps for full installs." into tm-dev am: b44f1fa8ae am: 384b8dd4e4" into tm-d1-dev-plus-aosp 2022-05-28 03:43:15 +00:00
TreeHugger Robot
e3da81e5ed Merge "Always restart apps for full installs." into tm-dev am: b44f1fa8ae am: 384b8dd4e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18630392

Change-Id: I8b27384fc42ad35ded835c5e5dbb274ce8354581
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 03:43:06 +00:00
TreeHugger Robot
a92629a9ef Merge "Always restart apps for full installs." into tm-dev am: b44f1fa8ae am: 56d95955e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18630392

Change-Id: I172a7caeef288a57197433c4df67719cc4a95db0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 03:43:03 +00:00
TreeHugger Robot
384b8dd4e4 Merge "Always restart apps for full installs." into tm-dev am: b44f1fa8ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18630392

Change-Id: I9ff874b8410d0e56201b1952a4130213a341e5a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 03:21:01 +00:00
TreeHugger Robot
56d95955e4 Merge "Always restart apps for full installs." into tm-dev am: b44f1fa8ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18630392

Change-Id: I3b7dfd41eb1e4caa644963140ea47ca380b19854
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 03:19:38 +00:00
TreeHugger Robot
b44f1fa8ae Merge "Always restart apps for full installs." into tm-dev 2022-05-28 03:00:47 +00:00
Automerger Merge Worker
9619b247fe Merge "Merge "Add check for null token when updating state" into tm-dev am: 0e29401d65 am: 9854e5d1fb" into tm-d1-dev-plus-aosp 2022-05-28 02:49:14 +00:00
Beth Thibodeau
3ca98b83ca Merge "Add check for null token when updating state" into tm-dev am: 0e29401d65 am: 9854e5d1fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18634544

Change-Id: Ib8d2b330653ea129ae8302a3be186ceda1e951e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 02:49:02 +00:00
Beth Thibodeau
291a87bc2c Merge "Add check for null token when updating state" into tm-dev am: 0e29401d65 am: be6ae60318 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18634544

Change-Id: I7e5443a817ea9ccb528b673b670e71a5a216266b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 02:48:59 +00:00
Beth Thibodeau
9854e5d1fb Merge "Add check for null token when updating state" into tm-dev am: 0e29401d65 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18634544

Change-Id: I58d9a69cf30cc28fbc3fb6aa7efdab7944664872
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 02:32:49 +00:00
Beth Thibodeau
be6ae60318 Merge "Add check for null token when updating state" into tm-dev am: 0e29401d65 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18634544

Change-Id: I7140ce730bd6cc3829974d2be510af6c0d09683f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 02:31:24 +00:00
Beth Thibodeau
0e29401d65 Merge "Add check for null token when updating state" into tm-dev 2022-05-28 02:10:28 +00:00
TreeHugger Robot
446e32eac2 Merge "MediaCodec: realloc & copy for non-secure buffers at secure session & vice versa" into tm-dev am: 17634b9b45 am: 5e478de35f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18578433

Change-Id: Ic6bb9d6cee536019eb612ee4b18c6e5db77d83c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 00:36:00 +00:00
TreeHugger Robot
d4a2d04615 Merge "AudioService: fix VolumeShaper operation for muteAwaitConnection" into tm-dev am: 57961f0cf5 am: d4d2e0749e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18624718

Change-Id: Id6bb7c61408c0ba0fcdfd97edd18b73879e521a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 00:35:44 +00:00
TreeHugger Robot
dbf46b91f3 Merge "MediaCodec: realloc & copy for non-secure buffers at secure session & vice versa" into tm-dev am: 17634b9b45 am: 9638314e47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18578433

Change-Id: Ibe8ea778df446e2cb69b134349e20a318b52d8dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 00:14:06 +00:00
TreeHugger Robot
6442269708 Merge "AudioService: fix VolumeShaper operation for muteAwaitConnection" into tm-dev am: 57961f0cf5 am: 372bc1c3bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18624718

Change-Id: I692cd50fa04000000f1cb45694cfdfff09f7f7f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 00:13:45 +00:00
TreeHugger Robot
7de3db0730 Merge "[Output Switcher] [A11y] Add description for seekbar" into tm-dev am: 14f92d8897 am: 491dbedcfb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18572029

Change-Id: I43812a717d5e52974206ecfabd96ff08bfd8eebe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 00:13:06 +00:00
TreeHugger Robot
9638314e47 Merge "MediaCodec: realloc & copy for non-secure buffers at secure session & vice versa" into tm-dev am: 17634b9b45 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18578433

Change-Id: Ib9f69023de8d81d970f453942e9c273a01d03aa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 00:12:46 +00:00
Jack Yu
2281e67c2d Merge "Improved telephony registry logging" into tm-dev am: ccfa25d83c am: 6ca4ec4c6d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18627093

Change-Id: I22d5afa09698bd28249aad10e20bbe77a94fd0b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 00:12:42 +00:00
TreeHugger Robot
5e478de35f Merge "MediaCodec: realloc & copy for non-secure buffers at secure session & vice versa" into tm-dev am: 17634b9b45 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18578433

Change-Id: I1c1bb005e72f79344f77927d9e97db1b5a5e717b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 00:11:33 +00:00
TreeHugger Robot
d4d2e0749e Merge "AudioService: fix VolumeShaper operation for muteAwaitConnection" into tm-dev am: 57961f0cf5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18624718

Change-Id: I5b92c18438dea3528c45d49afdcc72295cb885c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 00:11:16 +00:00
TreeHugger Robot
17634b9b45 Merge "MediaCodec: realloc & copy for non-secure buffers at secure session & vice versa" into tm-dev 2022-05-28 00:09:37 +00:00
TreeHugger Robot
edb16d7914 Merge "[Output Switcher] [A11y] Add description for seekbar" into tm-dev am: 14f92d8897 am: f95c3ee588 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18572029

Change-Id: I2d902e251e7112f5550e53e0df9d8fe0322e4d0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 00:06:21 +00:00
Jack Yu
b9efeecdaa Merge "Improved telephony registry logging" into tm-dev am: ccfa25d83c am: 19162c1ee7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18627093

Change-Id: I8a8bf80f368f30641fad6f25f992b32fae3e4c35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 00:04:58 +00:00
TreeHugger Robot
372bc1c3bd Merge "AudioService: fix VolumeShaper operation for muteAwaitConnection" into tm-dev am: 57961f0cf5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18624718

Change-Id: I08b3c59167375378a2152781e6fa28a199c2a7d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 23:49:52 +00:00
TreeHugger Robot
57961f0cf5 Merge "AudioService: fix VolumeShaper operation for muteAwaitConnection" into tm-dev 2022-05-27 23:45:36 +00:00