Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16432720 authored by Sridhar Dubbaka's avatar Sridhar Dubbaka
Browse files

Change subid from long to int type 

Change subid from long to int type.

Change-Id: I589065f128b60237f55db2e7f32467e7509343df
parent 6d3db15f

src/com/android/server/telecom/PhoneAccountRegistrar.java

100644 → 100755
+3 −3
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ public final class PhoneAccountRegistrar { 
    }



    PhoneAccountHandle getUserSelectedVoicePhoneAccount() {

        long voiceSubId = SubscriptionManager.getDefaultVoiceSubId();

        int voiceSubId = SubscriptionManager.getDefaultVoiceSubId();

        boolean isVoicePrompt = SubscriptionManager.isVoicePromptEnabled();

        PhoneAccountHandle prefPhoneAccount = null;
@@ -203,9 +203,9 @@ public final class PhoneAccountRegistrar { 
                   Log.i(this, "getUserSelVoicePhoneAccount, emergency account ");

                   return mState.accounts.get(i).getAccountHandle();

                }

                long subId = voiceSubId;

                int subId = voiceSubId;

                try {

                    subId = Long.parseLong(id);

                    subId = Integer.parseInt(id);

                } catch (NumberFormatException e) {

                    Log.w(this, " NumberFormatException " + e);

                }

src/com/android/server/telecom/RespondViaSmsManager.java

100644 → 100755
+3 −3
Original line number Diff line number Diff line
@@ -144,10 +144,10 @@ public class RespondViaSmsManager extends CallsManagerListenerBase { 
    @Override

    public void onIncomingCallRejected(Call call, boolean rejectWithMessage, String textMessage) {

        if (call != null && rejectWithMessage) {

            long subId = SubscriptionManager.getDefaultSubId();

            int subId = SubscriptionManager.getDefaultSubId();

            if (call.getTargetPhoneAccount() != null) {

                try {

                    subId = Long.parseLong(call.getTargetPhoneAccount().getId());

                    subId = Integer.parseInt(call.getTargetPhoneAccount().getId());

                } catch (NumberFormatException e) {

                    Log.e(RespondViaSmsManager.this, e , "Exception e ");

                }
@@ -188,7 +188,7 @@ public class RespondViaSmsManager extends CallsManagerListenerBase { 
     * Reject the call with the specified message. If message is null this call is ignored.

     */

    private void rejectCallWithMessage(Context context, String phoneNumber, String textMessage,

            long subId) {

            int subId) {

        if (textMessage != null) {

            final ComponentName component =

                    SmsApplication.getDefaultRespondViaMessageApplication(context,

src/com/android/server/telecom/TelecomService.java

100644 → 100755
+1 −1
Original line number Diff line number Diff line
@@ -653,7 +653,7 @@ public class TelecomService extends Service { 
            long token = Binder.clearCallingIdentity();

            String retval = "content://icc/adn/";

            try {

                long subId = mPhoneAccountRegistrar.getSubscriptionIdForPhoneAccount(accountHandle);

                int subId = mPhoneAccountRegistrar.getSubscriptionIdForPhoneAccount(accountHandle);

                retval = retval + "subId/" + subId;

            } finally {

                Binder.restoreCallingIdentity(token);