commit 4e93e44115a9a9c86dff8bb88be35520df4a7659
author Eric Schwarzenbach <easchwar@google.com> Thu Mar 22 13:49:25 2018 -0700
committer Eric Schwarzenbach <easchwar@google.com> Fri Mar 23 12:10:09 2018 -0700
tree 3b5e24dfde5ddc0e95ed97a384da9a2f925b3eb1
parent 0715570648114f4c12134aaadf0877f6d3cf0397

Change null behavior of getCellBandwidths

Returns empty array instead of null when there are
no cell bandwidths.

Bug: 73751023
Test: make, runtest
Change-Id: Idc3f034bbea8f6c3f11dcd125f760b121d2c91d9
Merged-In: Idc3f034bbea8f6c3f11dcd125f760b121d2c91d9
(cherry picked from commit c119a863501cc21bfe4853ad46987a2021041e2b)

telephony/java/android/telephony/ServiceState.java

diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java
index d2e7ae5..473fa5a 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.os.Bundle;
 import android.os.Parcel;
@@ -495,9 +494,8 @@
      *
      * @return Current serving cell bandwidths
      */
-    @Nullable
     public int[] getCellBandwidths() {
-        return mCellBandwidths;
+        return mCellBandwidths == null ? new int[0] : mCellBandwidths;
     }
 
     /**