diff options
| author | Robert Greenwalt <robdroid@android.com> | 2009-04-22 14:35:11 -0700 |
|---|---|---|
| committer | Robert Greenwalt <robdroid@android.com> | 2009-04-22 14:35:11 -0700 |
| commit | 96e20409afc720f61d0cd49bf1441f62069bd6bb (patch) | |
| tree | 8088015f1763a454848ad35d4f5dc8f64ebcf6f4 /libs | |
| parent | 644cf62660c87a9b8d5bcb22412cc2ad2aeea291 (diff) | |
| download | frameworks_base-96e20409afc720f61d0cd49bf1441f62069bd6bb.zip frameworks_base-96e20409afc720f61d0cd49bf1441f62069bd6bb.tar.gz frameworks_base-96e20409afc720f61d0cd49bf1441f62069bd6bb.tar.bz2 | |
Squashed commit of the following:
commit 012b56fc607cf243cf4b29cb2a5f172bcbe0aecd
Author: Robert Greenwalt <robdroid@android.com>
Date: Wed Apr 22 14:31:26 2009 -0700
Additional fixes and tests for density.
commit 91fdc8e187551ae69e0029a4325fb3ad38fe411b
Author: Robert Greenwalt <robdroid@android.com>
Date: Tue Apr 14 14:39:00 2009 -0700
Fix runtime resource selection logic.
Fix isBetterThan so that o or this may be supperior at any stage.
Used to only handle this-better or tie at each stage, biasing against o.
Also allows reset of unit test to succeed. Fixes bug 1709202.
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/utils/ResourceTypes.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/utils/ResourceTypes.cpp b/libs/utils/ResourceTypes.cpp index 2ad3bfe..3d12dca 100644 --- a/libs/utils/ResourceTypes.cpp +++ b/libs/utils/ResourceTypes.cpp @@ -1820,7 +1820,7 @@ ssize_t ResTable::getResource(uint32_t resID, Res_value* outValue, bool mayBeBag } } - if (bestPackage != NULL && bestItem.isBetterThan(thisConfig)) { + if (bestPackage != NULL && bestItem.isMoreSpecificThan(thisConfig)) { continue; } |