Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topics "pdcs_builder", "pdcs_cleanup", "refactor_pdcs", "remove_apn_name_types", "transport_type_and_id" am: 24f4fce2df am: 61fa631cdd am: 5a7ce86bc2

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1438018

Change-Id: I5199796e48dc37fdeae9be98c71a3a5c40f14079
This commit is contained in:
Jack Yu
2020-09-25 07:20:21 +00:00
committed by Automerger Merge Worker
parent 74c958e231 5a7ce86bc2
commit 2bccbbd121
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/TelephonyRegistry.java
View File

@@ -1743,6 +1743,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
preciseState.getApnSetting()); preciseState.getApnSetting());
PreciseDataConnectionState oldState = mPreciseDataConnectionStates.get(phoneId) PreciseDataConnectionState oldState = mPreciseDataConnectionStates.get(phoneId)
.remove(key); .remove(key);
log("Jack: oldState=" + oldState);
log("Jack: newState=" + preciseState);
if (!Objects.equals(oldState, preciseState)) { if (!Objects.equals(oldState, preciseState)) {
for (Record r : mRecords) { for (Record r : mRecords) {
if (r.matchPhoneStateListenerEvent( if (r.matchPhoneStateListenerEvent(

14
telephony/java/android/telephony/data/ApnSetting.java
View File

@@ -1214,12 +1214,16 @@ public class ApnSetting implements Parcelable {
return false; return false;
} }
// TODO - if we have this function we should also have hashCode. @Override
// Also should handle changes in type order and perhaps case-insensitivity. public int hashCode() {
return Objects.hash(mApnName, mProxyAddress, mProxyPort, mMmsc, mMmsProxyAddress,
mMmsProxyPort, mUser, mPassword, mAuthType, mApnTypeBitmask, mId, mOperatorNumeric,
mProtocol, mRoamingProtocol, mMtu, mCarrierEnabled, mNetworkTypeBitmask, mProfileId,
mPersistent, mMaxConns, mWaitTime, mMaxConnsTime, mMvnoType, mMvnoMatchData,
mApnSetId, mCarrierId, mSkip464Xlat);
}
/** @Override
* @hide
*/
public boolean equals(Object o) { public boolean equals(Object o) {
if (o instanceof ApnSetting == false) { if (o instanceof ApnSetting == false) {
return false; return false;