Merge "Update references to use PhoneConstantConversion"

This commit is contained in:
Nathan Harold
2017-03-03 22:51:38 +00:00
committed by Android (Google) Code Review

View File

@@ -48,8 +48,8 @@ import android.widget.TabHost.TabSpec;
import android.widget.TabWidget; import android.widget.TabWidget;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
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 +292,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);