Merge "Fix the problem that sim2 can not copy imei"
This commit is contained in:
@@ -74,6 +74,7 @@ public class ImeiInfoPreferenceController extends BasePreferenceController {
|
|||||||
for (int simSlotNumber = 1; simSlotNumber < mTelephonyManager.getPhoneCount();
|
for (int simSlotNumber = 1; simSlotNumber < mTelephonyManager.getPhoneCount();
|
||||||
simSlotNumber++) {
|
simSlotNumber++) {
|
||||||
final Preference multiSimPreference = createNewPreference(screen.getContext());
|
final Preference multiSimPreference = createNewPreference(screen.getContext());
|
||||||
|
multiSimPreference.setCopyingEnabled(true);
|
||||||
multiSimPreference.setOrder(imeiPreferenceOrder + simSlotNumber);
|
multiSimPreference.setOrder(imeiPreferenceOrder + simSlotNumber);
|
||||||
multiSimPreference.setKey(getPreferenceKey() + simSlotNumber);
|
multiSimPreference.setKey(getPreferenceKey() + simSlotNumber);
|
||||||
category.addPreference(multiSimPreference);
|
category.addPreference(multiSimPreference);
|
||||||
@@ -150,7 +151,7 @@ public class ImeiInfoPreferenceController extends BasePreferenceController {
|
|||||||
|
|
||||||
private int getPhoneType(int slotIndex) {
|
private int getPhoneType(int slotIndex) {
|
||||||
SubscriptionInfo subInfo = SubscriptionManager.from(mContext)
|
SubscriptionInfo subInfo = SubscriptionManager.from(mContext)
|
||||||
.getActiveSubscriptionInfoForSimSlotIndex(slotIndex);
|
.getActiveSubscriptionInfoForSimSlotIndex(slotIndex);
|
||||||
return mTelephonyManager.getCurrentPhoneType(subInfo != null ? subInfo.getSubscriptionId()
|
return mTelephonyManager.getCurrentPhoneType(subInfo != null ? subInfo.getSubscriptionId()
|
||||||
: SubscriptionManager.DEFAULT_SUBSCRIPTION_ID);
|
: SubscriptionManager.DEFAULT_SUBSCRIPTION_ID);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user