Merge "libandroidfw: add FALLTHROUGH_INTENDED to silence warnings" (8ca32736) · Commits · e / os / android_frameworks_base

libs/androidfw/Android.bp

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -59,8 +59,6 @@ cc_library {
	"ZipFileRO.cpp",		"ZipFileRO.cpp",
	"ZipUtils.cpp",		"ZipUtils.cpp",
	],		],
	// Allow implicit fallthroughs in Locale.cpp and ResourceTypes.cpp until they are fixed.
	cflags: ["-Wno-implicit-fallthrough"],
	export_include_dirs: ["include"],		export_include_dirs: ["include"],
	export_shared_lib_headers: ["libz"],		export_shared_lib_headers: ["libz"],
	target: {		target: {

libs/androidfw/Locale.cpp

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -14,6 +14,7 @@
	* limitations under the License.		* limitations under the License.
	*/		*/

			#include "android-base/macros.h"
	#include "androidfw/Locale.h"		#include "androidfw/Locale.h"
	#include "androidfw/Util.h"		#include "androidfw/Util.h"

	@@ -162,6 +163,7 @@ bool LocaleValue::InitFromBcp47TagImpl(const StringPiece& bcp47tag, const char s
	set_script(subtags[1].c_str());		set_script(subtags[1].c_str());
	break;		break;
	}		}
			FALLTHROUGH_INTENDED;
	case 5:		case 5:
	case 6:		case 6:
	case 7:		case 7:

libs/androidfw/ResourceTypes.cpp

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -29,6 +29,7 @@
	#include <memory>		#include <memory>
	#include <type_traits>		#include <type_traits>

			#include <android-base/macros.h>
	#include <androidfw/ByteBucketArray.h>		#include <androidfw/ByteBucketArray.h>
	#include <androidfw/ResourceTypes.h>		#include <androidfw/ResourceTypes.h>
	#include <androidfw/TypeWrappers.h>		#include <androidfw/TypeWrappers.h>
	@@ -3073,6 +3074,7 @@ struct LocaleParserState {
	}		}
	break;		break;
	}		}
			FALLTHROUGH_INTENDED;
	case 5:		case 5:
	case 6:		case 6:
	case 7:		case 7:
	@@ -7002,7 +7004,7 @@ status_t DynamicRefTable::lookupResourceValue(Res_value* value) const {
	switch (value->dataType) {		switch (value->dataType) {
	case Res_value::TYPE_ATTRIBUTE:		case Res_value::TYPE_ATTRIBUTE:
	resolvedType = Res_value::TYPE_ATTRIBUTE;		resolvedType = Res_value::TYPE_ATTRIBUTE;
	// fallthrough		FALLTHROUGH_INTENDED;
	case Res_value::TYPE_REFERENCE:		case Res_value::TYPE_REFERENCE:
	// Only resolve non-dynamic references and attributes if the package is loaded as a		// Only resolve non-dynamic references and attributes if the package is loaded as a
	// library or if a shared library is attempting to retrieve its own resource		// library or if a shared library is attempting to retrieve its own resource
	@@ -7015,7 +7017,7 @@ status_t DynamicRefTable::lookupResourceValue(Res_value* value) const {
	break;		break;
	case Res_value::TYPE_DYNAMIC_ATTRIBUTE:		case Res_value::TYPE_DYNAMIC_ATTRIBUTE:
	resolvedType = Res_value::TYPE_ATTRIBUTE;		resolvedType = Res_value::TYPE_ATTRIBUTE;
	// fallthrough		FALLTHROUGH_INTENDED;
	case Res_value::TYPE_DYNAMIC_REFERENCE:		case Res_value::TYPE_DYNAMIC_REFERENCE:
	break;		break;
	default:		default: