Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58ab4b3e authored by Peiyong Lin's avatar Peiyong Lin Committed by Automerger Merge Worker
Browse files

Merge "Avoid setup ANGLE again when determine whether to show toast." into... 

Merge "Avoid setup ANGLE again when determine whether to show toast." into main am: 781101ec am: 6dc82990 am: 7056ff60

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786747



Change-Id: I4fce8a8246b236d07faa61172122518706e731e7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 028f33fd 7056ff60

core/java/android/os/GraphicsEnvironment.java

+19 −30
Original line number Original line Diff line number Diff line
@@ -635,46 +635,35 @@ public class GraphicsEnvironment { 
        return false;

        return false;

    }

    }





    /**

     * 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

     * Show the ANGLE in Use Dialog Box

     * @param context

     * @param context

     */

     */

    public void showAngleInUseDialogBox(Context context) {

    public void showAngleInUseDialogBox(Context context) {

        if (!shouldShowAngleInUseDialogBox(context)) {

            return;

        }



        final String packageName = context.getPackageName();

        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);

        final Intent intent = new Intent(ACTION_ANGLE_FOR_ANDROID_TOAST_MESSAGE);

            String anglePkg = getAnglePackageName(context.getPackageManager());

        final String anglePkg = getAnglePackageName(context.getPackageManager());

        intent.setPackage(anglePkg);

        intent.setPackage(anglePkg);





        context.sendOrderedBroadcast(intent, null, new BroadcastReceiver() {

        context.sendOrderedBroadcast(intent, null, new BroadcastReceiver() {

            @Override

            @Override

            public void onReceive(Context context, Intent intent) {

            public void onReceive(Context context, Intent intent) {

                    Bundle results = getResultExtras(true);

                final Bundle results = getResultExtras(true);





                    String toastMsg = results.getString(INTENT_KEY_A4A_TOAST_MESSAGE);

                final String toastMsg = results.getString(INTENT_KEY_A4A_TOAST_MESSAGE);

                final Toast toast = Toast.makeText(context, toastMsg, Toast.LENGTH_LONG);

                final Toast toast = Toast.makeText(context, toastMsg, Toast.LENGTH_LONG);

                toast.show();

                toast.show();

            }

            }

        }, null, Activity.RESULT_OK, null, null);

        }, null, Activity.RESULT_OK, null, null);

    }

    }

    }





    private String[] getAngleEglFeatures(Context context, Bundle coreSettings) {

    private String[] getAngleEglFeatures(Context context, Bundle coreSettings) {

        if (mAngleOptInIndex < 0) {

        if (mAngleOptInIndex < 0) {