Allow injection jar to be located in product folder (a187041f) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/TelephonyComponentFactory.java

+36 −18

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@
	package com.android.internal.telephony;		package com.android.internal.telephony;

	import android.annotation.NonNull;		import android.annotation.NonNull;
			import android.annotation.Nullable;
	import android.content.Context;		import android.content.Context;
	import android.content.res.XmlResourceParser;		import android.content.res.XmlResourceParser;
	import android.database.Cursor;		import android.database.Cursor;
	@@ -49,10 +50,13 @@ import dalvik.system.PathClassLoader;
	import org.xmlpull.v1.XmlPullParser;		import org.xmlpull.v1.XmlPullParser;
	import org.xmlpull.v1.XmlPullParserException;		import org.xmlpull.v1.XmlPullParserException;

			import java.io.File;
	import java.io.IOException;		import java.io.IOException;
			import java.util.Arrays;
	import java.util.HashSet;		import java.util.HashSet;
	import java.util.Set;		import java.util.Set;
	import java.util.function.Consumer;		import java.util.function.Consumer;
			import java.util.stream.Collectors;

	/**		/**
	* This class has one-line methods to instantiate objects only. The purpose is to make code		* This class has one-line methods to instantiate objects only. The purpose is to make code
	@@ -74,6 +78,7 @@ public class TelephonyComponentFactory {
	private static final String TAG_COMPONENTS = "components";		private static final String TAG_COMPONENTS = "components";
	private static final String TAG_COMPONENT = "component";		private static final String TAG_COMPONENT = "component";
	private static final String SYSTEM = "/system/";		private static final String SYSTEM = "/system/";
			private static final String PRODUCT = "/product/";

	private final Set<String> mComponentNames = new HashSet<>();		private final Set<String> mComponentNames = new HashSet<>();
	private TelephonyComponentFactory mInjectedInstance;		private TelephonyComponentFactory mInjectedInstance;
	@@ -81,29 +86,41 @@ public class TelephonyComponentFactory {
	private String mJarPath;		private String mJarPath;

	/**		/**
	* @return if jar path is correctly configured to inject.		* @return paths correctly configured to inject.
	* 1) PackageName and JarPath mustn't be empty.		* 1) PackageName and JarPath mustn't be empty.
	* 2) JarPath is restricted under /system only		* 2) JarPath is restricted under /system or /product only.
			* 3) JarPath is on a READ-ONLY partition.
	*/		*/
	private boolean isConfigValid() {		private @Nullable String getValidatedPaths() {
	return !TextUtils.isEmpty(mPackageName) && !TextUtils.isEmpty(mJarPath)		if (TextUtils.isEmpty(mPackageName) \|\| TextUtils.isEmpty(mJarPath)) {
	&& mJarPath.startsWith(SYSTEM);		return null;
			}
			// filter out invalid paths
			return Arrays.stream(mJarPath.split(File.pathSeparator))
			.filter(s -> (s.startsWith(SYSTEM) \|\| s.startsWith(PRODUCT)))
			.filter(s -> {
			try {
			// This will also throw an error if the target doesn't exist.
			StructStatVfs vfs = Os.statvfs(s);
			return (vfs.f_flag & OsConstants.ST_RDONLY) != 0;
			} catch (ErrnoException e) {
			Rlog.w(TAG, "Injection jar is not protected , path: " + s
			+ e.getMessage());
			return false;
			}
			}).distinct()
			.collect(Collectors.joining(File.pathSeparator));
	}		}

	private void makeInjectedInstance() {		private void makeInjectedInstance() {
	if (isConfigValid()) {		String validatedPaths = getValidatedPaths();
			Rlog.d(TAG, "validated paths: " + validatedPaths);
			if (!TextUtils.isEmpty(validatedPaths)) {
	try {		try {
	StructStatVfs vfs = Os.statvfs(mJarPath);		PathClassLoader classLoader = new PathClassLoader(validatedPaths,
	if ((vfs.f_flag & OsConstants.ST_RDONLY) != 0) {
	PathClassLoader classLoader = new PathClassLoader(mJarPath,
	ClassLoader.getSystemClassLoader());		ClassLoader.getSystemClassLoader());
	Class<?> cls = classLoader.loadClass(mPackageName);		Class<?> cls = classLoader.loadClass(mPackageName);
	mInjectedInstance = (TelephonyComponentFactory) cls.newInstance();		mInjectedInstance = (TelephonyComponentFactory) cls.newInstance();
	} else {
	Rlog.w(TAG, "Injection jar is not protected");
	}
	} catch (ErrnoException e) {
	Rlog.e(TAG, "failed file mount, " + e.getMessage());
	} catch (ClassNotFoundException e) {		} catch (ClassNotFoundException e) {
	Rlog.e(TAG, "failed: " + e.getMessage());		Rlog.e(TAG, "failed: " + e.getMessage());
	} catch (IllegalAccessException \| InstantiationException e) {		} catch (IllegalAccessException \| InstantiationException e) {
	@@ -230,7 +247,8 @@ public class TelephonyComponentFactory {
	mInjectedComponents = new InjectedComponents();		mInjectedComponents = new InjectedComponents();
	mInjectedComponents.parseXml(parser);		mInjectedComponents.parseXml(parser);
	mInjectedComponents.makeInjectedInstance();		mInjectedComponents.makeInjectedInstance();
	Rlog.d(TAG, "Total components injected: " + (mInjectedComponents.isConfigValid()		boolean injectSuccessful = !TextUtils.isEmpty(mInjectedComponents.getValidatedPaths());
			Rlog.d(TAG, "Total components injected: " + (injectSuccessful
	? mInjectedComponents.mComponentNames.size() : 0));		? mInjectedComponents.mComponentNames.size() : 0));
	}		}
	}		}