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

Merge "Revert "GraphicsEnvironment: Determine storage limit for EGL blo...""

Browse Source
This commit is contained in:
Rico Wind
2022-12-22 09:52:36 +00:00
committed by Android (Google) Code Review
parent c0c490d7f3 6de6980bed
commit 45447454f2
2 changed files with 0 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
core/java/android/os/GraphicsEnvironment.java
View File

@@ -27,7 +27,6 @@ import android.content.pm.IPackageManager;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.os.storage.StorageManager;
import android.provider.Settings;
import android.text.TextUtils;
import android.util.Log;
@@ -211,25 +210,6 @@ public class GraphicsEnvironment {
mGameManager.notifyGraphicsEnvironmentSetup();
}
Trace.traceEnd(Trace.TRACE_TAG_GRAPHICS);
Trace.traceBegin(Trace.TRACE_TAG_GRAPHICS, "setBlobCacheQuotaBytes");
new Thread(() -> {
try {
// Perform this lookup on a thread since getCacheQuotaBytes can be slow
// and we don't need the answer right away. The result is consumed in
// checkMultifileCacheSize in egl_cache_multifile.cpp. If the value isn't
// ready, a default is used. The results will likely be ready by the time
// an app starts using the blobcache.
final StorageManager sm = context.getSystemService(StorageManager.class);
final long cacheBytes = sm.getCacheQuotaBytes(appInfoWithMetaData.storageUuid);
final long scaledCacheBytes =
getScaledCacheQuotaBytes(packageName, cacheBytes, appInfoWithMetaData);
setBlobCacheQuotaBytes(scaledCacheBytes);
} catch (IOException e) {
Log.w(TAG, "Failed to look up getCacheQuotaBytes for package: " + packageName);
}
}).start();
Trace.traceEnd(Trace.TRACE_TAG_GRAPHICS);
}
/**
@@ -468,31 +448,6 @@ public class GraphicsEnvironment {
return ai;
}
private static long getScaledCacheQuotaBytes(String packageName, long cacheBytes,
ApplicationInfo appInfoWithMetaData) {
if (cacheBytes <= 0) {
Log.v(TAG, "cacheBytes are zero for " + packageName);
return 0;
}
// Limit the amount of temp storage available to OpenGL drivers to a percentage
// based on the app type. Games will typically need more space than applications,
// so give them 50%, 25% for everything else.
long scaledCacheBytes = 0;
if (((appInfoWithMetaData.flags & ApplicationInfo.FLAG_IS_GAME) != 0)
|| appInfoWithMetaData.category == ApplicationInfo.CATEGORY_GAME) {
scaledCacheBytes = cacheBytes / 2;
Log.v(TAG, "Treating " + packageName
+ " as a game, setting shader cache quota to 50% ("
+ scaledCacheBytes + ")");
} else {
scaledCacheBytes = cacheBytes / 4;
Log.v(TAG, "Treating " + packageName
+ " as an application, setting shader cache quota to 25% ("
+ scaledCacheBytes + ")");
}
return scaledCacheBytes;
}
/**
* Return the appropriate "default" driver, unless overridden by isAngleEnabledByGameMode().
*/
@@ -1041,7 +996,4 @@ public class GraphicsEnvironment {
* Then the app process is allowed to send stats to GpuStats module.
*/
public static native void hintActivityLaunch();
private static native void setBlobCacheQuotaBytes(long cacheBytes);
}

5
core/jni/android_os_GraphicsEnvironment.cpp
View File

@@ -122,10 +122,6 @@ void hintActivityLaunch_native(JNIEnv* env, jobject clazz) {
android::GraphicsEnv::getInstance().hintActivityLaunch();
}
void setBlobCacheQuotaBytes_native(JNIEnv* env, jobject clazz, jlong cacheBytes) {
android::GraphicsEnv::getInstance().setBlobCacheQuotaBytes(cacheBytes);
}
const JNINativeMethod g_methods[] = {
{"isDebuggable", "()Z", reinterpret_cast<void*>(isDebuggable_native)},
{"setDriverPathAndSphalLibraries", "(Ljava/lang/String;Ljava/lang/String;)V",
@@ -147,7 +143,6 @@ const JNINativeMethod g_methods[] = {
{"setDebugLayersGLES", "(Ljava/lang/String;)V",
reinterpret_cast<void*>(setDebugLayersGLES_native)},
{"hintActivityLaunch", "()V", reinterpret_cast<void*>(hintActivityLaunch_native)},
{"setBlobCacheQuotaBytes", "(J)V", reinterpret_cast<void*>(setBlobCacheQuotaBytes_native)},
};
const char* const kGraphicsEnvironmentName = "android/os/GraphicsEnvironment";