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

Commit fe733845 authored by Raman Tenneti's avatar Raman Tenneti
Browse files

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
parent c251a5b0

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 


  <uses-sdk

    android:minSdkVersion="24"

    android:targetSdkVersion="28"/>

    android:targetSdkVersion="29"/>



  <uses-permission android:name="android.permission.CALL_PHONE"/>

  <uses-permission android:name="android.permission.READ_CONTACTS"/>

assets/quantum/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ 
  -->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.google.android.assets.quantum">

  <uses-sdk android:targetSdkVersion="28" />

  <uses-sdk android:targetSdkVersion="29" />

  <application/>

</manifest>

java/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java

+11 −6
Original line number Diff line number Diff line
@@ -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) */));

java/com/android/dialer/app/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ 


  <uses-sdk

    android:minSdkVersion="24"

    android:targetSdkVersion="28"/>

    android:targetSdkVersion="29"/>



  <application>

java/com/android/dialer/assisteddialing/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 


  <uses-sdk

      android:minSdkVersion="24"

      android:targetSdkVersion="28"/>

      android:targetSdkVersion="29"/>



</manifest>