From 4482e7cb67c516453a67d73e98a085a5f3576953 Mon Sep 17 00:00:00 2001 From: =?utf8?q?M=C3=A5rten=20Kongstad?= Date: Tue, 26 Nov 2013 14:48:22 +0100 Subject: [PATCH] Fix ResTable_config::CONFIG_* typo (MCC vs MNC) 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/androidfw/ResourceTypes.h b/include/androidfw/ResourceTypes.h index 97afa59bd7cd..5151b06aec5b 100644 --- a/include/androidfw/ResourceTypes.h +++ b/include/androidfw/ResourceTypes.h @@ -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, -- 2.11.0