Make members in SubscriptionInfoHelper non static
These should never be static, especially the Context.
Bug: 554885
Test: make
Change-Id: I45e186e40a2119f4b38e537a97bc3b5cc82ec084
diff --git a/src/com/android/phone/SubscriptionInfoHelper.java b/src/com/android/phone/SubscriptionInfoHelper.java
index 9f0ebd0..8c9edf3 100644
--- a/src/com/android/phone/SubscriptionInfoHelper.java
+++ b/src/com/android/phone/SubscriptionInfoHelper.java
@@ -25,7 +25,6 @@
import android.telephony.TelephonyManager;
import android.text.TextUtils;
-import com.android.phone.PhoneGlobals;
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneFactory;
@@ -46,10 +45,10 @@
private static final String SUB_LABEL_EXTRA =
"com.android.phone.settings.SubscriptionInfoHelper.SubscriptionLabel";
- private static Context mContext;
+ private Context mContext;
- private static int mSubId = NO_SUB_ID;
- private static String mSubLabel;
+ private int mSubId = NO_SUB_ID;
+ private String mSubLabel;
/**
* Instantiates the helper, by extracting the subscription id and label from the intent.