From 9291bfad0f7877a5a7e1171038a70972f49f4910 Mon Sep 17 00:00:00 2001 From: Jordan Liu Date: Thu, 11 Apr 2019 17:44:16 -0700 Subject: [PATCH] fix merge [DO NOT MERGE] ag/7020248 defined mSelectPhoneIndexHandler twice, this fix removes the double definition Change-Id: I749ab26dc71f269fd322d51b94a4809cecfd0df1 --- src/com/android/settings/RadioInfo.java | 26 ------------------------- 1 file changed, 26 deletions(-) diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java index 5c0e87dadc0..d4845031055 100644 --- a/src/com/android/settings/RadioInfo.java +++ b/src/com/android/settings/RadioInfo.java @@ -1599,32 +1599,6 @@ public class RadioInfo extends Activity { } }; - AdapterView.OnItemSelectedListener mSelectPhoneIndexHandler = - new AdapterView.OnItemSelectedListener() { - - public void onItemSelected(AdapterView parent, View v, int pos, long id) { - if (pos >= 0 && pos <= mPhoneIndexLabels.length - 1) { - // the array position is equal to the phone index - int phoneIndex = pos; - Phone[] phones = PhoneFactory.getPhones(); - if (phones == null || phones.length <= phoneIndex) { - return; - } - // getSubId says it takes a slotIndex, but it actually takes a phone index - int[] subIds = SubscriptionManager.getSubId(phoneIndex); - if (subIds == null || subIds.length < 1) { - return; - } - mSelectedPhoneIndex = phoneIndex; - - updatePhoneIndex(phoneIndex, subIds[0]); - } - } - - public void onNothingSelected(AdapterView parent) { - } - }; - AdapterView.OnItemSelectedListener mSelectPhoneIndexHandler = new AdapterView.OnItemSelectedListener() {