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

Commit 5bc9df48 authored by Nathan Harold's avatar Nathan Harold Committed by Android Partner Code Review
Browse files

Merge changes I76b4f0e3,I8a33ea78 into m-wireless-dev 

* changes:
  Adding hidden isVolteEnabled and isWifiCallingEnabled APIs for TelephonyManager
  Revert "resolve merge conflicts of c1e2c651 to m-wireless-dev."
parents f0753125 dee62e55

src/java/com/android/internal/telephony/Phone.java

+1 −0
Original line number Diff line number Diff line
@@ -1994,6 +1994,7 @@ public interface Phone { 
     */

    public boolean isInEcm();



    /**

     * Returns the Status of Wi-Fi Calling

     *@hide

     */

src/java/com/android/internal/telephony/PhoneProxy.java

+1 −0
Original line number Diff line number Diff line
@@ -1530,6 +1530,7 @@ public class PhoneProxy extends Handler implements Phone { 
    @Override

    public boolean isInEcm() {

        return mActivePhone.isInEcm();

    }



    public boolean isVolteEnabled() {

        return mActivePhone.isVolteEnabled();