Merge "Remove unnecessary null check to make code consistent" into sc-v2-dev am: 559dbb9079

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16418523

Change-Id: Ib895721f70e444c79b66ffd1e4c7905c15094ee8
This commit is contained in:
TreeHugger Robot
2021-12-11 01:44:09 +00:00
committed by Automerger Merge Worker

View File

@@ -878,10 +878,8 @@ public class InternetDialogController implements AccessPointController.AccessPoi
if (accessPoints == null || accessPoints.size() == 0) { if (accessPoints == null || accessPoints.size() == 0) {
mConnectedEntry = null; mConnectedEntry = null;
mWifiEntriesCount = 0; mWifiEntriesCount = 0;
if (mCallback != null) { mCallback.onAccessPointsChanged(null /* wifiEntries */, null /* connectedEntry */,
mCallback.onAccessPointsChanged(null /* wifiEntries */, null /* connectedEntry */, false /* hasMoreEntry */);
false /* hasMoreEntry */);
}
return; return;
} }
@@ -913,9 +911,7 @@ public class InternetDialogController implements AccessPointController.AccessPoi
mConnectedEntry = connectedEntry; mConnectedEntry = connectedEntry;
mWifiEntriesCount = wifiEntries.size(); mWifiEntriesCount = wifiEntries.size();
if (mCallback != null) { mCallback.onAccessPointsChanged(wifiEntries, mConnectedEntry, hasMoreEntry);
mCallback.onAccessPointsChanged(wifiEntries, mConnectedEntry, hasMoreEntry);
}
} }
@Override @Override