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

Merge "Add activity expose condition for Satellite messaging activity" into main

Browse Source
This commit is contained in:
Hakjun Choi
2024-05-17 07:16:23 +00:00
committed by Android (Google) Code Review
parent d005d01a12 2bc6d77cbf
commit f0d2581cd3
1 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/com/android/settings/network/telephony/SatelliteSetting.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.network.telephony;
import static android.telephony.CarrierConfigManager.KEY_SATELLITE_ATTACH_SUPPORTED_BOOL;
import static android.telephony.CarrierConfigManager.KEY_SATELLITE_INFORMATION_REDIRECT_URL_STRING;
import android.app.Activity;
@@ -43,6 +44,7 @@ import androidx.annotation.Nullable;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import com.android.internal.telephony.flags.Flags;
import com.android.settings.R;
import com.android.settings.dashboard.RestrictedDashboardFragment;
import com.android.settingslib.HelpUtils;
@@ -82,12 +84,27 @@ public class SatelliteSetting extends RestrictedDashboardFragment {
public void onCreate(@NonNull Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// In case carrier roaming satellite is not supported, do nothing.
if (!Flags.carrierEnabledSatelliteFlag()) {
Log.d(TAG, "SatelliteSettings: satellite feature is not supported, do nothing.");
finish();
return;
}
mActivity = getActivity();
mTelephonymanager = mActivity.getSystemService(TelephonyManager.class);
mCarrierConfigManager = mActivity.getSystemService(CarrierConfigManager.class);
mSatelliteManager = mActivity.getSystemService(SatelliteManager.class);
mSubId = mActivity.getIntent().getIntExtra(SUB_ID,
SubscriptionManager.INVALID_SUBSCRIPTION_ID);
mCarrierConfigManager = mActivity.getSystemService(CarrierConfigManager.class);
if (!isSatelliteAttachSupported(mSubId)) {
Log.d(TAG, "SatelliteSettings: KEY_SATELLITE_ATTACH_SUPPORTED_BOOL is false, "
+ "do nothing.");
finish();
return;
}
mTelephonymanager = mActivity.getSystemService(TelephonyManager.class);
mSatelliteManager = mActivity.getSystemService(SatelliteManager.class);
}
@Override
@@ -211,6 +228,16 @@ public class SatelliteSetting extends RestrictedDashboardFragment {
return mConfigBundle.getString(KEY_SATELLITE_INFORMATION_REDIRECT_URL_STRING, "");
}
private boolean isSatelliteAttachSupported(int subId) {
PersistableBundle bundle = mCarrierConfigManager.getConfigForSubId(subId,
KEY_SATELLITE_ATTACH_SUPPORTED_BOOL);
if (bundle.isEmpty()) {
Log.d(TAG, "SatelliteSettings: getDefaultConfig");
bundle = CarrierConfigManager.getDefaultConfig();
}
return bundle.getBoolean(KEY_SATELLITE_ATTACH_SUPPORTED_BOOL, false);
}
private static void loge(String message) {
Log.e(TAG, message);
}