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

Commit 60c6b082 authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "Remove unused parameter"

parents 70f52e6d 44d79747

core/java/android/view/HardwareRenderer.java

+4 −5
Original line number Diff line number Diff line
@@ -319,11 +319,10 @@ public abstract class HardwareRenderer { 
     *

     * @param width The width of the drawing surface.

     * @param height The height of the drawing surface.

     * @param attachInfo The 

     * @param holder

     * @param holder The target surface

     */

    void initializeIfNeeded(int width, int height, View.AttachInfo attachInfo,

            SurfaceHolder holder) throws Surface.OutOfResourcesException {

    void initializeIfNeeded(int width, int height, SurfaceHolder holder)

            throws Surface.OutOfResourcesException {

        if (isRequested()) {

            // We lost the gl context, so recreate it.

            if (!isEnabled()) {

core/java/android/view/ViewRootImpl.java

+1 −2
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ import android.util.Poolable; 
import android.util.PoolableManager;

import android.util.Pools;

import android.util.Slog;

import android.util.SparseArray;

import android.util.TypedValue;

import android.view.View.MeasureSpec;

import android.view.accessibility.AccessibilityEvent;
@@ -2530,7 +2529,7 @@ public final class ViewRootImpl extends Handler implements ViewParent, 
                        mFullRedrawNeeded = true;

                        try {

                            mAttachInfo.mHardwareRenderer.initializeIfNeeded(mWidth, mHeight,

                                    mAttachInfo, mHolder);

                                    mHolder);

                        } catch (Surface.OutOfResourcesException e) {

                            Log.e(TAG, "OutOfResourcesException locking surface", e);

                            try {