Merge "Use correct actor string for OverlayableInfo" (8fd19821) · Commits · e / os / android_frameworks_base

core/jni/android_content_res_ApkAssets.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -221,7 +221,7 @@ static jobject NativeGetOverlayableInfo(JNIEnv* env, jclass /clazz/, jlong ptr
		return nullptr;
		}

		jstring actor_string = env->NewStringUTF(actor->first.c_str());
		jstring actor_string = env->NewStringUTF(actor->second.c_str());
		if (env->ExceptionCheck() \|\| actor_string == nullptr) {
		jniThrowException(env, "java/io/IOException", "Error reading overlayable from APK");
		return 0;

+4 −4

Original line number	Diff line number	Diff line
		@@ -53,10 +53,6 @@ public class OverlayActorEnforcer {
		*/
		static Pair<String, ActorState> getPackageNameForActor(String actorUriString,
		Map<String, Map<String, String>> namedActors) {
		if (namedActors.isEmpty()) {
		return Pair.create(null, ActorState.NO_NAMED_ACTORS);
		}

		Uri actorUri = Uri.parse(actorUriString);

		String actorScheme = actorUri.getScheme();
		@@ -65,6 +61,10 @@ public class OverlayActorEnforcer {
		return Pair.create(null, ActorState.INVALID_OVERLAYABLE_ACTOR_NAME);
		}

		if (namedActors.isEmpty()) {
		return Pair.create(null, ActorState.NO_NAMED_ACTORS);
		}

		String actorNamespace = actorUri.getAuthority();
		Map<String, String> namespace = namedActors.get(actorNamespace);
		if (namespace == null) {

+14 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,20 @@
		"include-filter": "com.android.server.om."
		}
		]
		},
		{
		"name": "OverlayDeviceTests"
		},
		{
		"name": "OverlayHostTests"
		},
		{
		"name": "CtsAppSecurityHostTestCases",
		"options": [
		{
		"include-filter": "android.appsecurity.cts.OverlayHostTest"
		}
		]
		}
		]
		}