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

Improve satellite category visiblity logic.

Browse Source 
Flag: com.android.settings.flags.satellite_oem_settings_ux_migration
Bug: b/378408877
Test: make pass
Test: manual test
Change-Id: If5df345a631006e7efc41471b6cd6419ca4b3d79
This commit is contained in:
tomhsu
2024-12-06 14:44:26 +00:00
parent 3859a8adaa
commit ef835bb57d
2 changed files with 35 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/com/android/settings/network/telephony/SatelliteSettingsPreferenceCategoryController.java
View File

@@ -16,13 +16,17 @@
package com.android.settings.network.telephony;
import static android.telephony.CarrierConfigManager.KEY_SATELLITE_ATTACH_SUPPORTED_BOOL;
import static android.telephony.CarrierConfigManager.KEY_SATELLITE_ESOS_SUPPORTED_BOOL;
import static android.telephony.NetworkRegistrationInfo.SERVICE_TYPE_DATA;
import static android.telephony.NetworkRegistrationInfo.SERVICE_TYPE_SMS;
import android.content.Context;
import android.os.PersistableBundle;
import android.telephony.TelephonyCallback;
import android.telephony.TelephonyManager;
import android.telephony.satellite.NtnSignalStrength;
import android.telephony.satellite.SatelliteManager;
import android.util.Log;
import androidx.annotation.NonNull;
@@ -34,6 +38,7 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.flags.Flags;
import com.android.settings.network.CarrierConfigCache;
import java.util.Arrays;
import java.util.List;
@@ -43,8 +48,10 @@ public class SatelliteSettingsPreferenceCategoryController
extends TelephonyBasePreferenceController implements DefaultLifecycleObserver {
private static final String TAG = "SatelliteSettingsPrefCategoryCon";
private CarrierConfigCache mCarrierConfigCache;
private SatelliteManager mSatelliteManager;
private PreferenceCategory mPreferenceCategory;
private TelephonyManager mTelephonyManager = null;
private TelephonyManager mTelephonyManager;
@VisibleForTesting
final CarrierRoamingNtnModeCallback mCarrierRoamingNtnModeCallback =
@@ -52,7 +59,8 @@ public class SatelliteSettingsPreferenceCategoryController
public SatelliteSettingsPreferenceCategoryController(Context context, String key) {
super(context, key);
setAvailabilityStatus(UNSUPPORTED_ON_DEVICE);
mCarrierConfigCache = CarrierConfigCache.getInstance(context);
mSatelliteManager = context.getSystemService(SatelliteManager.class);
mTelephonyManager = context.getSystemService(TelephonyManager.class);
}
@@ -71,19 +79,29 @@ public class SatelliteSettingsPreferenceCategoryController
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mPreferenceCategory = screen.findPreference(getPreferenceKey());
if (mPreferenceCategory.getPreferenceCount() > 0) {
for (int i = 0; i < mPreferenceCategory.getPreferenceCount(); i++) {
if (mPreferenceCategory.getPreference(i).isVisible()) {
setAvailabilityStatus(AVAILABLE_UNSEARCHABLE);
break;
}
}
}
}
@Override
public int getAvailabilityStatus(int subId) {
return isAvailable() ? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE;
if (!com.android.internal.telephony.flags.Flags.carrierEnabledSatelliteFlag()) {
return UNSUPPORTED_ON_DEVICE;
}
if (mSatelliteManager == null) {
return UNSUPPORTED_ON_DEVICE;
}
final PersistableBundle carrierConfig = mCarrierConfigCache.getConfigForSubId(subId);
final boolean isSatelliteAttachSupported = carrierConfig.getBoolean(
KEY_SATELLITE_ATTACH_SUPPORTED_BOOL);
boolean isSatelliteSosSupported = false;
if (Flags.satelliteOemSettingsUxMigration()) {
isSatelliteSosSupported = carrierConfig.getBoolean(
KEY_SATELLITE_ESOS_SUPPORTED_BOOL);
}
return (isSatelliteAttachSupported || isSatelliteSosSupported)
? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE;
}
@Override