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

Commit 6cecf0c8 authored by Yang Ni's avatar Yang Ni Committed by android-build-merger
Browse files

Merge "Avoid destroying Device separately" 

am: a314384d

* commit 'a314384d':
  Avoid destroying Device separately

Change-Id: Ia9b269456b01b9ba1f742c674449392fb6601599
parents 2fb61fbb a314384d

rs/java/android/renderscript/RenderScript.java

+2 −6
Original line number Diff line number Diff line
@@ -1031,7 +1031,6 @@ public class RenderScript { 






    long     mDev;

    long     mContext;

    private boolean mDestroyed = false;
@@ -1426,8 +1425,8 @@ public class RenderScript { 


        RenderScript rs = new RenderScript(ctx);



        rs.mDev = rs.nDeviceCreate();

        rs.mContext = rs.nContextCreate(rs.mDev, flags, sdkVersion, ct.mID);

        long device = rs.nDeviceCreate();

        rs.mContext = rs.nContextCreate(device, flags, sdkVersion, ct.mID);

        rs.mContextType = ct;

        rs.mContextFlags = flags;

        rs.mContextSdkVersion = sdkVersion;
@@ -1635,9 +1634,6 @@ public class RenderScript { 
            }



            nContextDestroy();



            nDeviceDestroy(mDev);

            mDev = 0;

        }

    }

rs/java/android/renderscript/RenderScriptGL.java

+2 −2
Original line number Diff line number Diff line
@@ -177,9 +177,9 @@ public class RenderScriptGL extends RenderScript { 


        mWidth = 0;

        mHeight = 0;

        mDev = nDeviceCreate();

        long device = nDeviceCreate();

        int dpi = ctx.getResources().getDisplayMetrics().densityDpi;

        mContext = nContextCreateGL(mDev, 0, sdkVersion,

        mContext = nContextCreateGL(device, 0, sdkVersion,

                                    mSurfaceConfig.mColorMin, mSurfaceConfig.mColorPref,

                                    mSurfaceConfig.mAlphaMin, mSurfaceConfig.mAlphaPref,

                                    mSurfaceConfig.mDepthMin, mSurfaceConfig.mDepthPref,