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

Commit d4a61663 authored by Nathan Harold's avatar Nathan Harold Committed by android-build-merger
Browse files

Merge "Use Empty List for Default PhysicalChannelConfig" into pi-dev 

am: 6e2ed97e

Change-Id: I1cb14020b2bd87db143aab9b3401379b560df18b
parents 38465c19 6e2ed97e

services/core/java/com/android/server/TelephonyRegistry.java

+1 −1
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { 
            mCallForwarding[i] =  false;

            mCellLocation[i] = new Bundle();

            mCellInfo.add(i, null);

            mPhysicalChannelConfigs.add(i, null);

            mPhysicalChannelConfigs.add(i, new ArrayList<PhysicalChannelConfig>());

        }



        // Note that location can be null for non-phone builds like

telephony/java/android/telephony/PhoneStateListener.java

+3 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.telephony;



import android.annotation.NonNull;

import android.os.Bundle;

import android.os.Handler;

import android.os.Looper;
@@ -583,7 +584,8 @@ public class PhoneStateListener { 
     * @param configs List of the current {@link PhysicalChannelConfig}s

     * @hide

     */

    public void onPhysicalChannelConfigurationChanged(List<PhysicalChannelConfig> configs) {

    public void onPhysicalChannelConfigurationChanged(

            @NonNull List<PhysicalChannelConfig> configs) {

        // default implementation empty

    }