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

Commit 4cd92835 authored by Vinit Deshpande's avatar Vinit Deshpande
Browse files

Fixing build after merge from mirror-m-wireless-internal-release 

There have been few breaking changes

1. TelecomManager.getCallCapablePhoneAccounts is not hidden anymore
2. CAPABILITY_VIDEO_CALLING is not hidden anymore
3. mPhoneStateListener doesn't exist anymore, so it is commented out

Change-Id: I22221eda73a20c745e316d9d56f914ab17b83533
parent ea76e49e

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -28940,6 +28940,7 @@ package android.telecom { 
    method public void writeToParcel(android.os.Parcel, int);

    field public static final int CAPABILITY_PLACE_EMERGENCY_CALLS = 16; // 0x10

    field public static final int CAPABILITY_SIM_SUBSCRIPTION = 4; // 0x4

    field public static final int CAPABILITY_VIDEO_CALLING = 8; // 0x8

    field public static final android.os.Parcelable.Creator<android.telecom.PhoneAccount> CREATOR;

    field public static final int NO_HIGHLIGHT_COLOR = 0; // 0x0

    field public static final int NO_ICON_TINT = 0; // 0x0
@@ -28977,6 +28978,7 @@ package android.telecom { 














  public class TelecomManager {















    method public void cancelMissedCallsNotification();













    method public java.util.List<android.telecom.PhoneAccountHandle> getCallCapablePhoneAccounts();















    method public android.telecom.PhoneAccount getPhoneAccount(android.telecom.PhoneAccountHandle);















    method public boolean handleMmi(java.lang.String);















    method public boolean isInCall();

























api/system-current.txt



+13
−2




























Original line number
Diff line number
Diff line








@@ -19894,6 +19894,8 @@ package android.net.wifi {













    field public java.util.BitSet allowedKeyManagement;















    field public java.util.BitSet allowedPairwiseCiphers;















    field public java.util.BitSet allowedProtocols;













    field public int apBand;













    field public int apChannel;















    field public java.lang.String creatorName;















    field public int creatorUid;















    field public android.net.wifi.WifiEnterpriseConfig enterpriseConfig;









@@ -19906,6 +19908,8 @@ package android.net.wifi {













    field public int numScorerOverrideAndSwitchedNetwork;















    field public java.lang.String preSharedKey;















    field public int priority;













    field public java.lang.String providerFriendlyName;













    field public java.util.HashSet<java.lang.Long> roamingConsortiumIds;















    field public int status;















    field public java.lang.String[] wepKeys;















    field public int wepTxKeyIndex;










@@ -19978,6 +19982,7 @@ package android.net.wifi {













    ctor public WifiEnterpriseConfig();















    ctor public WifiEnterpriseConfig(android.net.wifi.WifiEnterpriseConfig);















    method public int describeContents();













    method public java.lang.String getAltSubjectMatch();















    method public java.lang.String getAnonymousIdentity();















    method public java.security.cert.X509Certificate getCaCertificate();















    method public java.security.cert.X509Certificate getClientCertificate();









@@ -19985,7 +19990,10 @@ package android.net.wifi {













    method public java.lang.String getIdentity();















    method public java.lang.String getPassword();















    method public int getPhase2Method();













    method public java.lang.String getSubjectMatch();













    method public java.lang.String getPlmn();













    method public java.lang.String getRealm();













    method public deprecated java.lang.String getSubjectMatch();













    method public void setAltSubjectMatch(java.lang.String);















    method public void setAnonymousIdentity(java.lang.String);















    method public void setCaCertificate(java.security.cert.X509Certificate);















    method public void setClientKeyEntry(java.security.PrivateKey, java.security.cert.X509Certificate);









@@ -19993,7 +20001,9 @@ package android.net.wifi {













    method public void setIdentity(java.lang.String);















    method public void setPassword(java.lang.String);















    method public void setPhase2Method(int);













    method public void setSubjectMatch(java.lang.String);













    method public void setPlmn(java.lang.String);













    method public void setRealm(java.lang.String);













    method public deprecated void setSubjectMatch(java.lang.String);















    method public void writeToParcel(android.os.Parcel, int);















    field public static final android.os.Parcelable.Creator<android.net.wifi.WifiEnterpriseConfig> CREATOR;















  }










@@ -31074,6 +31084,7 @@ package android.telecom {













    method public java.util.List<android.telecom.PhoneAccountHandle> getAllPhoneAccountHandles();















    method public java.util.List<android.telecom.PhoneAccount> getAllPhoneAccounts();















    method public int getAllPhoneAccountsCount();













    method public java.util.List<android.telecom.PhoneAccountHandle> getCallCapablePhoneAccounts();















    method public int getCallState();















    method public android.telecom.PhoneAccountHandle getConnectionManager();















    method public android.telecom.PhoneAccountHandle getDefaultOutgoingPhoneAccount(java.lang.String);

























core/java/android/provider/CallLog.java



+0
−10




























Original line number
Diff line number
Diff line








@@ -360,16 +360,6 @@ public class CallLog {













         */















        public static final String PHONE_ACCOUNT_ID = "subscription_id";





























        /**













         * Indicates that the entry will be hidden from all queries until the associated













         * {@link android.telecom.PhoneAccount} is registered with the system.













         * <P>Type: INTEGER</P>













         *













         * @Deprecated













         * @hide













         */













        public static final String PHONE_ACCOUNT_HIDDEN = "phone_account_hidden";





























        /**















         * The address associated with the account used to place or receive the call; in string















         * form. For SIM-based calls, this is the user's own phone number.

































telecomm/java/android/telecom/PhoneAccount.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -93,7 +93,6 @@ public class PhoneAccount implements Parcelable {













     * Flag indicating that this {@code PhoneAccount} is capable of placing video calls.















     * <p>















     * See {@link #getCapabilities}













     * @hide















     */















    @SystemApi















    public static final int CAPABILITY_VIDEO_CALLING = 0x8;

































telecomm/java/android/telecom/TelecomManager.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -519,7 +519,6 @@ public class TelecomManager {













     * @see #EXTRA_PHONE_ACCOUNT_HANDLE















     * @return A list of {@code PhoneAccountHandle} objects.















     *













     * @hide















     */















    public List<PhoneAccountHandle> getCallCapablePhoneAccounts() {















        try {