Dialer: Fix compilation errors (1bebee89) · Commits · e / os / android_packages_apps_Dialer

src/com/android/dialer/CallDetailActivity.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -433,7 +433,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;

		// Set the details header, based on the first phone call.
		mCallDetailHeader.updateViews(firstDetails);
		@@ -516,9 +516,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/CallDetailHeader.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -88,7 +88,7 @@ public class CallDetailHeader {
		Uri getPhotoUri();
		CharSequence getAccountLabel();
		CharSequence getGeocode();
		long getAccountId();
		int getAccountId();
		}

		public CallDetailHeader(Activity activity, PhoneNumberDisplayHelper phoneNumberHelper) {
		@@ -108,7 +108,7 @@ public class CallDetailHeader {
		public void updateViews(Data data) {
		// Cache the details about the phone number.
		final PhoneNumberUtilsWrapper phoneUtils = new PhoneNumberUtilsWrapper();
		final long accountId = data.getAccountId();
		final int accountId = data.getAccountId();
		final CharSequence dataName = data.getName();
		final CharSequence dataNumber = data.getNumber();
		final CharSequence dataAccount = data.getAccountLabel();

src/com/android/dialer/PhoneCallDetails.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ public class PhoneCallDetails implements CallDetailHeader.Data {
		/**
		* The account id associated with the call.
		*/
		public final long accountId;
		public final int accountId;
		/**
		* Features applicable to this call.
		*/
		@@ -131,7 +131,7 @@ public class PhoneCallDetails implements CallDetailHeader.Data {
		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, String operator) {
		int features, Long dataUsage, String transcription, int accountId, String operator) {
		this(number, numberPresentation, formattedNumber, countryIso, geocode,
		callTypes, date, duration, "", 0, "", null, null, 0, accountLabel, accountIcon,
		features, dataUsage, transcription, Calls.DURATION_TYPE_ACTIVE, accountId,
		@@ -156,7 +156,7 @@ public class PhoneCallDetails implements CallDetailHeader.Data {
		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, int durationType, long accountId) {
		Long dataUsage, String transcription, int durationType, int accountId) {
		this(number, numberPresentation, formattedNumber, countryIso, geocode, callTypes, date,
		duration, name, numberType, numberLabel, contactUri, photoUri, sourceType,
		accountLabel, accountIcon, features, dataUsage, transcription, durationType,
		@@ -169,7 +169,7 @@ public class PhoneCallDetails implements CallDetailHeader.Data {
		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, int durationType, long accountId, String operator) {
		String transcription, int durationType, int accountId, String operator) {
		this.number = number;
		this.numberPresentation = numberPresentation;
		this.formattedNumber = formattedNumber;
		@@ -235,7 +235,7 @@ public class PhoneCallDetails implements CallDetailHeader.Data {
		return geocode;
		}
		@Override
		public long getAccountId() {
		public int getAccountId() {
		return accountId;
		}
		}

src/com/android/dialer/SpecialCharSequenceMgr.java

+6 −6

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

		// run the query.
		long subId = SubscriptionManager.getDefaultVoiceSubId();
		int subId = SubscriptionManager.from(context).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);
		@@ -291,7 +291,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);
		@@ -308,7 +308,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 (telephonyManager.isMultiSimEnabled()) {
		return handleMSimIMEIDisplay(context, telephonyManager);
		@@ -336,7 +336,7 @@ public class SpecialCharSequenceMgr {
		if (i != 0) {
		deviceIds.append("\n");
		}
		long[] subIds = SubscriptionManager.getSubId(i);
		int[] subIds = SubscriptionManager.getSubId(i);
		int phoneType = telephonyManager.getCurrentPhoneType(subIds[0]);
		if (phoneType != TelephonyManager.PHONE_TYPE_GSM
		&& phoneType != TelephonyManager.PHONE_TYPE_CDMA) {
		@@ -379,7 +379,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);

		@@ -394,7 +394,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/SpeedDialListActivity.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -287,7 +287,7 @@ public class SpeedDialListActivity extends ListActivity implements
		if (position == 0) {
		Intent intent = new Intent(ACTION_ADD_VOICEMAIL);
		if (TelephonyManager.getDefault().getPhoneCount() > 1) {
		long sub = SubscriptionManager.getDefaultVoiceSubId();
		int sub = SubscriptionManager.getDefaultVoiceSubId();
		intent.setClassName("com.android.phone",
		"com.android.phone.MSimCallFeaturesSubSetting");
		intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, sub);
		@@ -340,7 +340,7 @@ public class SpeedDialListActivity extends ListActivity implements
		@Override
		public void onClick(DialogInterface dialog, int which) {
		Intent intent = new Intent(ACTION_ADD_VOICEMAIL);
		long sub = Long.parseLong(accounts[which].getId());
		int sub = Integer.parseInt(accounts[which].getId());
		intent.setClassName("com.android.phone",
		"com.android.phone.MSimCallFeaturesSubSetting");
		intent.putExtra(SUBSCRIPTION_KEY, sub);