Merge "resolve merge conflicts of a2c1196 to master - continued" (ac492f2c) · Commits · e / os / android_frameworks_base

core/jni/android_util_MemoryIntArray.cpp

+0 −6

Original line number	Diff line number	Diff line
		@@ -180,7 +180,6 @@ static jint android_util_MemoryIntArray_size(JNIEnv* env, jobject clazz, jint fd
		return -1;
		}

		<<<<<<< HEAD
		if (!ashmem_valid(fd)) {
		jniThrowIOException(env, errno);
		return -1;
		@@ -188,11 +187,6 @@ static jint android_util_MemoryIntArray_size(JNIEnv* env, jobject clazz, jint fd

		int ashmemSize = ashmem_get_size_region(fd);
		if (ashmemSize < 0) {
		=======
		int ashmemSize = ashmem_get_size_region(fd);
		if (ashmemSize < 0) {
		// Some other error, throw exception
		>>>>>>> a2c1196dc25bfefe094c5d1757f8e2fd22500222
		jniThrowIOException(env, errno);
		return -1;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -282,7 +282,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {

		private static final long TIME_CACHE_MAX_AGE = DAY_IN_MILLIS;

		Mem private static final int MSG_RULES_CHANGED = 1;
		private static final int MSG_RULES_CHANGED = 1;
		private static final int MSG_METERED_IFACES_CHANGED = 2;
		private static final int MSG_LIMIT_REACHED = 5;
		private static final int MSG_RESTRICT_BACKGROUND_CHANGED = 6;