From 3a1be746c09f767c417fbd261307fd768a1fd2a1 Mon Sep 17 00:00:00 2001 From: Peiyong Lin Date: Wed, 2 Jan 2019 17:46:55 -0800 Subject: [GUP] Hard code the name of the whitelist file. Allowing customized whitelist filename could result in inconsistency and fragmentations in toolings. BUG: 120870520 Test: Build, flash and boot Change-Id: Ibe9337b358b6a67600048f1661d73574d7bea607 --- core/java/android/os/GraphicsEnvironment.java | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/java/android/os/GraphicsEnvironment.java b/core/java/android/os/GraphicsEnvironment.java index f3810bddf9c7..fdadfbe0ba78 100644 --- a/core/java/android/os/GraphicsEnvironment.java +++ b/core/java/android/os/GraphicsEnvironment.java @@ -58,7 +58,7 @@ public class GraphicsEnvironment { private static final boolean DEBUG = false; private static final String TAG = "GraphicsEnvironment"; 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_TEMP_RULES = "debug.angle.rules"; 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, 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 { Context driverContext = context.createPackageContext(driverPackageName, Context.CONTEXT_RESTRICTED); AssetManager assets = driverContext.getAssets(); - InputStream stream = assets.open(whitelistName); + InputStream stream = assets.open(GUP_WHITELIST_FILENAME); BufferedReader reader = new BufferedReader(new InputStreamReader(stream)); for (String packageName; (packageName = reader.readLine()) != null; ) { if (packageName.equals(applicationPackageName)) { -- cgit v1.2.3-59-g8ed1b