Merge "Fixed that the device crashes when receiving data sms"

                    intent.putExtra("uri", uri.toString());

                }

            }

        } else {

            intent.setAction(Intents.DATA_SMS_RECEIVED_ACTION);

            Uri uri = Uri.parse("sms://localhost:" + destPort);

            intent.setData(uri);

            intent.setComponent(null);

        }

            // Handle app specific sms messages.

            AppSmsManager appManager = mPhone.getAppSmsManager();

            if (appManager.handleSmsReceivedIntent(intent)) {

                // The AppSmsManager handled this intent, we're done.

                dropSms(resultReceiver);

                return;

            }

        } else {

            intent.setAction(Intents.DATA_SMS_RECEIVED_ACTION);

            Uri uri = Uri.parse("sms://localhost:" + destPort);

            intent.setData(uri);

            intent.setComponent(null);

        }

        Bundle options = handleSmsWhitelisting(intent.getComponent());

        dispatchIntent(intent, android.Manifest.permission.RECEIVE_SMS,

                AppOpsManager.OP_RECEIVE_SMS, options, resultReceiver, UserHandle.SYSTEM);

    }

    }

    /**

     * Function to check if message should be dropped because same message has already been