commit 11f8957f3a603e5109ae15c5386ddbb7d76972ad
author Jonathan Basseri <misterikkit@google.com> Tue May 05 11:57:39 2015 -0700
committer Jonathan Basseri <misterikkit@google.com> Wed May 13 14:59:33 2015 -0700
tree 84d43f1d7f0a19cddf9a87e9912cabe57e4e062a
parent e091e832100c27d6e49569cd13cb8c3ac3cc9153

Add null annotations for getting carrier config.

CarrierConfigLoader does not return null Bundles, so annotate
appropriately.

Change-Id: I437cfafc987827a9200696f1859df239eed7ccd3

src/com/android/phone/CarrierConfigLoader.java

diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index 75acefe..abe05f8 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -20,6 +20,7 @@
 import static android.Manifest.permission.READ_PHONE_STATE;
 import static com.android.internal.telephony.uicc.IccCardProxy.ACTION_INTERNAL_SIM_STATE_CHANGED;
 
+import android.annotation.NonNull;
 import android.app.ActivityManagerNative;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@@ -291,7 +292,7 @@
     }
 
     @Override
-    public PersistableBundle getConfigForSubId(int subId) {
+    public @NonNull PersistableBundle getConfigForSubId(int subId) {
         int phoneId = SubscriptionManager.getPhoneId(subId);
         PersistableBundle retConfig = CarrierConfigManager.getDefaultConfig();
         if (SubscriptionManager.isValidPhoneId(phoneId)) {