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

Commit 6ae76d0d authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Refactors and a potential public API for rendering"

parents 72e8228f 8785ceb3

config/preloaded-classes

+1 −1
Original line number Diff line number Diff line
@@ -3240,7 +3240,7 @@ android.view.FocusFinder$1 
android.view.FocusFinder$FocusSorter

android.view.FocusFinder$UserSpecifiedFocusComparator

android.view.FocusFinder$UserSpecifiedFocusComparator$NextFocusGetter

android.view.FrameInfo

android.graphics.FrameInfo

android.view.FrameMetrics

android.view.FrameMetricsObserver

android.view.FrameStats

core/java/android/app/ActivityThread.java

+5 −3
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ import android.database.sqlite.SQLiteDebug; 
import android.database.sqlite.SQLiteDebug.DbStats;

import android.graphics.Bitmap;

import android.graphics.Canvas;

import android.graphics.HardwareRenderer;

import android.graphics.ImageDecoder;

import android.hardware.display.DisplayManagerGlobal;

import android.net.ConnectivityManager;
@@ -5652,7 +5653,7 @@ public final class ActivityThread extends ClientTransactionHandler { 
                    int uid = Process.myUid();

                    String[] packages = getPackageManager().getPackagesForUid(uid);

                    if (packages != null) {

                        ThreadedRenderer.setupDiskCache(codeCacheDir);

                        HardwareRenderer.setupDiskCache(codeCacheDir);

                        RenderScriptCacheDir.setupDiskCache(codeCacheDir);

                    }

                } catch (RemoteException e) {
@@ -5887,7 +5888,8 @@ public final class ActivityThread extends ClientTransactionHandler { 


        // Allow renderer debugging features if we're debuggable.

        boolean isAppDebuggable = (data.appInfo.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0;

        ThreadedRenderer.setDebuggingEnabled(isAppDebuggable || Build.IS_DEBUGGABLE);

        HardwareRenderer.setDebuggingEnabled(isAppDebuggable || Build.IS_DEBUGGABLE);

        HardwareRenderer.setPackageName(data.appInfo.packageName);



        /**

         * Initialize the default http proxy in this process for the reasons we set the time zone.
@@ -5954,7 +5956,7 @@ public final class ActivityThread extends ClientTransactionHandler { 
                StrictMode.setThreadPolicyMask(oldMask);

            }

        } else {

            ThreadedRenderer.setIsolatedProcess(true);

            HardwareRenderer.setIsolatedProcess(true);

        }



        // If we use profiles, setup the dex reporter to notify package manager

core/java/android/view/Choreographer.java

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.view.DisplayEventReceiver.VSYNC_SOURCE_SURFACE_FLINGER; 


import android.annotation.TestApi;

import android.annotation.UnsupportedAppUsage;

import android.graphics.FrameInfo;

import android.hardware.display.DisplayManagerGlobal;

import android.os.Build;

import android.os.Handler;

core/java/android/view/FrameMetricsObserver.java

+3 −2
Original line number Diff line number Diff line
@@ -40,8 +40,9 @@ public class FrameMetricsObserver { 
    @UnsupportedAppUsage

    private FrameMetrics mFrameMetrics;



    /* package */ Window.OnFrameMetricsAvailableListener mListener;

    /* package */ VirtualRefBasePtr mNative;

    /* pacage */ Window.OnFrameMetricsAvailableListener mListener;

    /** @hide */

    public VirtualRefBasePtr mNative;



    /**

     * Creates a FrameMetricsObserver

core/java/android/view/TextureLayer.java

+5 −3
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.view; 


import android.annotation.Nullable;

import android.graphics.Bitmap;

import android.graphics.HardwareRenderer;

import android.graphics.Matrix;

import android.graphics.Paint;

import android.graphics.SurfaceTexture;
@@ -32,10 +33,10 @@ import com.android.internal.util.VirtualRefBasePtr; 
 * @hide

 */

public final class TextureLayer {

    private ThreadedRenderer mRenderer;

    private HardwareRenderer mRenderer;

    private VirtualRefBasePtr mFinalizer;



    private TextureLayer(ThreadedRenderer renderer, long deferredUpdater) {

    private TextureLayer(HardwareRenderer renderer, long deferredUpdater) {

        if (renderer == null || deferredUpdater == 0) {

            throw new IllegalArgumentException("Either hardware renderer: " + renderer

                    + " or deferredUpdater: " + deferredUpdater + " is invalid");
@@ -139,7 +140,8 @@ public final class TextureLayer { 
        mRenderer.pushLayerUpdate(this);

    }



    static TextureLayer adoptTextureLayer(ThreadedRenderer renderer, long layer) {

    /** @hide */

    public static TextureLayer adoptTextureLayer(HardwareRenderer renderer, long layer) {

        return new TextureLayer(renderer, layer);

    }