diff options
| author | Yang Ni <yangni@google.com> | 2016-04-05 00:50:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-04-05 00:50:42 +0000 |
| commit | 14182697bbaeee70fd78bd12e8e7d87254415eae (patch) | |
| tree | ee4e3932b0fc02b5adacdf21b9da971b532144a3 /rs/java/android/renderscript/RenderScript.java | |
| parent | 31da1779e70b9a39c16d2bcc2c3cbb34785cb13b (diff) | |
| parent | 4a70df58a32591429ec04902deac2b2210fb96c3 (diff) | |
Merge "Avoid destroying Device separately" into nyc-dev
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; } } |