commit 9b29e5caa0f3733de24862a079135742ca39ce6c
author Eric Schwarzenbach <easchwar@google.com> Fri Mar 23 18:31:43 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 23 18:31:43 2018 +0000
tree 3c195ee4919a45e82b6c0ce5c55ab11ec524c2b6
parent 9753e774ce38bfe7f390f94c267b24c524616a2a
parent c119a863501cc21bfe4853ad46987a2021041e2b

Merge "Change null behavior of getCellBandwidths" into pi-dev

telephony/java/android/telephony/ServiceState.java

diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java
index 9c831b9..e971d08 100644
--- a/telephony/java/android/telephony/ServiceState.java
+++ b/telephony/java/android/telephony/ServiceState.java
@@ -17,7 +17,6 @@
 package android.telephony;
 
 import android.annotation.IntDef;
-import android.annotation.Nullable;
 import android.annotation.SystemApi;
 import android.annotation.TestApi;
 import android.os.Bundle;
@@ -496,9 +495,8 @@
      *
      * @return Current serving cell bandwidths
      */
-    @Nullable
     public int[] getCellBandwidths() {
-        return mCellBandwidths;
+        return mCellBandwidths == null ? new int[0] : mCellBandwidths;
     }
 
     /**