Merge "Use system API ACTION_SERVICE_PROVIDERS_UPDATED" (45a91b17) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/CarrierTextController.java

+5 −6

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@ import android.util.Log;
		import androidx.annotation.Nullable;
		import androidx.annotation.VisibleForTesting;

		import com.android.internal.telephony.TelephonyIntents;
		import com.android.settingslib.WirelessUtils;
		import com.android.systemui.Dependency;
		import com.android.systemui.R;
		@@ -337,15 +336,15 @@ public class CarrierTextController {
		CharSequence text =
		getContext().getText(com.android.internal.R.string.emergency_calls_only);
		Intent i = getContext().registerReceiver(null,
		new IntentFilter(TelephonyIntents.SPN_STRINGS_UPDATED_ACTION));
		new IntentFilter(TelephonyManager.ACTION_SERVICE_PROVIDERS_UPDATED));
		if (i != null) {
		String spn = "";
		String plmn = "";
		if (i.getBooleanExtra(TelephonyIntents.EXTRA_SHOW_SPN, false)) {
		spn = i.getStringExtra(TelephonyIntents.EXTRA_SPN);
		if (i.getBooleanExtra(TelephonyManager.EXTRA_SHOW_SPN, false)) {
		spn = i.getStringExtra(TelephonyManager.EXTRA_SPN);
		}
		if (i.getBooleanExtra(TelephonyIntents.EXTRA_SHOW_PLMN, false)) {
		plmn = i.getStringExtra(TelephonyIntents.EXTRA_PLMN);
		if (i.getBooleanExtra(TelephonyManager.EXTRA_SHOW_PLMN, false)) {
		plmn = i.getStringExtra(TelephonyManager.EXTRA_PLMN);
		}
		if (DEBUG) Log.d(TAG, "Getting plmn/spn sticky brdcst " + plmn + "/" + spn);
		if (Objects.equals(plmn, spn)) {

+2 −3

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@ import android.text.TextUtils;
		import android.util.AttributeSet;
		import android.widget.TextView;

		import com.android.internal.telephony.TelephonyIntents;
		import com.android.keyguard.KeyguardUpdateMonitor;
		import com.android.keyguard.KeyguardUpdateMonitorCallback;
		import com.android.systemui.Dependency;
		@@ -137,9 +136,9 @@ public class EmergencyCryptkeeperText extends TextView {
		displayText = getContext().getText(
		com.android.internal.R.string.emergency_calls_only);
		Intent i = getContext().registerReceiver(null,
		new IntentFilter(TelephonyIntents.SPN_STRINGS_UPDATED_ACTION));
		new IntentFilter(TelephonyManager.ACTION_SERVICE_PROVIDERS_UPDATED));
		if (i != null) {
		displayText = i.getStringExtra(TelephonyIntents.EXTRA_PLMN);
		displayText = i.getStringExtra(TelephonyManager.EXTRA_PLMN);
		}
		}
		}

+6 −7

Original line number	Diff line number	Diff line
		@@ -41,7 +41,6 @@ import android.text.TextUtils;
		import android.util.Log;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.telephony.TelephonyIntents;
		import com.android.settingslib.Utils;
		import com.android.settingslib.graph.SignalDrawable;
		import com.android.settingslib.net.SignalStrengthUtil;
		@@ -430,12 +429,12 @@ public class MobileSignalController extends SignalController<

		public void handleBroadcast(Intent intent) {
		String action = intent.getAction();
		if (action.equals(TelephonyIntents.SPN_STRINGS_UPDATED_ACTION)) {
		updateNetworkName(intent.getBooleanExtra(TelephonyIntents.EXTRA_SHOW_SPN, false),
		intent.getStringExtra(TelephonyIntents.EXTRA_SPN),
		intent.getStringExtra(TelephonyIntents.EXTRA_DATA_SPN),
		intent.getBooleanExtra(TelephonyIntents.EXTRA_SHOW_PLMN, false),
		intent.getStringExtra(TelephonyIntents.EXTRA_PLMN));
		if (action.equals(TelephonyManager.ACTION_SERVICE_PROVIDERS_UPDATED)) {
		updateNetworkName(intent.getBooleanExtra(TelephonyManager.EXTRA_SHOW_SPN, false),
		intent.getStringExtra(TelephonyManager.EXTRA_SPN),
		intent.getStringExtra(TelephonyManager.EXTRA_DATA_SPN),
		intent.getBooleanExtra(TelephonyManager.EXTRA_SHOW_PLMN, false),
		intent.getStringExtra(TelephonyManager.EXTRA_PLMN));
		notifyListenersIfNecessary();
		} else if (action.equals(TelephonyManager.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED)) {
		updateDataSim();

+1 −1

Original line number	Diff line number	Diff line
		@@ -319,7 +319,7 @@ public class NetworkControllerImpl extends BroadcastReceiver
		filter.addAction(TelephonyManager.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED);
		filter.addAction(TelephonyManager.ACTION_DEFAULT_VOICE_SUBSCRIPTION_CHANGED);
		filter.addAction(Intent.ACTION_SERVICE_STATE);
		filter.addAction(TelephonyIntents.SPN_STRINGS_UPDATED_ACTION);
		filter.addAction(TelephonyManager.ACTION_SERVICE_PROVIDERS_UPDATED);
		filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
		filter.addAction(ConnectivityManager.INET_CONDITION_ACTION);
		filter.addAction(Intent.ACTION_AIRPLANE_MODE_CHANGED);

+5 −6

Original line number	Diff line number	Diff line
		@@ -36,7 +36,6 @@ import android.test.suitebuilder.annotation.SmallTest;
		import android.testing.AndroidTestingRunner;
		import android.testing.TestableLooper.RunWithLooper;

		import com.android.internal.telephony.TelephonyIntents;
		import com.android.settingslib.graph.SignalDrawable;
		import com.android.settingslib.net.DataUsageController;
		import com.android.systemui.R;
		@@ -411,13 +410,13 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest {
		boolean showPlmn, String plmn) {

		Intent intent = new Intent();
		intent.setAction(TelephonyIntents.SPN_STRINGS_UPDATED_ACTION);
		intent.setAction(TelephonyManager.ACTION_SERVICE_PROVIDERS_UPDATED);

		intent.putExtra(TelephonyIntents.EXTRA_SHOW_SPN, showSpn);
		intent.putExtra(TelephonyIntents.EXTRA_SPN, spn);
		intent.putExtra(TelephonyManager.EXTRA_SHOW_SPN, showSpn);
		intent.putExtra(TelephonyManager.EXTRA_SPN, spn);

		intent.putExtra(TelephonyIntents.EXTRA_SHOW_PLMN, showPlmn);
		intent.putExtra(TelephonyIntents.EXTRA_PLMN, plmn);
		intent.putExtra(TelephonyManager.EXTRA_SHOW_PLMN, showPlmn);
		intent.putExtra(TelephonyManager.EXTRA_PLMN, plmn);
		SubscriptionManager.putSubscriptionIdExtra(intent, mSubId);

		return intent;