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

Merge "Handle null fields when using parcels." into udc-dev

Browse Source
This commit is contained in:
Isaac Katzenelson
2023-05-09 23:45:07 +00:00
committed by Android (Google) Code Review
parent 813b664c00 d02b24ab87
commit 54d0cacacd
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
wifi/java/src/android/net/wifi/sharedconnectivity/app/KnownNetwork.java
View File

@@ -275,7 +275,12 @@ public final class KnownNetwork implements Parcelable {
dest.writeInt(mNetworkSource); dest.writeInt(mNetworkSource);
dest.writeString(mSsid); dest.writeString(mSsid);
dest.writeArraySet(mSecurityTypes); dest.writeArraySet(mSecurityTypes);
mNetworkProviderInfo.writeToParcel(dest, flags); if (mNetworkProviderInfo != null) {
dest.writeBoolean(true);
mNetworkProviderInfo.writeToParcel(dest, flags);
} else {
dest.writeBoolean(false);
}
dest.writeBundle(mExtras); dest.writeBundle(mExtras);
} }
@@ -286,9 +291,15 @@ public final class KnownNetwork implements Parcelable {
*/ */
@NonNull @NonNull
public static KnownNetwork readFromParcel(@NonNull Parcel in) { public static KnownNetwork readFromParcel(@NonNull Parcel in) {
return new KnownNetwork(in.readInt(), in.readString(), int networkSource = in.readInt();
(ArraySet<Integer>) in.readArraySet(null), String mSsid = in.readString();
NetworkProviderInfo.readFromParcel(in), in.readBundle()); ArraySet<Integer> securityTypes = (ArraySet<Integer>) in.readArraySet(null);
if (in.readBoolean()) {
return new KnownNetwork(networkSource, mSsid, securityTypes,
NetworkProviderInfo.readFromParcel(in), in.readBundle());
}
return new KnownNetwork(networkSource, mSsid, securityTypes, null,
in.readBundle());
} }
@NonNull @NonNull

4
wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivitySettingsState.java
View File

@@ -161,7 +161,7 @@ public final class SharedConnectivitySettingsState implements Parcelable {
@Override @Override
public void writeToParcel(@NonNull Parcel dest, int flags) { public void writeToParcel(@NonNull Parcel dest, int flags) {
mInstantTetherSettingsPendingIntent.writeToParcel(dest, 0); PendingIntent.writePendingIntentOrNullToParcel(mInstantTetherSettingsPendingIntent, dest);
dest.writeBoolean(mInstantTetherEnabled); dest.writeBoolean(mInstantTetherEnabled);
dest.writeBundle(mExtras); dest.writeBundle(mExtras);
} }
@@ -173,7 +173,7 @@ public final class SharedConnectivitySettingsState implements Parcelable {
*/ */
@NonNull @NonNull
public static SharedConnectivitySettingsState readFromParcel(@NonNull Parcel in) { public static SharedConnectivitySettingsState readFromParcel(@NonNull Parcel in) {
PendingIntent pendingIntent = PendingIntent.CREATOR.createFromParcel(in); PendingIntent pendingIntent = PendingIntent.readPendingIntentOrNullFromParcel(in);
boolean instantTetherEnabled = in.readBoolean(); boolean instantTetherEnabled = in.readBoolean();
Bundle extras = in.readBundle(); Bundle extras = in.readBundle();
return new SharedConnectivitySettingsState(instantTetherEnabled, pendingIntent, extras); return new SharedConnectivitySettingsState(instantTetherEnabled, pendingIntent, extras);