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

API fix: getProprietaryCallExtras should not return null

Browse Source 
Bug: 149216142
Fixes: 151172594
Test: atest CtsTelephonyTestCases
Merged-In: I7bd0d44f08169d41396a8cb202f3928e14bc5939
Change-Id: I7bd0d44f08169d41396a8cb202f3928e14bc5939
This commit is contained in:
Brad Ebinger
2020-03-06 14:05:16 -08:00
parent 54af9046ac
commit 72e3eef33c
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -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);

2
api/test-current.txt
View File

@@ -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);

12
telephony/java/android/telephony/ims/ImsCallProfile.java
View File

@@ -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();
}
return mCallExtras.getBundle(EXTRA_OEM_EXTRAS);
Bundle proprietaryExtras = mCallExtras.getBundle(EXTRA_OEM_EXTRAS);
if (proprietaryExtras == null) {
return new Bundle();
}
// Make a copy so users do not accidentally change this copy of the extras.
return new Bundle(proprietaryExtras);
}
public ImsStreamMediaProfile getMediaProfile() {