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

Commit f196e3fe authored by Jay Shrauner's avatar Jay Shrauner Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE when have no phone accounts" into lmp-dev

parents 25f68686 7746a94f

telecomm/java/android/telecomm/RemoteConnection.java

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ public final class RemoteConnection { 
     * @return The children of this {@code RemoteConnection} if this {@code RemoteConnection} is

     * a conference, or an empty {@code List} otherwise.

     */

    public List<RemoteConnection> getChildren() { return null; }

    public List<RemoteConnection> getChildren() { return new ArrayList<>(); }



    /**

     * Obtains the state of this {@code RemoteConnection}.

telecomm/java/android/telecomm/TelecommManager.java

+2 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.util.Log; 


import com.android.internal.telecomm.ITelecommService;



import java.util.ArrayList;

import java.util.List;



/**
@@ -298,7 +299,7 @@ public class TelecommManager { 
        } catch (RemoteException e) {

            Log.e(TAG, "Error calling ITelecommService#getOutgoingPhoneAccounts", e);

        }

        return null;

        return new ArrayList<>();

    }



    /**