Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove Context requirement from updatable" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-19 04:02:29 +00:00
committed by Android (Google) Code Review
parent f5d216cc7c 72a86922d4
commit ac16fb5d41
1 changed files with 44 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
media/java/android/media/update/ApiLoader.java
View File

@@ -16,49 +16,73 @@
package android.media.update; package android.media.update;
import android.annotation.NonNull; import android.app.ActivityManager;
import android.content.res.Resources; import android.app.AppGlobals;
import android.content.Context; import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.os.Build; import android.os.Build;
import android.os.RemoteException;
import android.os.UserHandle;
import com.android.internal.annotations.GuardedBy;
import dalvik.system.PathClassLoader;
import java.io.File;
/** /**
* @hide * @hide
*/ */
public final class ApiLoader { public final class ApiLoader {
private static Object sMediaLibrary; @GuardedBy("this")
private static StaticProvider sMediaUpdatable;
private static final String UPDATE_PACKAGE = "com.android.media.update"; private static final String UPDATE_PACKAGE = "com.android.media.update";
private static final String UPDATE_CLASS = "com.android.media.update.ApiFactory"; private static final String UPDATE_CLASS = "com.android.media.update.ApiFactory";
private static final String UPDATE_METHOD = "initialize"; private static final String UPDATE_METHOD = "initialize";
private static final boolean REGISTER_UPDATE_DEPENDENCY = true;
private ApiLoader() { } private ApiLoader() { }
public static StaticProvider getProvider(@NonNull Context context) { @Deprecated
if (context == null) { public static StaticProvider getProvider(Context context) {
throw new IllegalArgumentException("context shouldn't be null"); return getProvider();
} }
public static StaticProvider getProvider() {
if (sMediaUpdatable != null) return sMediaUpdatable;
try { try {
return (StaticProvider) getMediaLibraryImpl(context); return getMediaUpdatable();
} catch (PackageManager.NameNotFoundException | ReflectiveOperationException e) { } catch (RemoteException e) {
throw e.rethrowFromSystemServer();
} catch (NameNotFoundException | ReflectiveOperationException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }
// TODO This method may do I/O; Ensure it does not violate (emit warnings in) strict mode. // TODO This method may do I/O; Ensure it does not violate (emit warnings in) strict mode.
private static synchronized Object getMediaLibraryImpl(Context context) private static synchronized StaticProvider getMediaUpdatable()
throws PackageManager.NameNotFoundException, ReflectiveOperationException { throws NameNotFoundException, ReflectiveOperationException, RemoteException {
if (sMediaLibrary != null) return sMediaLibrary; if (sMediaUpdatable != null) return sMediaUpdatable;
// TODO Figure out when to use which package (query media update service) // TODO Figure out when to use which package (query media update service)
int flags = Build.IS_DEBUGGABLE ? 0 : PackageManager.MATCH_FACTORY_ONLY; int flags = Build.IS_DEBUGGABLE ? 0 : PackageManager.MATCH_FACTORY_ONLY;
Context libContext = context.createApplicationContext( flags |= PackageManager.GET_SHARED_LIBRARY_FILES;
context.getPackageManager().getPackageInfo(UPDATE_PACKAGE, flags).applicationInfo, ApplicationInfo ai = AppGlobals.getPackageManager().getApplicationInfo(
Context.CONTEXT_INCLUDE_CODE | Context.CONTEXT_IGNORE_SECURITY); UPDATE_PACKAGE, flags, UserHandle.myUserId());
sMediaLibrary = libContext.getClassLoader()
.loadClass(UPDATE_CLASS) if (REGISTER_UPDATE_DEPENDENCY) {
.getMethod(UPDATE_METHOD, Resources.class, Resources.Theme.class) // Register a dependency to the updatable in order to be killed during updates
.invoke(null, libContext.getResources(), libContext.getTheme()); ActivityManager.getService().addPackageDependency(ai.packageName);
return sMediaLibrary; }
PathClassLoader classLoader = new PathClassLoader(ai.sourceDir,
ai.nativeLibraryDir + File.pathSeparator + System.getProperty("java.library.path"),
ClassLoader.getSystemClassLoader().getParent());
return sMediaUpdatable = (StaticProvider) classLoader.loadClass(UPDATE_CLASS)
.getMethod(UPDATE_METHOD, ApplicationInfo.class).invoke(null, ai);
} }
} }