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

Merge "Revert "Adding the missing display mode strings to persistentDataStore"" into tm-qpr-dev am: bc62749f01

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

Change-Id: I7505a034ffceda57dc15d29499b1132a8968f135
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-09-30 20:14:30 +00:00
committed by Automerger Merge Worker
parent 39e076bb4b bc62749f01
commit 6be0d9f858
3 changed files with 3 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/display/DisplayManagerService.java
View File

@@ -1759,13 +1759,9 @@ public final class DisplayManagerService extends SystemService {
if (displayDevice == null) {
return;
}
try {
mPersistentDataStore.setUserPreferredResolution(
displayDevice, resolutionWidth, resolutionHeight);
mPersistentDataStore.setUserPreferredRefreshRate(displayDevice, refreshRate);
} finally {
mPersistentDataStore.saveIfNeeded();
}
mPersistentDataStore.setUserPreferredResolution(
displayDevice, resolutionWidth, resolutionHeight);
mPersistentDataStore.setUserPreferredRefreshRate(displayDevice, refreshRate);
}
private void setUserPreferredModeForDisplayLocked(int displayId, Display.Mode mode) {

35
services/core/java/com/android/server/display/PersistentDataStore.java
View File

@@ -75,11 +75,6 @@ import java.util.Objects;
* &lt;/brightness-curve>
* &lt;/brightness-configuration>
* &lt;/brightness-configurations>
* &lt;display-mode>0&lt;
* &lt;resolution-width>1080&lt;/resolution-width>
* &lt;resolution-height>1920&lt;/resolution-height>
* &lt;refresh-rate>60&lt;/refresh-rate>
* &lt;/display-mode>
* &lt;/display>
* &lt;/display-states>
* &lt;stable-device-values>
@@ -126,10 +121,6 @@ final class PersistentDataStore {
private static final String ATTR_PACKAGE_NAME = "package-name";
private static final String ATTR_TIME_STAMP = "timestamp";
private static final String TAG_RESOLUTION_WIDTH = "resolution-width";
private static final String TAG_RESOLUTION_HEIGHT = "resolution-height";
private static final String TAG_REFRESH_RATE = "refresh-rate";
// Remembered Wifi display devices.
private ArrayList<WifiDisplay> mRememberedWifiDisplays = new ArrayList<WifiDisplay>();
@@ -705,18 +696,6 @@ final class PersistentDataStore {
case TAG_BRIGHTNESS_CONFIGURATIONS:
mDisplayBrightnessConfigurations.loadFromXml(parser);
break;
case TAG_RESOLUTION_WIDTH:
String width = parser.nextText();
mWidth = Integer.parseInt(width);
break;
case TAG_RESOLUTION_HEIGHT:
String height = parser.nextText();
mHeight = Integer.parseInt(height);
break;
case TAG_REFRESH_RATE:
String refreshRate = parser.nextText();
mRefreshRate = Float.parseFloat(refreshRate);
break;
}
}
}
@@ -733,18 +712,6 @@ final class PersistentDataStore {
serializer.startTag(null, TAG_BRIGHTNESS_CONFIGURATIONS);
mDisplayBrightnessConfigurations.saveToXml(serializer);
serializer.endTag(null, TAG_BRIGHTNESS_CONFIGURATIONS);
serializer.startTag(null, TAG_RESOLUTION_WIDTH);
serializer.text(Integer.toString(mWidth));
serializer.endTag(null, TAG_RESOLUTION_WIDTH);
serializer.startTag(null, TAG_RESOLUTION_HEIGHT);
serializer.text(Integer.toString(mHeight));
serializer.endTag(null, TAG_RESOLUTION_HEIGHT);
serializer.startTag(null, TAG_REFRESH_RATE);
serializer.text(Float.toString(mRefreshRate));
serializer.endTag(null, TAG_REFRESH_RATE);
}
public void dump(final PrintWriter pw, final String prefix) {
@@ -752,8 +719,6 @@ final class PersistentDataStore {
pw.println(prefix + "BrightnessValue=" + mBrightness);
pw.println(prefix + "DisplayBrightnessConfigurations: ");
mDisplayBrightnessConfigurations.dump(pw, prefix);
pw.println(prefix + "Resolution=" + mWidth + " " + mHeight);
pw.println(prefix + "RefreshRate=" + mRefreshRate);
}
}

69
services/tests/servicestests/src/com/android/server/display/PersistentDataStoreTest.java
View File

@@ -275,75 +275,6 @@ public class PersistentDataStoreTest {
assertNull(mDataStore.getBrightnessConfiguration(userSerial));
}
@Test
public void testStoreAndRestoreResolution() {
final String uniqueDisplayId = "test:123";
DisplayDevice testDisplayDevice = new DisplayDevice(null, null, uniqueDisplayId, null) {
@Override
public boolean hasStableUniqueId() {
return true;
}
@Override
public DisplayDeviceInfo getDisplayDeviceInfoLocked() {
return null;
}
};
int width = 35;
int height = 45;
mDataStore.loadIfNeeded();
mDataStore.setUserPreferredResolution(testDisplayDevice, width, height);
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
mInjector.setWriteStream(baos);
mDataStore.saveIfNeeded();
mTestLooper.dispatchAll();
assertTrue(mInjector.wasWriteSuccessful());
TestInjector newInjector = new TestInjector();
PersistentDataStore newDataStore = new PersistentDataStore(newInjector);
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
newInjector.setReadStream(bais);
newDataStore.loadIfNeeded();
assertNotNull(newDataStore.getUserPreferredResolution(testDisplayDevice));
assertEquals(35, newDataStore.getUserPreferredResolution(testDisplayDevice).x);
assertEquals(35, mDataStore.getUserPreferredResolution(testDisplayDevice).x);
assertEquals(45, newDataStore.getUserPreferredResolution(testDisplayDevice).y);
assertEquals(45, mDataStore.getUserPreferredResolution(testDisplayDevice).y);
}
@Test
public void testStoreAndRestoreRefreshRate() {
final String uniqueDisplayId = "test:123";
DisplayDevice testDisplayDevice = new DisplayDevice(null, null, uniqueDisplayId, null) {
@Override
public boolean hasStableUniqueId() {
return true;
}
@Override
public DisplayDeviceInfo getDisplayDeviceInfoLocked() {
return null;
}
};
float refreshRate = 85.3f;
mDataStore.loadIfNeeded();
mDataStore.setUserPreferredRefreshRate(testDisplayDevice, refreshRate);
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
mInjector.setWriteStream(baos);
mDataStore.saveIfNeeded();
mTestLooper.dispatchAll();
assertTrue(mInjector.wasWriteSuccessful());
TestInjector newInjector = new TestInjector();
PersistentDataStore newDataStore = new PersistentDataStore(newInjector);
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
newInjector.setReadStream(bais);
newDataStore.loadIfNeeded();
assertNotNull(newDataStore.getUserPreferredRefreshRate(testDisplayDevice));
assertEquals(85.3f, mDataStore.getUserPreferredRefreshRate(testDisplayDevice), 01.f);
assertEquals(85.3f, newDataStore.getUserPreferredRefreshRate(testDisplayDevice), 0.1f);
}
public class TestInjector extends PersistentDataStore.Injector {
private InputStream mReadStream;
private OutputStream mWriteStream;