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

Commit 3fb65f54 authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Make connection events work for conferences" am: fc538646 am: 7ae228c1 

am: bb171c74

Change-Id: I533eb1d8249bbdce9c9715c80cdf81da568d1987
parents ab2f490f bb171c74

telecomm/java/android/telecom/Conference.java

+11 −0
Original line number Original line Diff line number Diff line
@@ -68,6 +68,7 @@ public abstract class Conference extends Conferenceable { 
        public void onExtrasRemoved(Conference c, List<String> keys) {}

        public void onExtrasRemoved(Conference c, List<String> keys) {}

        public void onConferenceStateChanged(Conference c, boolean isConference) {}

        public void onConferenceStateChanged(Conference c, boolean isConference) {}

        public void onAddressChanged(Conference c, Uri newAddress, int presentation) {}

        public void onAddressChanged(Conference c, Uri newAddress, int presentation) {}

        public void onConnectionEvent(Conference c, String event, Bundle extras) {}

        public void onCallerDisplayNameChanged(

        public void onCallerDisplayNameChanged(

                Conference c, String callerDisplayName, int presentation) {}

                Conference c, String callerDisplayName, int presentation) {}

    }

    }
@@ -1024,4 +1025,14 @@ public abstract class Conference extends Conferenceable { 
        }

        }

        onExtrasChanged(b);

        onExtrasChanged(b);

    }

    }



    /**

     * See {@link Connection#sendConnectionEvent(String, Bundle)}

     * @hide

     */

    public void sendConnectionEvent(String event, Bundle extras) {

        for (Listener l : mListeners) {

            l.onConnectionEvent(this, event, extras);

        }

    }

}
 
}

telecomm/java/android/telecom/ConnectionService.java

+8 −0
Original line number Original line Diff line number Diff line
@@ -1279,6 +1279,14 @@ public abstract class ConnectionService extends Service { 
                mAdapter.setCallerDisplayName(id, callerDisplayName, presentation);

                mAdapter.setCallerDisplayName(id, callerDisplayName, presentation);

            }

            }

        }

        }



        @Override

        public void onConnectionEvent(Conference c, String event, Bundle extras) {

            String id = mIdByConference.get(c);

            if (id != null) {

                mAdapter.onConnectionEvent(id, event, extras);

            }

        }

    };

    };





    private final Connection.Listener mConnectionListener = new Connection.Listener() {

    private final Connection.Listener mConnectionListener = new Connection.Listener() {