Merge "Reduce footprint of Signature from ~7000 to ~1448" into gingerbread
diff --git a/core/java/android/content/pm/Signature.java b/core/java/android/content/pm/Signature.java
index 1bb3857..d4e5cc1 100644
--- a/core/java/android/content/pm/Signature.java
+++ b/core/java/android/content/pm/Signature.java
@@ -20,6 +20,7 @@
import android.os.Parcel;
import android.os.Parcelable;
+import java.lang.ref.SoftReference;
import java.util.Arrays;
/**
@@ -30,7 +31,7 @@
private final byte[] mSignature;
private int mHashCode;
private boolean mHaveHashCode;
- private String mString;
+ private SoftReference<String> mStringRef;
/**
* Create Signature from an existing raw byte array.
@@ -96,10 +97,13 @@
* cached so future calls will return the same String.
*/
public String toCharsString() {
- if (mString != null) return mString;
- String str = new String(toChars());
- mString = str;
- return mString;
+ String str = mStringRef == null ? null : mStringRef.get();
+ if (str != null) {
+ return str;
+ }
+ str = new String(toChars());
+ mStringRef = new SoftReference<String>(str);
+ return str;
}
/**