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

Commit e3051550 authored by Tyler Gunn's avatar Tyler Gunn Committed by Automerger Merge Worker
Browse files

Merge "Fix createLaunchEmergencyDialerIntent API behavior when Telecom unavailable." am: 419c0fa2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392010

Change-Id: Ib3534f85ddc45d21f0cd034c6971162933a2a917
parents befa7e20 419c0fa2
Loading
Loading
Loading
Loading
+11 −3
Original line number Diff line number Diff line
@@ -2202,15 +2202,23 @@ public class TelecomManager {
    @NonNull
    public Intent createLaunchEmergencyDialerIntent(@Nullable String number) {
        ITelecomService service = getTelecomService();
        Intent result = null;
        if (service != null) {
            try {
                result = service.createLaunchEmergencyDialerIntent(number);
                return service.createLaunchEmergencyDialerIntent(number);
            } catch (RemoteException e) {
                Log.e(TAG, "Error createLaunchEmergencyDialerIntent", e);
            }
        } else {
            Log.w(TAG, "createLaunchEmergencyDialerIntent - Telecom service not available.");
        }
        return result;

        // Telecom service knows the package name of the expected emergency dialer package; if it
        // is not available, then fallback to not targeting a specific package.
        Intent intent = new Intent(Intent.ACTION_DIAL_EMERGENCY);
        if (!TextUtils.isEmpty(number) && TextUtils.isDigitsOnly(number)) {
            intent.setData(Uri.fromParts(PhoneAccount.SCHEME_TEL, number, null));
        }
        return intent;
    }

    /**