Commit a60dc9e5 authored Feb 26, 2019 by Yabin Cui

Check if idmap2 is accessible before executing it.

When wrap.sh is used in a debuggable app, AssetManager tries to execute
idmap2 in the app's security context, not in zygote context. And idmap2
isn't allowed to execute in the app's context, thus making an abort.

The abort makes Android studio can't debug the app. To avoid the abort,
check if idmap2 is accessible before executing it.

Bug: 124109020
Test: test manually that android studio can debug the app with this
Test: change.

Change-Id: I82d772358b2266433f82319896a4ca662cc3c273

parent 89b58a49

core/jni/android_util_AssetManager.cpp

+5 −0

Original line number	Diff line number	Diff line
		@@ -238,6 +238,11 @@ static jobjectArray NativeCreateIdmapsForStaticOverlaysTargetingAndroid(JNIEnv*
		return env->NewObjectArray(0, g_stringClass, nullptr);
		}

		if (access("/system/bin/idmap2", X_OK) == -1) {
		PLOG(WARNING) << "unable to execute idmap2";
		return nullptr;
		}

		std::vector<std::string> argv{"/system/bin/idmap2",
		"scan",
		"--recursive",