From 1efec636c8f9ae15cfd0b911a1f9640358afbbda Mon Sep 17 00:00:00 2001 From: Raman Tenneti Date: Mon, 18 May 2020 15:51:25 -0700 Subject: Updated target SDK from 28 to 29. Merged the following change from internal source: cl/305938566 Do not use EXTRA_IS_HANDOVER for API levels 28 and above When targeting API level 29, this field becomes blacklisted. Since the Handover feature is officially supported via a public API since API level 28, we do not need to check for the internal field when the API level is 28+. go/forrest_run/L11100000565062425 BUG: 143990966 Test: manual and CTS tests. Change-Id: Ib3fda29b4d5714efc52b29f49ca4a9a310584fff --- AndroidManifest.xml | 2 +- assets/quantum/AndroidManifest.xml | 2 +- .../common/compat/telecom/TelecomManagerCompat.java | 17 +++++++++++------ java/com/android/dialer/app/AndroidManifest.xml | 2 +- .../android/dialer/assisteddialing/AndroidManifest.xml | 2 +- .../dialer/assisteddialing/ui/AndroidManifest.xml | 2 +- .../android/dialer/binary/google/AndroidManifest.xml | 2 +- java/com/android/dialer/calllog/AndroidManifest.xml | 2 +- .../android/dialer/calllog/config/AndroidManifest.xml | 2 +- .../android/dialer/promotion/impl/AndroidManifest.xml | 2 +- java/com/android/dialer/shortcuts/AndroidManifest.xml | 2 +- java/com/android/dialer/spannable/AndroidManifest.xml | 2 +- java/com/android/incallui/AndroidManifest.xml | 2 +- .../android/incallui/autoresizetext/AndroidManifest.xml | 2 +- .../android/incallui/video/protocol/AndroidManifest.xml | 2 +- java/com/android/voicemail/AndroidManifest.xml | 2 +- 16 files changed, 26 insertions(+), 21 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9ec517382..00bdd4184 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -21,7 +21,7 @@ + android:targetSdkVersion="29"/> diff --git a/assets/quantum/AndroidManifest.xml b/assets/quantum/AndroidManifest.xml index f57466507..4cfcd97b7 100644 --- a/assets/quantum/AndroidManifest.xml +++ b/assets/quantum/AndroidManifest.xml @@ -16,6 +16,6 @@ --> - + diff --git a/java/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java b/java/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java index ca8ed29ec..a1dc89d75 100644 --- a/java/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java +++ b/java/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java @@ -15,6 +15,8 @@ */ package com.android.contacts.common.compat.telecom; +import android.os.Build.VERSION; +import android.os.Build.VERSION_CODES; import android.support.annotation.Nullable; import android.telecom.PhoneAccountHandle; import android.telecom.TelecomManager; @@ -50,13 +52,16 @@ public class TelecomManagerCompat { return null; } - /** - * Handovers are supported from Android O-DR onward. Since there is no API bump from O to O-DR, we - * need to use reflection to check the existence of TelecomManager.EXTRA_IS_HANDOVER in - * http://cs/android/frameworks/base/telecomm/java/android/telecom/TelecomManager.java. - */ + /** Returns true if the Android version supports Handover. */ public static boolean supportsHandover() { - // + // Starting with Android P, handover is supported via a public API. + if (VERSION.SDK_INT >= VERSION_CODES.P) { + return true; + } + // Handovers are supported from Android O-DR onward. Since there is no API + // bump from O to O-DR, we need to use reflection to check the existence + // of TelecomManager.EXTRA_IS_HANDOVER in + // http://cs/android/frameworks/base/telecomm/java/android/telecom/TelecomManager.java. try { Field field = TelecomManager.class.getDeclaredField("EXTRA_IS_HANDOVER"); return "android.telecom.extra.IS_HANDOVER".equals(field.get(null /* obj (static field) */)); diff --git a/java/com/android/dialer/app/AndroidManifest.xml b/java/com/android/dialer/app/AndroidManifest.xml index 78b50b668..29eacf99e 100644 --- a/java/com/android/dialer/app/AndroidManifest.xml +++ b/java/com/android/dialer/app/AndroidManifest.xml @@ -56,7 +56,7 @@ + android:targetSdkVersion="29"/> diff --git a/java/com/android/dialer/assisteddialing/AndroidManifest.xml b/java/com/android/dialer/assisteddialing/AndroidManifest.xml index 3825c507d..0c2302bba 100644 --- a/java/com/android/dialer/assisteddialing/AndroidManifest.xml +++ b/java/com/android/dialer/assisteddialing/AndroidManifest.xml @@ -17,6 +17,6 @@ + android:targetSdkVersion="29"/> diff --git a/java/com/android/dialer/assisteddialing/ui/AndroidManifest.xml b/java/com/android/dialer/assisteddialing/ui/AndroidManifest.xml index b0a1011d1..63d13fb12 100644 --- a/java/com/android/dialer/assisteddialing/ui/AndroidManifest.xml +++ b/java/com/android/dialer/assisteddialing/ui/AndroidManifest.xml @@ -17,7 +17,7 @@ + android:targetSdkVersion="29"/> + android:targetSdkVersion="29"/> diff --git a/java/com/android/dialer/calllog/AndroidManifest.xml b/java/com/android/dialer/calllog/AndroidManifest.xml index 27e11a0f9..a48723355 100644 --- a/java/com/android/dialer/calllog/AndroidManifest.xml +++ b/java/com/android/dialer/calllog/AndroidManifest.xml @@ -18,7 +18,7 @@ + android:targetSdkVersion="29"/> diff --git a/java/com/android/dialer/calllog/config/AndroidManifest.xml b/java/com/android/dialer/calllog/config/AndroidManifest.xml index 2d447af03..73a0f1f99 100644 --- a/java/com/android/dialer/calllog/config/AndroidManifest.xml +++ b/java/com/android/dialer/calllog/config/AndroidManifest.xml @@ -18,7 +18,7 @@ + android:targetSdkVersion="29"/> diff --git a/java/com/android/dialer/promotion/impl/AndroidManifest.xml b/java/com/android/dialer/promotion/impl/AndroidManifest.xml index c938b9a37..209072bd8 100644 --- a/java/com/android/dialer/promotion/impl/AndroidManifest.xml +++ b/java/com/android/dialer/promotion/impl/AndroidManifest.xml @@ -18,6 +18,6 @@ + android:targetSdkVersion="29"/> diff --git a/java/com/android/dialer/shortcuts/AndroidManifest.xml b/java/com/android/dialer/shortcuts/AndroidManifest.xml index c0f07bf01..826ad9c28 100644 --- a/java/com/android/dialer/shortcuts/AndroidManifest.xml +++ b/java/com/android/dialer/shortcuts/AndroidManifest.xml @@ -18,7 +18,7 @@ + android:targetSdkVersion="29"/> diff --git a/java/com/android/dialer/spannable/AndroidManifest.xml b/java/com/android/dialer/spannable/AndroidManifest.xml index 0b0514477..afc1675a7 100644 --- a/java/com/android/dialer/spannable/AndroidManifest.xml +++ b/java/com/android/dialer/spannable/AndroidManifest.xml @@ -18,5 +18,5 @@ + android:targetSdkVersion="29"/> diff --git a/java/com/android/incallui/AndroidManifest.xml b/java/com/android/incallui/AndroidManifest.xml index 8e69c0dd9..0234f3a04 100644 --- a/java/com/android/incallui/AndroidManifest.xml +++ b/java/com/android/incallui/AndroidManifest.xml @@ -19,7 +19,7 @@ + android:targetSdkVersion="29"/> -- cgit v1.2.3