diff options
| -rw-r--r-- | core/java/android/os/GraphicsEnvironment.java | 49 |
1 files changed, 19 insertions, 30 deletions
diff --git a/core/java/android/os/GraphicsEnvironment.java b/core/java/android/os/GraphicsEnvironment.java index 94971b8654ee..92be4c0c7dc3 100644 --- a/core/java/android/os/GraphicsEnvironment.java +++ b/core/java/android/os/GraphicsEnvironment.java @@ -636,44 +636,33 @@ public class GraphicsEnvironment { } /** - * Determine if ANGLE will be used and setup the environment - */ - private boolean setupAndUseAngle(Context context, String packageName) { - // Need to make sure we are evaluating ANGLE usage for the correct circumstances - if (!setupAngle(context, null, context.getPackageManager(), packageName)) { - Log.v(TAG, "Package '" + packageName + "' should not use ANGLE"); - return false; - } - - final boolean useAngle = getShouldUseAngle(packageName); - Log.v(TAG, "Package '" + packageName + "' should use ANGLE = '" + useAngle + "'"); - - return useAngle; - } - - /** * Show the ANGLE in Use Dialog Box * @param context */ public void showAngleInUseDialogBox(Context context) { + if (!shouldShowAngleInUseDialogBox(context)) { + return; + } + final String packageName = context.getPackageName(); + if (!getShouldUseAngle(packageName)) { + return; + } - if (shouldShowAngleInUseDialogBox(context) && setupAndUseAngle(context, packageName)) { - final Intent intent = new Intent(ACTION_ANGLE_FOR_ANDROID_TOAST_MESSAGE); - String anglePkg = getAnglePackageName(context.getPackageManager()); - intent.setPackage(anglePkg); + final Intent intent = new Intent(ACTION_ANGLE_FOR_ANDROID_TOAST_MESSAGE); + final String anglePkg = getAnglePackageName(context.getPackageManager()); + intent.setPackage(anglePkg); - context.sendOrderedBroadcast(intent, null, new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - Bundle results = getResultExtras(true); + context.sendOrderedBroadcast(intent, null, new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + final Bundle results = getResultExtras(true); - String toastMsg = results.getString(INTENT_KEY_A4A_TOAST_MESSAGE); - final Toast toast = Toast.makeText(context, toastMsg, Toast.LENGTH_LONG); - toast.show(); - } - }, null, Activity.RESULT_OK, null, null); - } + final String toastMsg = results.getString(INTENT_KEY_A4A_TOAST_MESSAGE); + final Toast toast = Toast.makeText(context, toastMsg, Toast.LENGTH_LONG); + toast.show(); + } + }, null, Activity.RESULT_OK, null, null); } private String[] getAngleEglFeatures(Context context, Bundle coreSettings) { |