Merge "Switched out PhoneConstants.PhoneKey" (8ee531e9) · Commits · e / os / android_frameworks_base

packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -49,7 +49,6 @@ import android.webkit.WebViewClient;
		import android.widget.ProgressBar;
		import android.widget.TextView;

		import com.android.internal.telephony.PhoneConstants;
		import com.android.internal.util.ArrayUtils;
		import com.android.internal.util.TrafficStatsConstants;

		@@ -207,7 +206,7 @@ public class CaptivePortalLoginActivity extends Activity {
		if (TextUtils.isEmpty(url)) url = mCm.getCaptivePortalServerUrl();
		final CarrierConfigManager configManager = getApplicationContext()
		.getSystemService(CarrierConfigManager.class);
		final int subId = getIntent().getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
		final int subId = getIntent().getIntExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX,
		SubscriptionManager.getDefaultVoiceSubscriptionId());
		final String[] portalURLs = configManager.getConfigForSubId(subId).getStringArray(
		CarrierConfigManager.KEY_CARRIER_DEFAULT_REDIRECTION_URL_STRING_ARRAY);

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

+5 −6

Original line number	Diff line number	Diff line
		@@ -31,8 +31,8 @@ import static android.os.BatteryManager.EXTRA_MAX_CHARGING_VOLTAGE;
		import static android.os.BatteryManager.EXTRA_PLUGGED;
		import static android.os.BatteryManager.EXTRA_STATUS;
		import static android.telephony.PhoneStateListener.LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGE;
		import static android.telephony.TelephonyManager.MODEM_COUNT_DUAL_MODEM;

		import static com.android.internal.telephony.PhoneConstants.MAX_PHONE_COUNT_DUAL_SIM;
		import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_BOOT;
		import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_DPM_LOCK_NOW;
		import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_LOCKOUT;
		@@ -92,7 +92,6 @@ import android.util.Log;
		import android.util.SparseBooleanArray;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.telephony.PhoneConstants;
		import com.android.internal.telephony.TelephonyIntents;
		import com.android.internal.widget.LockPatternUtils;
		import com.android.settingslib.WirelessUtils;
		@@ -446,7 +445,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		*/
		public List<SubscriptionInfo> getFilteredSubscriptionInfo(boolean forceReload) {
		List<SubscriptionInfo> subscriptions = getSubscriptionInfo(false);
		if (subscriptions.size() == MAX_PHONE_COUNT_DUAL_SIM) {
		if (subscriptions.size() == MODEM_COUNT_DUAL_MODEM) {
		SubscriptionInfo info1 = subscriptions.get(0);
		SubscriptionInfo info2 = subscriptions.get(1);
		if (info1.getGroupUuid() != null && info1.getGroupUuid().equals(info2.getGroupUuid())) {
		@@ -1074,7 +1073,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		mHandler.sendEmptyMessage(MSG_AIRPLANE_MODE_CHANGED);
		} else if (Intent.ACTION_SERVICE_STATE.equals(action)) {
		ServiceState serviceState = ServiceState.newFromBundle(intent.getExtras());
		int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
		int subId = intent.getIntExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX,
		SubscriptionManager.INVALID_SUBSCRIPTION_ID);
		if (DEBUG) {
		Log.v(TAG, "action " + action + " serviceState=" + serviceState + " subId="
		@@ -1236,8 +1235,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
		throw new IllegalArgumentException("only handles intent ACTION_SIM_STATE_CHANGED");
		}
		String stateExtra = intent.getStringExtra(Intent.EXTRA_SIM_STATE);
		int slotId = intent.getIntExtra(PhoneConstants.PHONE_KEY, 0);
		int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
		int slotId = intent.getIntExtra(SubscriptionManager.EXTRA_SLOT_INDEX, 0);
		int subId = intent.getIntExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX,
		SubscriptionManager.INVALID_SUBSCRIPTION_ID);
		if (Intent.SIM_STATE_ABSENT.equals(stateExtra)) {
		final String absentReason = intent

packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java

+3 −5

Original line number	Diff line number	Diff line
		@@ -22,8 +22,7 @@ import static android.net.wifi.WifiManager.TrafficStateCallback.DATA_ACTIVITY_IN
		import static android.net.wifi.WifiManager.TrafficStateCallback.DATA_ACTIVITY_NONE;
		import static android.net.wifi.WifiManager.TrafficStateCallback.DATA_ACTIVITY_OUT;
		import static android.telephony.PhoneStateListener.LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGE;

		import static com.android.internal.telephony.PhoneConstants.MAX_PHONE_COUNT_DUAL_SIM;
		import static android.telephony.TelephonyManager.MODEM_COUNT_DUAL_MODEM;

		import android.content.BroadcastReceiver;
		import android.content.Context;
		@@ -57,7 +56,6 @@ import android.util.SparseArray;

		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.telephony.PhoneConstants;
		import com.android.internal.telephony.TelephonyIntents;
		import com.android.settingslib.net.DataUsageController;
		import com.android.systemui.DemoMode;
		@@ -547,7 +545,7 @@ public class NetworkControllerImpl extends BroadcastReceiver
		mReceiverHandler.post(this::handleConfigurationChanged);
		break;
		default:
		int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
		int subId = intent.getIntExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX,
		SubscriptionManager.INVALID_SUBSCRIPTION_ID);
		if (SubscriptionManager.isValidSubscriptionId(subId)) {
		if (mMobileSignalControllers.indexOfKey(subId) >= 0) {
		@@ -582,7 +580,7 @@ public class NetworkControllerImpl extends BroadcastReceiver
		}

		private void filterMobileSubscriptionInSameGroup(List<SubscriptionInfo> subscriptions) {
		if (subscriptions.size() == MAX_PHONE_COUNT_DUAL_SIM) {
		if (subscriptions.size() == MODEM_COUNT_DUAL_MODEM) {
		SubscriptionInfo info1 = subscriptions.get(0);
		SubscriptionInfo info2 = subscriptions.get(1);
		if (info1.getGroupUuid() != null && info1.getGroupUuid().equals(info2.getGroupUuid())) {

packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -57,7 +57,6 @@ import android.testing.AndroidTestingRunner;
		import android.testing.TestableContext;
		import android.testing.TestableLooper;

		import com.android.internal.telephony.PhoneConstants;
		import com.android.internal.telephony.TelephonyIntents;
		import com.android.systemui.DumpController;
		import com.android.systemui.SysuiTestCase;
		@@ -524,9 +523,9 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase {
		int subscription = simInited
		? 1/* mock subid=1 */ : SubscriptionManager.DUMMY_SUBSCRIPTION_ID_BASE;
		if (data != null) intent.putExtras(data);
		intent.putExtra(PhoneConstants.PHONE_NAME_KEY, "Phone");
		intent.putExtra("subscription", subscription);
		intent.putExtra("slot", 0/* SLOT 1 */);

		intent.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, subscription);
		intent.putExtra(SubscriptionManager.EXTRA_SLOT_INDEX, 0);
		return intent;
		}

telephony/java/android/telephony/SubscriptionManager.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -2232,6 +2232,7 @@ public class SubscriptionManager {
		} else {
		logd("putPhoneIdAndSubIdExtra: no valid subs");
		intent.putExtra(PhoneConstants.PHONE_KEY, phoneId);
		intent.putExtra(EXTRA_SLOT_INDEX, phoneId);
		}
		}