Merge "SystemUI: Use sysprop as API for telephony props" (1bc0e603) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java

+3 −5

Original line number	Diff line number	Diff line
		@@ -52,6 +52,7 @@ import android.os.Vibrator;
		import android.provider.Settings;
		import android.service.dreams.DreamService;
		import android.service.dreams.IDreamManager;
		import android.sysprop.TelephonyProperties;
		import android.telecom.TelecomManager;
		import android.telephony.PhoneStateListener;
		import android.telephony.ServiceState;
		@@ -81,7 +82,6 @@ import com.android.internal.logging.MetricsLogger;
		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.internal.statusbar.IStatusBarService;
		import com.android.internal.telephony.TelephonyIntents;
		import com.android.internal.telephony.TelephonyProperties;
		import com.android.internal.util.EmergencyAffordanceManager;
		import com.android.internal.util.ScreenRecordHelper;
		import com.android.internal.util.ScreenshotHelper;
		@@ -310,8 +310,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
		R.string.global_actions_airplane_mode_off_status) {

		void onToggle(boolean on) {
		if (mHasTelephony && Boolean.parseBoolean(
		SystemProperties.get(TelephonyProperties.PROPERTY_INECM_MODE))) {
		if (mHasTelephony && TelephonyProperties.in_ecm_mode().orElse(false)) {
		mIsWaitingForEcmExit = true;
		// Launch ECM exit dialog
		Intent ecmDialogIntent =
		@@ -328,8 +327,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
		if (!mHasTelephony) return;

		// In ECM mode airplane state cannot be changed
		if (!(Boolean.parseBoolean(
		SystemProperties.get(TelephonyProperties.PROPERTY_INECM_MODE)))) {
		if (!TelephonyProperties.in_ecm_mode().orElse(false)) {
		mState = buttonOn ? State.TurningOn : State.TurningOff;
		mAirplaneState = mState;
		}

packages/SystemUI/src/com/android/systemui/qs/tiles/AirplaneModeTile.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -21,17 +21,16 @@ import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.net.ConnectivityManager;
		import android.os.SystemProperties;
		import android.os.UserManager;
		import android.provider.Settings;
		import android.provider.Settings.Global;
		import android.service.quicksettings.Tile;
		import android.sysprop.TelephonyProperties;
		import android.widget.Switch;

		import com.android.internal.logging.MetricsLogger;
		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.internal.telephony.TelephonyIntents;
		import com.android.internal.telephony.TelephonyProperties;
		import com.android.systemui.R;
		import com.android.systemui.broadcast.BroadcastDispatcher;
		import com.android.systemui.plugins.ActivityStarter;
		@@ -75,8 +74,7 @@ public class AirplaneModeTile extends QSTileImpl<BooleanState> {
		public void handleClick() {
		boolean airplaneModeEnabled = mState.value;
		MetricsLogger.action(mContext, getMetricsCategory(), !airplaneModeEnabled);
		if (!airplaneModeEnabled && Boolean.parseBoolean(
		SystemProperties.get(TelephonyProperties.PROPERTY_INECM_MODE))) {
		if (!airplaneModeEnabled && TelephonyProperties.in_ecm_mode().orElse(false)) {
		mActivityStarter.postStartActivityDismissingKeyguard(
		new Intent(TelephonyIntents.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS), 0);
		return;