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

Commit b4fa96ed authored by Brad Ebinger's avatar Brad Ebinger Committed by Automerger Merge Worker
Browse files

Merge "API fix: getProprietaryCallExtras should not return null" am: 2a15872d am: 5e7477c0 

Change-Id: I4cb251b1a7c54369bda205e6bbfac8ca20746771
parents 9258f353 5e7477c0

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -9716,7 +9716,7 @@ package android.telephony.ims { 
    method public int getEmergencyServiceCategories();

    method @NonNull public java.util.List<java.lang.String> getEmergencyUrns();

    method public android.telephony.ims.ImsStreamMediaProfile getMediaProfile();

    method @Nullable public android.os.Bundle getProprietaryCallExtras();

    method @NonNull public android.os.Bundle getProprietaryCallExtras();

    method public int getRestrictCause();

    method public int getServiceType();

    method public static int getVideoStateFromCallType(int);

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -3328,7 +3328,7 @@ package android.telephony.ims { 
    method public int getEmergencyServiceCategories();

    method @NonNull public java.util.List<java.lang.String> getEmergencyUrns();

    method public android.telephony.ims.ImsStreamMediaProfile getMediaProfile();

    method @Nullable public android.os.Bundle getProprietaryCallExtras();

    method @NonNull public android.os.Bundle getProprietaryCallExtras();

    method public int getRestrictCause();

    method public int getServiceType();

    method public static int getVideoStateFromCallType(int);

telephony/java/android/telephony/ims/ImsCallProfile.java

+8 −4
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package android.telephony.ims; 


import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.compat.annotation.UnsupportedAppUsage;
@@ -721,11 +720,16 @@ public final class ImsCallProfile implements Parcelable { 
     * @return A {@link Bundle} containing proprietary call extras that were not set by the

     * platform.

     */

    public @Nullable Bundle getProprietaryCallExtras() {

    public @NonNull Bundle getProprietaryCallExtras() {

        if (mCallExtras == null) {

            return null;

            return new Bundle();

        }

        Bundle proprietaryExtras = mCallExtras.getBundle(EXTRA_OEM_EXTRAS);

        if (proprietaryExtras == null) {

            return new Bundle();

        }

        return mCallExtras.getBundle(EXTRA_OEM_EXTRAS);

        // Make a copy so users do not accidentally change this copy of the extras.

        return new Bundle(proprietaryExtras);

    }



    public ImsStreamMediaProfile getMediaProfile() {