Fix idmap calls when a subdir is present. am: 56b9987ed7 (404eb9ce) · Commits · e / os / android_frameworks_base

core/jni/android_util_AssetManager.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -164,7 +164,7 @@ static void verifySystemIdmaps()
		}

		// Generic idmap parameters
		const char* argv[7];
		const char* argv[8];
		int argc = 0;
		struct stat st;

		@@ -192,7 +192,7 @@ static void verifySystemIdmaps()
		// Finally, invoke idmap (if any overlay directory exists)
		if (argc > 5) {
		execv(AssetManager::IDMAP_BIN, (char* const*)argv);
		ALOGE("failed to execl for idmap: %s", strerror(errno));
		ALOGE("failed to execv for idmap: %s", strerror(errno));
		exit(1); // should never get here
		} else {
		exit(0);