Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93d1cfe8 authored by Eric Schwarzenbach's avatar Eric Schwarzenbach Committed by android-build-merger
Browse files

Merge "Merge "Change null behavior of getCellBandwidths" into pi-dev am:... 

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

Change-Id: Id682c845ecefb2c547891006e3e8bd383a81bc71
parents af085049 90c04bbc

telephony/java/android/telephony/ServiceState.java

+1 −3
Original line number Original line Diff line number Diff line
@@ -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;

    }

    }





    /**

    /**