OSDN Git Service

Fix ResTable_config::CONFIG_* typo (MCC vs MNC)
authorMårten Kongstad <marten.kongstad@sonymobile.com>
Tue, 26 Nov 2013 13:48:22 +0000 (14:48 +0100)
committerZoran Jovanovic <zoran.jovanovic@sonymobile.com>
Mon, 16 Dec 2013 11:42:36 +0000 (12:42 +0100)
In commit 08d5b8f, the ResTable_config::CONFIG_* enum was incorrectly
changed to assign the same value to both CONFIG_MCC and CONFIG_MNC:
    - CONFIG_MCC = 0x0001,
    - CONFIG_MNC = 0x0002,
    + CONFIG_MCC = ACONFIGURATION_MCC,
    + CONFIG_MNC = ACONFIGURATION_MCC,

This commit assigns CONFIG_MNC the value ACONFIGURATION_MNC, as
intended.

Change-Id: I3b8799914a55debdb3ff30a82ada7ad990c49970

include/androidfw/ResourceTypes.h

index 97afa59..5151b06 100644 (file)
@@ -1020,7 +1020,7 @@ struct ResTable_config
     // attrs_manifest.xml.
     enum {
         CONFIG_MCC = ACONFIGURATION_MCC,
-        CONFIG_MNC = ACONFIGURATION_MCC,
+        CONFIG_MNC = ACONFIGURATION_MNC,
         CONFIG_LOCALE = ACONFIGURATION_LOCALE,
         CONFIG_TOUCHSCREEN = ACONFIGURATION_TOUCHSCREEN,
         CONFIG_KEYBOARD = ACONFIGURATION_KEYBOARD,