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

Snap for 10313683 from e5ebbd4ef1 to udc-qpr1-release

Browse Source 
Change-Id: I34f70c9d11e85cc9e3a55c58436f94cb22721968
This commit is contained in:
Android Build Coastguard Worker
2023-06-14 02:44:15 +00:00
parent bf5abc3264 e5ebbd4ef1
commit 627b6f3f58
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/network/telephony/MmsMessagePreferenceController.java
View File

@@ -31,21 +31,19 @@ import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop; import com.android.settingslib.core.lifecycle.events.OnStop;
/** /**
* Preference controller for "Mobile data" * Preference controller for "MMS messages"
*/ */
public class MmsMessagePreferenceController extends TelephonyTogglePreferenceController implements public class MmsMessagePreferenceController extends TelephonyTogglePreferenceController implements
LifecycleObserver, OnStart, OnStop { LifecycleObserver, OnStart, OnStop {
private TelephonyManager mTelephonyManager; private TelephonyManager mTelephonyManager;
private SubscriptionManager mSubscriptionManager;
private MobileDataContentObserver mMobileDataContentObserver; private MobileDataContentObserver mMobileDataContentObserver;
private PreferenceScreen mScreen; private PreferenceScreen mScreen;
public MmsMessagePreferenceController(Context context, String key) { public MmsMessagePreferenceController(Context context, String key) {
super(context, key); super(context, key);
mSubscriptionManager = context.getSystemService(SubscriptionManager.class);
mMobileDataContentObserver = new MobileDataContentObserver( mMobileDataContentObserver = new MobileDataContentObserver(
new Handler(Looper.getMainLooper())); new Handler(Looper.getMainLooper()));
mMobileDataContentObserver.setOnMobileDataChangedListener(()->refreshPreference()); mMobileDataContentObserver.setOnMobileDataChangedListener(() -> refreshPreference());
} }
@Override @Override
@@ -88,12 +86,15 @@ public class MmsMessagePreferenceController extends TelephonyTogglePreferenceCon
@Override @Override
public boolean setChecked(boolean isChecked) { public boolean setChecked(boolean isChecked) {
if (mTelephonyManager == null) {
return false;
}
mTelephonyManager.setMobileDataPolicyEnabled( mTelephonyManager.setMobileDataPolicyEnabled(
TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED, isChecked); TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED, isChecked);
return isChecked == mTelephonyManager.isMobileDataPolicyEnabled( return true;
TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED);
} }
@Override @Override
public boolean isChecked() { public boolean isChecked() {
return mTelephonyManager != null && mTelephonyManager.isDataEnabledForApn( return mTelephonyManager != null && mTelephonyManager.isDataEnabledForApn(

1
src/com/android/settings/users/UserSettings.java
View File

@@ -885,7 +885,6 @@ public class UserSettings extends SettingsPreferenceFragment
this::startActivityForResult, this::startActivityForResult,
userIcon, userIcon,
user.name, user.name,
getString(com.android.settingslib.R.string.profile_info_settings_title),
(newUserName, newUserIcon) -> { (newUserName, newUserIcon) -> {
if (newUserIcon != userIcon) { if (newUserIcon != userIcon) {
ThreadUtils.postOnBackgroundThread(() -> ThreadUtils.postOnBackgroundThread(() ->