Merge "Do not return an error if the dalvik-cache odex is missing" into oc-dev (5249e613) · Commits · e / os / android_frameworks_native-old

cmds/installd/InstalldNativeService.cpp

+6 −3

Original line number	Diff line number	Diff line
		@@ -1100,11 +1100,14 @@ binder::Status InstalldNativeService::rmdex(const std::string& codePath,

		ALOGV("unlink %s\n", dex_path);
		if (unlink(dex_path) < 0) {
		// It's ok if we don't have a dalvik cache path. Report error only when the path exists
		// but could not be unlinked.
		if (errno != ENOENT) {
		return error(StringPrintf("Failed to unlink %s", dex_path));
		} else {
		return ok();
		}
		}
		return ok();
		}

		struct stats {
		int64_t codeSize;

+14 −4

Original line number	Diff line number	Diff line
		@@ -54,10 +54,12 @@ bool calculate_odex_file_path(char path[PKG_PATH_MAX] ATTRIBUTE_UNUSED,
		return false;
		}

		bool create_cache_path(char path[PKG_PATH_MAX] ATTRIBUTE_UNUSED,
		const char *src ATTRIBUTE_UNUSED,
		const char *instruction_set ATTRIBUTE_UNUSED) {
		return false;
		bool create_cache_path(char path[PKG_PATH_MAX],
		const char *src,
		const char *instruction_set) {
		// Not really a valid path but it's good enough for testing.
		sprintf(path,"/data/dalvik-cache/%s/%s", instruction_set, src);
		return true;
		}

		static void mkdir(const char* path, uid_t owner, gid_t group, mode_t mode) {
		@@ -151,5 +153,13 @@ TEST_F(ServiceTest, FixupAppData_Moved) {
		EXPECT_EQ(10000, stat_gid("com.example/bar/file"));
		}

		TEST_F(ServiceTest, RmDexNoDalvikCache) {
		LOG(INFO) << "RmDexNoDalvikCache";

		// Try to remove a non existing dalvik cache dex. The call should be
		// successful because there's nothing to remove.
		EXPECT_TRUE(service->rmdex("com.example", "arm").isOk());
		}

		} // namespace installd
		} // namespace android