diff options
| author | 2018-03-23 21:06:45 +0000 | |
|---|---|---|
| committer | 2018-03-23 21:06:45 +0000 | |
| commit | d3e1c76a993437c54f1b7b6b981ece9e1fd43f7d (patch) | |
| tree | 1d8178dcecdf78e9869cd360ae7c93c32e9ae71a | |
| parent | ca7ce49ecc31c17b4e4c51fc4fe0065b7979286b (diff) | |
| parent | 4e93e44115a9a9c86dff8bb88be35520df4a7659 (diff) | |
Merge "Change null behavior of getCellBandwidths"
| -rw-r--r-- | telephony/java/android/telephony/ServiceState.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java index 9c831b9be0dd..e971d08aae7a 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 @@ public class ServiceState implements Parcelable { * * @return Current serving cell bandwidths */ - @Nullable public int[] getCellBandwidths() { - return mCellBandwidths; + return mCellBandwidths == null ? new int[0] : mCellBandwidths; } /** |