diff options
| author | Yang Ni <yangni@google.com> | 2016-04-04 10:23:57 -0700 |
|---|---|---|
| committer | Yang Ni <yangni@google.com> | 2016-04-04 18:00:03 -0700 |
| commit | cb939dc4fcbfd1662ffb210b9e9be7a90a838ebb (patch) | |
| tree | 457f1c2c2defe1091044b600dab5071d1da0bc21 /rs/java/android/renderscript/RenderScript.java | |
| parent | 01e307d4613a34cdbc9940a6f134fac0f658a722 (diff) | |
Avoid destroying Device separately
Bug: 27983025
Device should be destroyed inside the destructor of the associated
Context.
Change-Id: I921a89974e1174f837349a89aef9b03efa4882f5
(cherry picked from commit 4a70df58a32591429ec04902deac2b2210fb96c3)
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
| -rw-r--r-- | rs/java/android/renderscript/RenderScript.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/rs/java/android/renderscript/RenderScript.java b/rs/java/android/renderscript/RenderScript.java index 9beaba301072..2650e5a868d2 100644 --- a/rs/java/android/renderscript/RenderScript.java +++ b/rs/java/android/renderscript/RenderScript.java @@ -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; } } |