Merge "Read CarrierConfig to get operator name" into tm-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
b1bdc42d52
@@ -14,12 +14,14 @@
|
||||
package com.android.settings.display;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.PersistableBundle;
|
||||
import android.provider.Settings;
|
||||
import android.telephony.CarrierConfigManager;
|
||||
import android.telephony.SubscriptionManager;
|
||||
|
||||
import androidx.preference.Preference;
|
||||
import androidx.preference.SwitchPreference;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.PreferenceControllerMixin;
|
||||
import com.android.settingslib.core.AbstractPreferenceController;
|
||||
|
||||
@@ -34,7 +36,15 @@ public class ShowOperatorNamePreferenceController extends AbstractPreferenceCont
|
||||
|
||||
@Override
|
||||
public boolean isAvailable() {
|
||||
return mContext.getResources().getBoolean(R.bool.config_showOperatorNameInStatusBar);
|
||||
final CarrierConfigManager configMgr = mContext
|
||||
.getSystemService(CarrierConfigManager.class);
|
||||
if (configMgr == null) {
|
||||
return false;
|
||||
}
|
||||
final PersistableBundle b = configMgr.getConfigForSubId(SubscriptionManager
|
||||
.getDefaultDataSubscriptionId());
|
||||
return b != null && b.getBoolean(CarrierConfigManager
|
||||
.KEY_SHOW_OPERATOR_NAME_IN_STATUSBAR_BOOL, false);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
Reference in New Issue
Block a user