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

Moved 5G+ PCO related code to data modules

Browse Source 
Moved the 5G+ PCO logic from NetworkTypeController
to DataNetworkController. Also forward the PCO data to carrier
signal agent.

Fix: 214728781
Test: atest DataNetworkControllerTest DataNetworkTest
Change-Id: I45e453b0cc497d69b85a77855d8c62b52b2e5441
Merged-In: I45e453b0cc497d69b85a77855d8c62b52b2e5441
This commit is contained in:
Jack Yu
2022-01-15 13:16:45 -08:00
committed by Sarah Chin
parent 64eae25b91
commit 05fb389198
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
telephony/java/android/telephony/PcoData.java
View File

@@ -19,6 +19,9 @@ package android.telephony;
import android.os.Parcel;
import android.os.Parcelable;
import java.util.Arrays;
import java.util.Objects;
/**
* Contains Carrier-specific (and opaque) Protocol configuration Option
* Data. In general this is only passed on to carrier-specific applications
@@ -84,4 +87,22 @@ public class PcoData implements Parcelable {
return "PcoData(" + cid + ", " + bearerProto + ", " + pcoId + ", contents[" +
contents.length + "])";
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
PcoData pcoData = (PcoData) o;
return cid == pcoData.cid
&& pcoId == pcoData.pcoId
&& Objects.equals(bearerProto, pcoData.bearerProto)
&& Arrays.equals(contents, pcoData.contents);
}
@Override
public int hashCode() {
int result = Objects.hash(cid, bearerProto, pcoId);
result = 31 * result + Arrays.hashCode(contents);
return result;
}
}

4
telephony/java/android/telephony/data/DataServiceCallback.java
View File

@@ -253,8 +253,10 @@ public class DataServiceCallback {
return "RESULT_ERROR_BUSY";
case RESULT_ERROR_ILLEGAL_STATE:
return "RESULT_ERROR_ILLEGAL_STATE";
case RESULT_ERROR_TEMPORARILY_UNAVAILABLE:
return "RESULT_ERROR_TEMPORARILY_UNAVAILABLE";
default:
return "Missing case for result code=" + resultCode;
return "Unknown(" + resultCode + ")";
}
}