PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Settings] Provide carrier name when manual network select" into rvc-d1-dev am: 65575cfb66

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12281209

Change-Id: I8a3f2baa2d505eaf3e61ad1a5e4022d3b70e0638
This commit is contained in:
Bonian Chen
2020-08-06 11:23:11 +00:00
committed by Automerger Merge Worker
parent 39297cbc9a 65575cfb66
commit ce917cbad0
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/network/telephony/NetworkOperatorPreference.java
View File

@@ -37,6 +37,7 @@ import android.util.Log;
import androidx.preference.Preference; import androidx.preference.Preference;
import com.android.internal.telephony.OperatorInfo;
import com.android.settings.R; import com.android.settings.R;
import java.util.List; import java.util.List;
@@ -175,6 +176,15 @@ public class NetworkOperatorPreference extends Preference {
return CellInfoUtil.getNetworkTitle(mCellId, getOperatorNumeric()); return CellInfoUtil.getNetworkTitle(mCellId, getOperatorNumeric());
} }
/**
* Operator info of this cell
*/
public OperatorInfo getOperatorInfo() {
return new OperatorInfo(Objects.toString(mCellId.getOperatorAlphaLong(), ""),
Objects.toString(mCellId.getOperatorAlphaShort(), ""),
getOperatorNumeric());
}
private int getIconIdForCell(CellInfo ci) { private int getIconIdForCell(CellInfo ci) {
if (ci instanceof CellInfoGsm) { if (ci instanceof CellInfoGsm) {
return R.drawable.signal_strength_g; return R.drawable.signal_strength_g;

5
src/com/android/settings/network/telephony/NetworkSelectSettings.java
View File

@@ -40,6 +40,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceCategory;
import com.android.internal.telephony.OperatorInfo;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.FeatureFactory;
@@ -185,12 +186,12 @@ public class NetworkSelectSettings extends DashboardFragment {
mRequestIdManualNetworkSelect = getNewRequestId(); mRequestIdManualNetworkSelect = getNewRequestId();
mWaitingForNumberOfScanResults = MIN_NUMBER_OF_SCAN_REQUIRED; mWaitingForNumberOfScanResults = MIN_NUMBER_OF_SCAN_REQUIRED;
final String operatorNumeric = mSelectedPreference.getOperatorNumeric(); final OperatorInfo operator = mSelectedPreference.getOperatorInfo();
ThreadUtils.postOnBackgroundThread(() -> { ThreadUtils.postOnBackgroundThread(() -> {
final Message msg = mHandler.obtainMessage( final Message msg = mHandler.obtainMessage(
EVENT_SET_NETWORK_SELECTION_MANUALLY_DONE); EVENT_SET_NETWORK_SELECTION_MANUALLY_DONE);
msg.obj = mTelephonyManager.setNetworkSelectionModeManual( msg.obj = mTelephonyManager.setNetworkSelectionModeManual(
operatorNumeric, true /* persistSelection */); operator, true /* persistSelection */);
msg.sendToTarget(); msg.sendToTarget();
}); });
} }