Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Change null behavior of getCellBandwidths" into pi-dev am: 9b29e5caa0" into pi-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2018-03-23 20:09:43 +00:00
committed by Android (Google) Code Review
parent f37a1f9817 80e2a4698c
commit 90c04bbcc3
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
telephony/java/android/telephony/ServiceState.java
View File

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