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

Commit b731c3d9 authored by Jonathan Basseri's avatar Jonathan Basseri
Browse files

Add null annotations for getting carrier config. 

CarrierConfigManager can return null Bundles for carrier config, but
never returns null when getting default values. Add the appropriate
annotations.

Change-Id: Iffbed3b54ca7cc28cf8b04f133aacdf9e6e4fd20
parent 78250907

telephony/java/android/telephony/CarrierConfigManager.java

+5 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package android.telephony; 


import com.android.internal.telephony.ICarrierConfigLoader;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.content.Context;

import android.os.PersistableBundle;
@@ -279,6 +281,7 @@ public class CarrierConfigManager { 
     * @return A {@link PersistableBundle} containing the config for the given subId, or default

     *         values for an invalid subId.

     */

    @Nullable

    public PersistableBundle getConfigForSubId(int subId) {

        try {

            return getICarrierConfigLoader().getConfigForSubId(subId);
@@ -297,6 +300,7 @@ public class CarrierConfigManager { 
     *

     * @see #getConfigForSubId

     */

    @Nullable

    public PersistableBundle getConfig() {

        return getConfigForSubId(SubscriptionManager.getDefaultSubId());

    }
@@ -348,6 +352,7 @@ public class CarrierConfigManager { 
     *

     * @hide

     */

    @NonNull

    @SystemApi

    public static PersistableBundle getDefaultConfig() {

        return new PersistableBundle(sDefaults);