From b731c3d944ccf46b7d0115f63b63eee5ab8abf1a Mon Sep 17 00:00:00 2001
From: Jonathan Basseri <misterikkit@google.com>
Date: Tue, 5 May 2015 12:00:59 -0700
Subject: 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
---
 telephony/java/android/telephony/CarrierConfigManager.java | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'telephony/java')

diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 2caa83c..4941df6 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -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);
-- 
cgit v1.1