Telephony: Compilation fix for subId conversion from long to int. (21c2a40b) · Commits · e / os / android_packages_apps_Dialer

src/com/android/dialer/CallDetailActivity.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -419,7 +419,7 @@ public class CallDetailActivity extends AnalyticsActivity implements ProximitySe
		final int numberPresentation = firstDetails.numberPresentation;
		final Uri contactUri = firstDetails.contactUri;
		final Uri photoUri = firstDetails.photoUri;
		final long subId = firstDetails.accountId;
		final int subId = firstDetails.accountId;

		// Cache the details about the phone number.
		final boolean canPlaceCallsTo =
		@@ -545,9 +545,9 @@ public class CallDetailActivity extends AnalyticsActivity implements ProximitySe
		callCursor.getString(ACCOUNT_COMPONENT_NAME),
		callCursor.getString(ACCOUNT_ID)));
		String accId = callCursor.getString(ACCOUNT_ID);
		long subId = SubscriptionManager.DEFAULT_SUB_ID;
		int subId = SubscriptionManager.DEFAULT_SUBSCRIPTION_ID;
		if (accId!=null && !accId.equals("E") && !accId.toLowerCase().contains("sip")) {
		subId = Long.parseLong(accId);
		subId = Integer.parseInt(accId);
		}

		if (TextUtils.isEmpty(countryIso)) {

src/com/android/dialer/PhoneCallDetails.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ public class PhoneCallDetails {
		/**
		* The account id associated with the call.
		*/
		public final long accountId;
		public final int accountId;
		/**
		* Features applicable to this call.
		*/
		@@ -123,7 +123,7 @@ public class PhoneCallDetails {
		public PhoneCallDetails(CharSequence number, int numberPresentation,
		CharSequence formattedNumber, String countryIso, String geocode,
		int[] callTypes, long date, long duration, String accountLabel, Drawable accountIcon,
		int features, Long dataUsage, String transcription, long accountId) {
		int features, Long dataUsage, String transcription, int accountId) {
		this(number, numberPresentation, formattedNumber, countryIso, geocode,
		callTypes, date, duration, "", 0, "", null, null, 0, accountLabel, accountIcon,
		features, dataUsage, transcription, accountId);
		@@ -146,7 +146,7 @@ public class PhoneCallDetails {
		int[] callTypes, long date, long duration, CharSequence name,
		int numberType, CharSequence numberLabel, Uri contactUri,
		Uri photoUri, int sourceType, String accountLabel, Drawable accountIcon, int features,
		Long dataUsage, String transcription, long accountId) {
		Long dataUsage, String transcription, int accountId) {
		this.number = number;
		this.numberPresentation = numberPresentation;
		this.formattedNumber = formattedNumber;

src/com/android/dialer/SpecialCharSequenceMgr.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -211,7 +211,7 @@ public class SpecialCharSequenceMgr {
		sc.progressDialog.show();

		// run the query.
		long subId = SubscriptionManager.getDefaultVoiceSubId();
		int subId = SubscriptionManager.getDefaultVoiceSubId();
		Uri uri = Uri.parse("content://icc/adn/subId/" + subId);
		handler.startQuery(ADN_QUERY_TOKEN, sc, uri,
		new String[]{ADN_PHONE_NUMBER_COLUMN_NAME}, null, null, null);
		@@ -231,7 +231,7 @@ public class SpecialCharSequenceMgr {

		static boolean handlePinEntry(Context context, String input) {
		if ((input.startsWith("04") \|\| input.startsWith("05")) && input.endsWith("#")) {
		long subId = SubscriptionManager.getDefaultVoiceSubId();
		int subId = SubscriptionManager.getDefaultVoiceSubId();
		try {
		return ITelephony.Stub.asInterface(ServiceManager.getService(
		Context.TELEPHONY_SERVICE)).handlePinMmiForSubscriber(subId, input);
		@@ -248,7 +248,7 @@ public class SpecialCharSequenceMgr {
		(TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
		if (telephonyManager != null && input.equals(MMI_IMEI_DISPLAY)) {
		int phoneType;
		long subId = SubscriptionManager.getDefaultVoiceSubId();
		int subId = SubscriptionManager.getDefaultVoiceSubId();
		phoneType = telephonyManager.getCurrentPhoneType(subId);
		if (phoneType == TelephonyManager.PHONE_TYPE_GSM) {
		showIMEIPanel(context, useSystemWindow, telephonyManager);
		@@ -285,7 +285,7 @@ public class SpecialCharSequenceMgr {
		private static void showIMEIPanel(Context context, boolean useSystemWindow,
		TelephonyManager telephonyManager) {
		String imeiStr = null;
		long subId = SubscriptionManager.getDefaultVoiceSubId();
		int subId = SubscriptionManager.getDefaultVoiceSubId();
		int slotId = SubscriptionManager.getSlotId(subId);
		imeiStr = telephonyManager.getDeviceId(slotId);

		@@ -300,7 +300,7 @@ public class SpecialCharSequenceMgr {
		private static void showMEIDPanel(Context context, boolean useSystemWindow,
		TelephonyManager telephonyManager) {
		String meidStr = null;
		long subId = SubscriptionManager.getDefaultVoiceSubId();
		int subId = SubscriptionManager.getDefaultVoiceSubId();
		int slotId = SubscriptionManager.getSlotId(subId);
		meidStr = telephonyManager.getDeviceId(slotId);

src/com/android/dialer/calllog/CallLogAdapter.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -656,9 +656,9 @@ public class CallLogAdapter extends GroupingListAdapter
		views.rowId = rowId;

		String accId = c.getString(CallLogQuery.ACCOUNT_ID);
		long subId = SubscriptionManager.DEFAULT_SUB_ID;
		int subId = SubscriptionManager.DEFAULT_SUBSCRIPTION_ID;
		if (accId!= null && !accId.equals("E") && !accId.toLowerCase().contains("sip")) {
		subId = Long.parseLong(accId);
		subId = Integer.parseInt(accId);
		}

		// For entries in the call log, check if the day group has changed and display a header

src/com/android/dialer/calllog/CallLogQueryHandler.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -208,7 +208,7 @@ public class CallLogQueryHandler extends NoNullCursorAsyncQueryHandler {
		}

		if (slotId > CALL_SIM_ALL) {
		long[] subId = SubscriptionManager.getSubId(slotId);
		int[] subId = SubscriptionManager.getSubId(slotId);
		if (subId != null && subId.length >= 1) {
		if (where.length() > 0) {
		where.append(" AND ");