commit 3a619c86ee8498873aa42b13580205753063e72b
author Jeremy Meyer <jakmcbane@google.com> Fri Nov 05 22:44:59 2021 +0000
committer Jeremy Meyer <jakmcbane@google.com> Tue Nov 09 22:00:17 2021 +0000
tree 87859b0dc20d24d947dccd4fad69c086f01f249c
parent b778bc5ad9381e2f0982b1942083305da1c513b8

Always select the next higher density bucket when picking resources

This reverts commit 30715f3afc061bd25a5f251554efc56c412d02d5.

Reason for revert: roll forward with fix

Change-Id: I6d63e6fa508501f2d029eeb4647d4d70c152ceb3
Test: ran all previously failing tests locally
Fixes: 183136881

libs/androidfw/tests/Config_test.cpp

diff --git a/libs/androidfw/tests/Config_test.cpp b/libs/androidfw/tests/Config_test.cpp
index b54915f..698c36f 100644
--- a/libs/androidfw/tests/Config_test.cpp
+++ b/libs/androidfw/tests/Config_test.cpp
@@ -75,6 +75,9 @@
   configs.add(buildDensityConfig(int(ResTable_config::DENSITY_HIGH) + 20));
   ASSERT_EQ(expectedBest, selectBest(deviceConfig, configs));
 
+  configs.add(buildDensityConfig(int(ResTable_config::DENSITY_XHIGH) - 1));
+  ASSERT_EQ(expectedBest, selectBest(deviceConfig, configs));
+
   expectedBest = buildDensityConfig(ResTable_config::DENSITY_XHIGH);
   configs.add(expectedBest);
   ASSERT_EQ(expectedBest, selectBest(deviceConfig, configs));