Merge "Lock correct object for sync in MultiSimSettingController" am: 0a45ff595e (6d1afc40) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/MultiSimSettingController.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -153,7 +153,7 @@ public class MultiSimSettingController extends Handler {
		* Return the singleton or create one if not existed.
		*/
		public static MultiSimSettingController getInstance() {
		synchronized (SubscriptionController.class) {
		synchronized (MultiSimSettingController.class) {
		if (sInstance == null) {
		Log.wtf(LOG_TAG, "getInstance null");
		}
		@@ -166,7 +166,7 @@ public class MultiSimSettingController extends Handler {
		* Init instance of MultiSimSettingController.
		*/
		public static MultiSimSettingController init(Context context, SubscriptionController sc) {
		synchronized (SubscriptionController.class) {
		synchronized (MultiSimSettingController.class) {
		if (sInstance == null) {
		sInstance = new MultiSimSettingController(context, sc);
		} else {