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

[GUP] Hard code the name of the whitelist file.

Browse Source 
Allowing customized whitelist filename could result in inconsistency and
fragmentations in toolings.

BUG: 120870520
Test: Build, flash and boot
Change-Id: Ibe9337b358b6a67600048f1661d73574d7bea607
This commit is contained in:
Peiyong Lin
2019-01-02 17:46:55 -08:00
parent 252e8d0447
commit 3a1be746c0
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,7 @@ public class GraphicsEnvironment {
private static final boolean DEBUG = false; private static final boolean DEBUG = false;
private static final String TAG = "GraphicsEnvironment"; private static final String TAG = "GraphicsEnvironment";
private static final String PROPERTY_GFX_DRIVER = "ro.gfx.driver.0"; private static final String PROPERTY_GFX_DRIVER = "ro.gfx.driver.0";
private static final String PROPERTY_GFX_DRIVER_WHITELIST = "ro.gfx.driver.whitelist.0"; private static final String GUP_WHITELIST_FILENAME = "whitelist.txt";
private static final String ANGLE_RULES_FILE = "a4a_rules.json"; private static final String ANGLE_RULES_FILE = "a4a_rules.json";
private static final String ANGLE_TEMP_RULES = "debug.angle.rules"; private static final String ANGLE_TEMP_RULES = "debug.angle.rules";
private static final String ACTION_ANGLE_FOR_ANDROID = "android.app.action.ANGLE_FOR_ANDROID"; private static final String ACTION_ANGLE_FOR_ANDROID = "android.app.action.ANGLE_FOR_ANDROID";
@@ -567,22 +567,11 @@ public class GraphicsEnvironment {
private static boolean onWhitelist(Context context, String driverPackageName, private static boolean onWhitelist(Context context, String driverPackageName,
String applicationPackageName) { String applicationPackageName) {
String whitelistName = SystemProperties.get(PROPERTY_GFX_DRIVER_WHITELIST);
// Empty whitelist implies no updatable graphics driver. Typically, the pre-installed
// updatable graphics driver is supposed to be a place holder and contains no graphics
// driver and whitelist.
if (whitelistName == null || whitelistName.isEmpty()) {
if (DEBUG) {
Log.w(TAG, "No whitelist found.");
}
return false;
}
try { try {
Context driverContext = context.createPackageContext(driverPackageName, Context driverContext = context.createPackageContext(driverPackageName,
Context.CONTEXT_RESTRICTED); Context.CONTEXT_RESTRICTED);
AssetManager assets = driverContext.getAssets(); AssetManager assets = driverContext.getAssets();
InputStream stream = assets.open(whitelistName); InputStream stream = assets.open(GUP_WHITELIST_FILENAME);
BufferedReader reader = new BufferedReader(new InputStreamReader(stream)); BufferedReader reader = new BufferedReader(new InputStreamReader(stream));
for (String packageName; (packageName = reader.readLine()) != null; ) { for (String packageName; (packageName = reader.readLine()) != null; ) {
if (packageName.equals(applicationPackageName)) { if (packageName.equals(applicationPackageName)) {