Merge branch 'gingerbread' into gingerbread-release (f0a86c19) · Commits · e / os / android_frameworks_base

api/current.xml

+1971 −1

File changed.

Preview size limit exceeded, changes collapsed.

cmds/installd/commands.c

+154 −0

Original line number	Diff line number	Diff line
		@@ -936,3 +936,157 @@ int movefiles()
		done:
		return 0;
		}

		int linklib(const char* dataDir, const char* asecLibDir)
		{
		char libdir[PKG_PATH_MAX];
		struct stat s, libStat;
		int rc = 0;

		const size_t libdirLen = strlen(dataDir) + strlen(PKG_LIB_POSTFIX);
		if (libdirLen >= PKG_PATH_MAX) {
		LOGE("library dir len too large");
		rc = -1;
		goto out;
		}

		if (snprintf(libdir, sizeof(libdir), "%s%s", dataDir, PKG_LIB_POSTFIX) != (ssize_t)libdirLen) {
		LOGE("library dir not written successfully: %s\n", strerror(errno));
		rc = -1;
		goto out;
		}

		if (stat(dataDir, &s) < 0) return -1;

		if (chown(dataDir, 0, 0) < 0) {
		LOGE("failed to chown '%s': %s\n", dataDir, strerror(errno));
		return -1;
		}

		if (chmod(dataDir, 0700) < 0) {
		LOGE("failed to chmod '%s': %s\n", dataDir, strerror(errno));
		rc = -1;
		goto out;
		}

		if (lstat(libdir, &libStat) < 0) {
		LOGE("couldn't stat lib dir: %s\n", strerror(errno));
		rc = -1;
		goto out;
		}

		if (S_ISDIR(libStat.st_mode)) {
		if (delete_dir_contents(libdir, 1, 0) < 0) {
		rc = -1;
		goto out;
		}
		} else if (S_ISLNK(libStat.st_mode)) {
		if (unlink(libdir) < 0) {
		rc = -1;
		goto out;
		}
		}

		if (symlink(asecLibDir, libdir) < 0) {
		LOGE("couldn't symlink directory '%s' -> '%s': %s\n", libdir, asecLibDir, strerror(errno));
		rc = -errno;
		goto out;
		}

		if (lchown(libdir, AID_SYSTEM, AID_SYSTEM) < 0) {
		LOGE("cannot chown dir '%s': %s\n", libdir, strerror(errno));
		unlink(libdir);
		rc = -errno;
		goto out;
		}

		out:
		if (chmod(dataDir, s.st_mode) < 0) {
		LOGE("failed to chmod '%s': %s\n", dataDir, strerror(errno));
		return -errno;
		}

		if (chown(dataDir, s.st_uid, s.st_gid) < 0) {
		LOGE("failed to chown '%s' : %s\n", dataDir, strerror(errno));
		return -errno;
		}

		return rc;
		}

		int unlinklib(const char* dataDir)
		{
		char libdir[PKG_PATH_MAX];
		struct stat s, libStat;
		int rc = 0;

		const size_t libdirLen = strlen(dataDir) + strlen(PKG_LIB_POSTFIX);
		if (libdirLen >= PKG_PATH_MAX) {
		return -1;
		}

		if (snprintf(libdir, sizeof(libdir), "%s%s", dataDir, PKG_LIB_POSTFIX) != (ssize_t)libdirLen) {
		LOGE("library dir not written successfully: %s\n", strerror(errno));
		return -1;
		}

		if (stat(dataDir, &s) < 0) {
		LOGE("couldn't state data dir");
		return -1;
		}

		if (chown(dataDir, 0, 0) < 0) {
		LOGE("failed to chown '%s': %s\n", dataDir, strerror(errno));
		return -1;
		}

		if (chmod(dataDir, 0700) < 0) {
		LOGE("failed to chmod '%s': %s\n", dataDir, strerror(errno));
		rc = -1;
		goto out;
		}

		if (lstat(libdir, &libStat) < 0) {
		LOGE("couldn't stat lib dir: %s\n", strerror(errno));
		rc = -1;
		goto out;
		}

		if (S_ISDIR(libStat.st_mode)) {
		if (delete_dir_contents(libdir, 1, 0) < 0) {
		rc = -1;
		goto out;
		}
		} else if (S_ISLNK(libStat.st_mode)) {
		if (unlink(libdir) < 0) {
		rc = -1;
		goto out;
		}
		}

		if (mkdir(libdir, 0755) < 0) {
		LOGE("cannot create dir '%s': %s\n", libdir, strerror(errno));
		rc = -errno;
		goto out;
		}

		if (chown(libdir, AID_SYSTEM, AID_SYSTEM) < 0) {
		LOGE("cannot chown dir '%s': %s\n", libdir, strerror(errno));
		unlink(libdir);
		rc = -errno;
		goto out;
		}

		out:
		if (chmod(dataDir, s.st_mode) < 0) {
		LOGE("failed to chmod '%s': %s\n", dataDir, strerror(errno));
		return -1;
		}

		if (chown(dataDir, s.st_uid, s.st_gid) < 0) {
		LOGE("failed to chown '%s' : %s\n", dataDir, strerror(errno));
		return -1;
		}

		return rc;
		}

cmds/installd/installd.c

+12 −0

Original line number	Diff line number	Diff line
		@@ -101,6 +101,16 @@ static int do_movefiles(char **arg, char reply[REPLY_MAX])
		return movefiles();
		}

		static int do_linklib(char **arg, char reply[REPLY_MAX])
		{
		return linklib(arg[0], arg[1]);
		}

		static int do_unlinklib(char **arg, char reply[REPLY_MAX])
		{
		return unlinklib(arg[0]);
		}

		struct cmdinfo {
		const char *name;
		unsigned numargs;
		@@ -121,6 +131,8 @@ struct cmdinfo cmds[] = {
		{ "getsize", 4, do_get_size },
		{ "rmuserdata", 2, do_rm_user_data },
		{ "movefiles", 0, do_movefiles },
		{ "linklib", 2, do_linklib },
		{ "unlinklib", 1, do_unlinklib },
		};

		static int readx(int s, void *_buf, int count)

cmds/installd/installd.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -111,3 +111,5 @@ int get_size(const char pkgname, const char apkpath, const char *fwdlock_apkpa
		int free_cache(int64_t free_size);
		int dexopt(const char *apk_path, uid_t uid, int is_public);
		int movefiles();
		int linklib(const char* target, const char* source);
		int unlinklib(const char* libPath);

core/java/android/app/ContextImpl.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -2775,7 +2775,7 @@ class ContextImpl extends Context {
		synchronized (this) {
		if (mDiskWritesInFlight > 0) {
		// If we know we caused it, it's not unexpected.
		Log.d(TAG, "disk write in flight, not unexpected.");
		if (DEBUG) Log.d(TAG, "disk write in flight, not unexpected.");
		return false;
		}
		}