Merge snapshot variant of donut back into main tree

diff --git a/AaptAssets.cpp b/AaptAssets.cpp
index 67af116d372dc5e67dff6bc01cba8e13d053fb2e..14cad2f0b8b9c461a8614db34511d2e064de9d78 100644 (file)
--- a/AaptAssets.cpp
+++ b/AaptAssets.cpp
@@ -654,9 +654,15 @@ bool AaptGroupEntry::getDensityName(const char* name,
                                     ResTable_config* out)
 {
     if (strcmp(name, kWildcardName) == 0) {
-        if (out) out->density = 0;
+        if (out) out->density = ResTable_config::DENSITY_DEFAULT;
         return true;
     }
+    
+    if (strcmp(name, "nodpi") == 0) {
+        if (out) out->density = ResTable_config::DENSITY_NONE;
+        return true;
+    }
+    
     char* c = (char*)name;
     while (*c >= '0' && *c <= '9') {
         c++;