Merge "Update references to use PhoneConstantConversion"

am: 79694e79d1

Change-Id: I809133a80c00b932b00637920f2c4c89a5a69a22
This commit is contained in:
nharold
2017-05-06 01:57:56 +00:00
committed by android-build-merger

View File

@@ -50,6 +50,7 @@ import android.widget.TabWidget;
import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.telephony.DefaultPhoneNotifier; import com.android.internal.telephony.DefaultPhoneNotifier;
import com.android.internal.telephony.Phone; import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneConstantConversions;
import com.android.internal.telephony.PhoneFactory; import com.android.internal.telephony.PhoneFactory;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment; import com.android.settings.SettingsPreferenceFragment;
@@ -292,7 +293,7 @@ public class SimStatus extends SettingsPreferenceFragment {
private void updateDataState() { private void updateDataState() {
final int state = final int state =
DefaultPhoneNotifier.convertDataState(mPhone.getDataConnectionState()); PhoneConstantConversions.convertDataState(mPhone.getDataConnectionState());
String display = mRes.getString(R.string.radioInfo_unknown); String display = mRes.getString(R.string.radioInfo_unknown);