summaryrefslogtreecommitdiffstats
path: root/core/java/com
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2014-05-30 21:39:04 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-30 21:39:04 +0000
commitc6b6154ac1eb4e839f363115aef3649c967bcfdd (patch)
tree2d4a21c48e8de7329608319897c26f1e19a32267 /core/java/com
parent75f5b3a8dd9ecc6aa5caae1f32f085bac79fde8c (diff)
parentca8eb243d1268e8f89ecd02063960667aca3374b (diff)
downloadframeworks_base-c6b6154ac1eb4e839f363115aef3649c967bcfdd.zip
frameworks_base-c6b6154ac1eb4e839f363115aef3649c967bcfdd.tar.gz
frameworks_base-c6b6154ac1eb4e839f363115aef3649c967bcfdd.tar.bz2
am ea5af639: Merge "Re-jigger layers" into lmp-preview-dev
* commit 'ea5af63965bf323580aa1e2854efb2f8cc3dc396': Re-jigger layers
Diffstat (limited to 'core/java/com')
-rw-r--r--core/java/com/android/internal/util/VirtualRefBasePtr.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/core/java/com/android/internal/util/VirtualRefBasePtr.java b/core/java/com/android/internal/util/VirtualRefBasePtr.java
index 0bd4d3a..52306f1 100644
--- a/core/java/com/android/internal/util/VirtualRefBasePtr.java
+++ b/core/java/com/android/internal/util/VirtualRefBasePtr.java
@@ -32,11 +32,17 @@ public final class VirtualRefBasePtr {
return mNativePtr;
}
+ public void release() {
+ if (mNativePtr != 0) {
+ nDecStrong(mNativePtr);
+ mNativePtr = 0;
+ }
+ }
+
@Override
protected void finalize() throws Throwable {
try {
- nDecStrong(mNativePtr);
- mNativePtr = 0;
+ release();
} finally {
super.finalize();
}