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

Commit 72e3eef3 authored by Brad Ebinger's avatar Brad Ebinger
Browse files

API fix: getProprietaryCallExtras should not return null

Bug: 149216142
Fixes: 151172594
Test: atest CtsTelephonyTestCases
Merged-In: I7bd0d44f08169d41396a8cb202f3928e14bc5939
Change-Id: I7bd0d44f08169d41396a8cb202f3928e14bc5939
parent 54af9046
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -9783,7 +9783,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);
+1 −1
Original line number Diff line number Diff line
@@ -3326,7 +3326,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);
+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() {