Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix createLaunchEmergencyDialerIntent API behavior when Telecom unavailable."

Browse Source
This commit is contained in:
Tyler Gunn
2020-08-12 18:27:18 +00:00
committed by Gerrit Code Review
parent 49c52755d2 893a602e61
commit 419c0fa22e
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
telecomm/java/android/telecom/TelecomManager.java
View File

@@ -2202,15 +2202,23 @@ public class TelecomManager {
@NonNull @NonNull
public Intent createLaunchEmergencyDialerIntent(@Nullable String number) { public Intent createLaunchEmergencyDialerIntent(@Nullable String number) {
ITelecomService service = getTelecomService(); ITelecomService service = getTelecomService();
Intent result = null;
if (service != null) { if (service != null) {
try { try {
result = service.createLaunchEmergencyDialerIntent(number); return service.createLaunchEmergencyDialerIntent(number);
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "Error createLaunchEmergencyDialerIntent", 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;
} }
/** /**