Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "LocalDisplayAdapterTest - fixed issue with real DDC loading for fake display" into udc-qpr-dev am: 38645f3450

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

Change-Id: I9b2ed56f4a83a42f50bb9ecb97d515c91f480096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Oleg Petšjonkin
2023-06-30 20:20:02 +00:00
committed by Automerger Merge Worker
parent 5954d8d9e5 38645f3450
commit 3c7db60049
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/display/LocalDisplayAdapter.java
View File

@@ -496,7 +496,7 @@ final class LocalDisplayAdapter extends DisplayAdapter {
private void loadDisplayDeviceConfig() { private void loadDisplayDeviceConfig() {
// Load display device config // Load display device config
final Context context = getOverlayContext(); final Context context = getOverlayContext();
mDisplayDeviceConfig = DisplayDeviceConfig.create(context, mPhysicalDisplayId, mDisplayDeviceConfig = mInjector.createDisplayDeviceConfig(context, mPhysicalDisplayId,
mIsFirstDisplay); mIsFirstDisplay);
// Load brightness HWC quirk // Load brightness HWC quirk
@@ -1336,6 +1336,11 @@ final class LocalDisplayAdapter extends DisplayAdapter {
public SurfaceControlProxy getSurfaceControlProxy() { public SurfaceControlProxy getSurfaceControlProxy() {
return new SurfaceControlProxy(); return new SurfaceControlProxy();
} }
public DisplayDeviceConfig createDisplayDeviceConfig(Context context,
long physicalDisplayId, boolean isFirstDisplay) {
return DisplayDeviceConfig.create(context, physicalDisplayId, isFirstDisplay);
}
} }
public interface DisplayEventListener { public interface DisplayEventListener {

11
services/tests/mockingservicestests/src/com/android/server/display/LocalDisplayAdapterTest.java
View File

@@ -1257,6 +1257,17 @@ public class LocalDisplayAdapterTest {
public LocalDisplayAdapter.SurfaceControlProxy getSurfaceControlProxy() { public LocalDisplayAdapter.SurfaceControlProxy getSurfaceControlProxy() {
return mSurfaceControlProxy; return mSurfaceControlProxy;
} }
// Instead of using DisplayDeviceConfig.create(context, physicalDisplayId, isFirstDisplay)
// we should use DisplayDeviceConfig.create(context, isFirstDisplay) for the test to ensure
// that real device DisplayDeviceConfig is not loaded for FakeDisplay and we are getting
// consistent behaviour. Please also note that context passed to this method, is
// mMockContext and values will be loaded from mMockResources.
@Override
public DisplayDeviceConfig createDisplayDeviceConfig(Context context,
long physicalDisplayId, boolean isFirstDisplay) {
return DisplayDeviceConfig.create(context, isFirstDisplay);
}
} }
private class TestListener implements DisplayAdapter.Listener { private class TestListener implements DisplayAdapter.Listener {