Merge "Handle SubSettings instance leaks in Index.java" am: 527b2b220a
am: bf4a67ec0f
Change-Id: I89d30398cfe13e72ccbcbb92d5d4e0eda5f350ae
diff --git a/src/com/android/settings/search/Index.java b/src/com/android/settings/search/Index.java
index ccedd62..084f9c35 100644
--- a/src/com/android/settings/search/Index.java
+++ b/src/com/android/settings/search/Index.java
@@ -217,20 +217,20 @@
*/
public static Index getInstance(Context context) {
if (sInstance == null) {
- sInstance = new Index(context.getApplicationContext(), BASE_AUTHORITY);
+ synchronized (Index.class) {
+ if (sInstance == null) {
+ sInstance = new Index(context.getApplicationContext(), BASE_AUTHORITY);
+ }
+ }
}
return sInstance;
}
- public Index(Context context, String baseAuthority) {
+ private Index(Context context, String baseAuthority) {
mContext = context;
mBaseAuthority = baseAuthority;
}
- public void setContext(Context context) {
- mContext = context;
- }
-
public boolean isAvailable() {
return mIsAvailable.get();
}