fixup! Revert "policy: Add support for device alert sliders"

https://review.kaleidoscope.ink/c/1217

This reverts commit a6bd819ea9dad87ecfc79820498d7dc26c47aa3c.

Change-Id: I3dc864cbdc64ec92a082b5d70a8aed5e90e6555d

7 files changed, 55 insertions, 227 deletions

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 28ed9ba3820e..13aa640f1931 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -5183,15 +5183,6 @@ public final class Settings {
         public static final String MULTI_AUDIO_FOCUS_ENABLED = "multi_audio_focus_enabled";
 
         /**
-         * Whether user can swap the order of the Alert Slider.
-         * * Whether user can invert the order of the Alert Slider.
-         * 0: Default
-         * 1: Inverted
-         * @hide
-         */
-        public static final String ALERT_SLIDER_ORDER = "alert_slider_order";
-
-        /**
          * Whether auto brightness is applied one shot when screen is turned on.
          * Default 0
          * @hide
diff --git a/core/res/res/values/ice_config.xml b/core/res/res/values/ice_config.xml
index 898b0692ca0f..464cfc9a02f4 100644
--- a/core/res/res/values/ice_config.xml
+++ b/core/res/res/values/ice_config.xml
@@ -50,10 +50,6 @@
     <!-- Whether device has an alert slider -->
     <bool name="config_hasAlertSlider" translatable="false">false</bool>
 
-    <!-- Path to proc nodes for alert slider -->
-    <string name="alert_slider_state_path" translatable="false"></string>
-    <string name="alert_slider_uevent_match_path" translatable="false"></string>
-
     <!-- The location of the device's alert slider:
          0: Left side
          1: Right side -->
diff --git a/core/res/res/values/ice_symbols.xml b/core/res/res/values/ice_symbols.xml
index a0fe829a1df5..d45d9b62b0f5 100644
--- a/core/res/res/values/ice_symbols.xml
+++ b/core/res/res/values/ice_symbols.xml
@@ -35,8 +35,6 @@
 
     <!-- Alert Slider -->
     <java-symbol type="bool" name="config_hasAlertSlider" />
-    <java-symbol type="string" name="alert_slider_state_path" />
-    <java-symbol type="string" name="alert_slider_uevent_match_path" />
     <java-symbol type="integer" name="config_alertSliderLocation" />
 
 </resources>
diff --git a/packages/SystemUI/src/com/android/systemui/tristate/TriStateUiControllerImpl.java b/packages/SystemUI/src/com/android/systemui/tristate/TriStateUiControllerImpl.java
index 6a74e112d490..3e7b93d77055 100644
--- a/packages/SystemUI/src/com/android/systemui/tristate/TriStateUiControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/tristate/TriStateUiControllerImpl.java
@@ -178,7 +178,8 @@ public class TriStateUiControllerImpl implements ConfigurationListener, TriState
                 checkOrientationType();
             }
         };
-        mVolumeDialogController = (VolumeDialogController) Dependency.get(VolumeDialogController.class);
+        mVolumeDialogController =
+            (VolumeDialogController) Dependency.get(VolumeDialogController.class);
         IntentFilter ringerChanged = new IntentFilter(AudioManager.RINGER_MODE_CHANGED_ACTION);
         mContext.registerReceiver(mRingerStateReceiver, ringerChanged);
     }
@@ -198,13 +199,15 @@ public class TriStateUiControllerImpl implements ConfigurationListener, TriState
         mWindowType = windowType;
         mDensity = mContext.getResources().getConfiguration().densityDpi;
         mListener = listener;
-        ((ConfigurationController) Dependency.get(ConfigurationController.class)).addCallback(this);
+        ((ConfigurationController) Dependency.get(
+                        ConfigurationController.class)).addCallback(this);
         mVolumeDialogController.addCallback(mVolumeDialogCallback, mHandler);
         initDialog();
     }
 
     public void destroy() {
-        ((ConfigurationController) Dependency.get(ConfigurationController.class)).removeCallback(this);
+        ((ConfigurationController) Dependency.get(
+                        ConfigurationController.class)).removeCallback(this);
         mVolumeDialogController.removeCallback(mVolumeDialogCallback);
         mContext.unregisterReceiver(mRingerStateReceiver);
     }
@@ -281,7 +284,8 @@ public class TriStateUiControllerImpl implements ConfigurationListener, TriState
                         textId = R.string.volume_ringer_status_normal;
                         break;
                 }
-                int triStatePos = res.getInteger(com.android.internal.R.integer.config_alertSliderLocation);
+                int triStatePos = res.getInteger(
+                    com.android.internal.R.integer.config_alertSliderLocation);
                 boolean isTsKeyRight = true;
                 if (triStatePos == TRI_STATE_UI_POSITION_LEFT) {
                     isTsKeyRight = false;
@@ -295,16 +299,21 @@ public class TriStateUiControllerImpl implements ConfigurationListener, TriState
                         } else {
                             gravity = 83;
                         }
-                        positionY2 = res.getDimensionPixelSize(R.dimen.tri_state_up_dialog_position_deep_land);
+                        positionY2 = res.getDimensionPixelSize(
+                            R.dimen.tri_state_up_dialog_position_deep_land);
                         if (isTsKeyRight) {
-                            positionY2 += res.getDimensionPixelSize(com.android.internal.R.dimen.status_bar_height);
+                            positionY2 += res.getDimensionPixelSize(
+                                com.android.internal.R.dimen.status_bar_height);
                         }
                         if (mTriStateMode == MODE_SILENT) {
-                            positionX = res.getDimensionPixelSize(R.dimen.tri_state_up_dialog_position_l);
+                            positionX = res.getDimensionPixelSize(
+                                R.dimen.tri_state_up_dialog_position_l);
                         } else if (mTriStateMode == MODE_VIBRATE) {
-                            positionX = res.getDimensionPixelSize(R.dimen.tri_state_middle_dialog_position_l);
+                            positionX = res.getDimensionPixelSize(
+                                R.dimen.tri_state_middle_dialog_position_l);
                         } else if (mTriStateMode == MODE_NORMAL) {
-                            positionX = res.getDimensionPixelSize(R.dimen.tri_state_down_dialog_position_l);
+                            positionX = res.getDimensionPixelSize(
+                                R.dimen.tri_state_down_dialog_position_l);
                         }
                         bg = R.drawable.dialog_tri_state_middle_bg;
                         break;
@@ -314,17 +323,21 @@ public class TriStateUiControllerImpl implements ConfigurationListener, TriState
                         } else {
                             gravity = 85;
                         }
-                        positionX = res.getDimensionPixelSize(R.dimen.tri_state_up_dialog_position_deep);
-                        positionY2 = res.getDimensionPixelSize(com.android.internal.R.dimen.status_bar_height);
+                        positionX = res.getDimensionPixelSize(
+                            R.dimen.tri_state_up_dialog_position_deep);
+                        positionY2 = res.getDimensionPixelSize(
+                            com.android.internal.R.dimen.status_bar_height);
                         bg = R.drawable.dialog_tri_state_middle_bg;
                         if (mTriStateMode != MODE_SILENT) {
                             if (mTriStateMode != MODE_VIBRATE) {
                                 if (mTriStateMode == MODE_NORMAL) {
-                                    positionY2 += res.getDimensionPixelSize(R.dimen.tri_state_down_dialog_position);
+                                    positionY2 += res.getDimensionPixelSize(
+                                                    R.dimen.tri_state_down_dialog_position);
                                     break;
                                 }
                             }
-                            positionY2 += res.getDimensionPixelSize(R.dimen.tri_state_middle_dialog_position);
+                            positionY2 += res.getDimensionPixelSize(
+                                                R.dimen.tri_state_middle_dialog_position);
                             break;
                         }
                         positionY2 += res.getDimensionPixelSize(R.dimen.tri_state_up_dialog_position);
@@ -335,16 +348,21 @@ public class TriStateUiControllerImpl implements ConfigurationListener, TriState
                         } else {
                             gravity = 53;
                         }
-                        positionY2 = res.getDimensionPixelSize(R.dimen.tri_state_up_dialog_position_deep_land);
+                        positionY2 = res.getDimensionPixelSize(
+                                        R.dimen.tri_state_up_dialog_position_deep_land);
                         if (!isTsKeyRight) {
-                            positionY2 += res.getDimensionPixelSize(com.android.internal.R.dimen.status_bar_height);
+                            positionY2 += res.getDimensionPixelSize(
+                                            com.android.internal.R.dimen.status_bar_height);
                         }
                         if (mTriStateMode == MODE_SILENT) {
-                            positionX = res.getDimensionPixelSize(R.dimen.tri_state_up_dialog_position_l);
+                            positionX = res.getDimensionPixelSize(
+                                            R.dimen.tri_state_up_dialog_position_l);
                         } else if (mTriStateMode == MODE_VIBRATE) {
-                            positionX = res.getDimensionPixelSize(R.dimen.tri_state_middle_dialog_position_l);
+                            positionX = res.getDimensionPixelSize(
+                                            R.dimen.tri_state_middle_dialog_position_l);
                         } else if (mTriStateMode == MODE_NORMAL) {
-                            positionX = res.getDimensionPixelSize(R.dimen.tri_state_down_dialog_position_l);
+                            positionX = res.getDimensionPixelSize(
+                                            R.dimen.tri_state_down_dialog_position_l);
                         }
                         bg = R.drawable.dialog_tri_state_middle_bg;
                         break;
@@ -354,20 +372,30 @@ public class TriStateUiControllerImpl implements ConfigurationListener, TriState
                         } else {
                             gravity = 51;
                         }
-                        positionX = res.getDimensionPixelSize(R.dimen.tri_state_up_dialog_position_deep);
+                        positionX = res.getDimensionPixelSize(
+                                        R.dimen.tri_state_up_dialog_position_deep);
                         if (mTriStateMode != MODE_SILENT) {
                             if (mTriStateMode != MODE_VIBRATE) {
                                 if (mTriStateMode == MODE_NORMAL) {
-                                    positionY2 = res.getDimensionPixelSize(R.dimen.tri_state_down_dialog_position) + res.getDimensionPixelSize(com.android.internal.R.dimen.status_bar_height);
+                                    positionY2 = res.getDimensionPixelSize(
+                                        R.dimen.tri_state_down_dialog_position)
+                                        + res.getDimensionPixelSize(
+                                            com.android.internal.R.dimen.status_bar_height);
                                     bg = R.drawable.dialog_tri_state_down_bg;
                                     break;
                                 }
                             }
-                            positionY2 = res.getDimensionPixelSize(R.dimen.tri_state_middle_dialog_position) + res.getDimensionPixelSize(com.android.internal.R.dimen.status_bar_height);
+                            positionY2 = res.getDimensionPixelSize(
+                                R.dimen.tri_state_middle_dialog_position)
+                                + res.getDimensionPixelSize(
+                                    com.android.internal.R.dimen.status_bar_height);
                             bg = R.drawable.dialog_tri_state_middle_bg;
                             break;
                         }
-                        positionY2 = res.getDimensionPixelSize(R.dimen.tri_state_up_dialog_position) + res.getDimensionPixelSize(com.android.internal.R.dimen.status_bar_height);
+                        positionY2 = res.getDimensionPixelSize(
+                            R.dimen.tri_state_up_dialog_position)
+                            + res.getDimensionPixelSize(
+                                com.android.internal.R.dimen.status_bar_height);
                         bg = R.drawable.dialog_tri_state_up_bg;
                         break;
                 }
@@ -447,7 +475,8 @@ public class TriStateUiControllerImpl implements ConfigurationListener, TriState
 
     public void handleResetTimeout() {
         mHandler.removeMessages(MSG_DIALOG_DISMISS);
-        mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_DIALOG_DISMISS, MSG_RESET_SCHEDULE, 0), (long) DIALOG_TIMEOUT);
+        mHandler.sendMessageDelayed(mHandler.obtainMessage(
+                    MSG_DIALOG_DISMISS, MSG_RESET_SCHEDULE, 0), (long) DIALOG_TIMEOUT);
         if (mListener != null) {
             mListener.onTriStateUserActivity();
         }
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index 5e18ecd93f71..c0b58998ddf1 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -146,7 +146,6 @@ import android.view.KeyEvent;
 import android.view.accessibility.AccessibilityManager;
 import android.widget.Toast;
 
-import com.android.internal.R;
 import com.android.internal.annotations.GuardedBy;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.util.DumpUtils;
@@ -784,9 +783,6 @@ public class AudioService extends IAudioService.Stub
     private @AttributeSystemUsage int[] mSupportedSystemUsages =
             new int[]{AudioAttributes.USAGE_CALL_ASSISTANT};
 
-    // Alert Slider
-    private boolean mHasAlertSlider = false;
-
     // Defines the format for the connection "address" for ALSA devices
     public static String makeAlsaAddressString(int card, int device) {
         return "card=" + card + ";device=" + device + ";";
@@ -886,10 +882,6 @@ public class AudioService extends IAudioService.Stub
         mUseVolumeGroupAliases = mContext.getResources().getBoolean(
                 com.android.internal.R.bool.config_handleVolumeAliasesUsingVolumeGroups);
 
-        mHasAlertSlider = mContext.getResources().getBoolean(R.bool.config_hasAlertSlider)
-                && !TextUtils.isEmpty(mContext.getResources().getString(R.string.alert_slider_state_path))
-                && !TextUtils.isEmpty(mContext.getResources().getString(R.string.alert_slider_uevent_match_path));
-
         // Initialize volume
         // Priority 1 - Android Property
         // Priority 2 - Audio Policy Service
@@ -2746,27 +2738,6 @@ public class AudioService extends IAudioService.Stub
             }
         }
 
-        if (mHasAlertSlider) {
-            int volumeType = mStreamVolumeAlias[streamType];
-            VolumeStreamState volumeState = mStreamStates[volumeType];
-            int state = getDeviceForStream(volumeType);
-            int index = volumeState.getIndex(state);
-            int ringerMode = getRingerModeInternal();
-            if ((volumeType == AudioSystem.STREAM_RING)
-                    && (direction == AudioManager.ADJUST_LOWER)
-                    && (index == 0)) {
-                direction = AudioManager.ADJUST_SAME;
-            }
-            if ((ringerMode == AudioManager.RINGER_MODE_SILENT)
-                    && (direction == AudioManager.ADJUST_RAISE
-                    && volumeType != AudioSystem.STREAM_MUSIC
-                    && volumeType != AudioSystem.STREAM_ALARM
-                    && volumeType != AudioSystem.STREAM_VOICE_CALL
-                    && !isInCommunication())) {
-                direction = AudioManager.ADJUST_SAME;
-            }
-        }
-
         final boolean isMute = isMuteAdjust(direction);
 
         ensureValidStreamType(streamType);
diff --git a/services/core/java/com/android/server/policy/AlertSliderObserver.java b/services/core/java/com/android/server/policy/AlertSliderObserver.java
deleted file mode 100644
index d64d744403e1..000000000000
--- a/services/core/java/com/android/server/policy/AlertSliderObserver.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (C) 2021 Paranoid Android
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.server.policy;
-
-import android.app.NotificationManager;
-import android.content.Context;
-import android.media.AudioManager;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.Message;
-import android.os.PowerManager;
-import android.os.PowerManager.WakeLock;
-import android.os.UEventObserver;
-import android.os.UserHandle;
-import android.provider.Settings;
-import android.text.TextUtils;
-import android.util.Log;
-import android.util.Slog;
-
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-
-public class AlertSliderObserver extends UEventObserver {
-    private static final String TAG = AlertSliderObserver.class.getSimpleName();
-    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
-
-    private int mState;
-
-    private final Context mContext;
-    private final AudioManager mAudioManager;
-    private final WakeLock mWakeLock;
-
-    public AlertSliderObserver(Context context) {
-        mContext = context;
-        mAudioManager = context.getSystemService(AudioManager.class);
-        PowerManager pm = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
-        mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "AlertSliderObserver");
-        init();
-    }
-
-    protected void startObserving(int pathId) {
-        String matchPath = mContext.getResources().getString(pathId);
-        if (!TextUtils.isEmpty(matchPath)) {
-            super.startObserving(matchPath);
-        }
-    }
-
-    @Override
-    public void onUEvent(UEventObserver.UEvent event) {
-        if (Log.isLoggable(TAG, Log.VERBOSE)) {
-            Slog.v(TAG, "Switch UEVENT: " + event.toString());
-        }
-
-        try {
-            int state = Integer.parseInt(event.get("SWITCH_STATE"));
-            if (state != mState) {
-                mState = state;
-                update();
-            }
-        } catch (NumberFormatException e) {
-            Slog.e(TAG, "Could not parse switch state from event " + event);
-        }
-    }
-
-    private void init() {
-        try {
-            final String path = mContext.getResources().getString(
-                    com.android.internal.R.string.alert_slider_state_path);
-            FileReader file = new FileReader(path);
-            BufferedReader br = new BufferedReader(file);
-            String value = br.readLine();
-            file.close();
-            br.close();
-            mState = Integer.valueOf(value);
-            update();
-        } catch (IOException e) {
-            Slog.w(TAG, "This device does not have an Alert Slider");
-            stopObserving();
-        }
-    }
-
-    protected void update() {
-        // Acquire wakelock when slider state changes.
-        mWakeLock.acquire();
-        mHandler.sendEmptyMessageDelayed(mState, 100);
-    }
-
-    private Handler mHandler = new Handler(Looper.myLooper(), null, true) {
-        @Override
-        public void handleMessage(Message msg) {
-            final boolean inverted = isOrderInverted();
-            switch (mState) {
-                case 1:
-                    mAudioManager.setRingerModeInternal(AudioManager.RINGER_MODE_SILENT);
-                    break;
-                case 2:
-                    mAudioManager.setRingerModeInternal(AudioManager.RINGER_MODE_VIBRATE);
-                    break;
-                case 3:
-                    mAudioManager.setRingerModeInternal(AudioManager.RINGER_MODE_NORMAL);
-                    break;
-            }
-            if (mWakeLock.isHeld()) {
-                mWakeLock.release();
-            }
-        }
-    };
-
-    // Check if ordered has been set to inverted.
-    private boolean isOrderInverted() {
-        return Settings.System.getIntForUser(
-                    mContext.getContentResolver(), Settings.System.ALERT_SLIDER_ORDER, 0,
-                    UserHandle.USER_CURRENT) != 0;
-    }
-}
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 61097decdefb..fdd2b14cbd22 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -134,7 +134,6 @@ import android.media.AudioManagerInternal;
 import android.media.AudioSystem;
 import android.media.IAudioService;
 import android.media.session.MediaSessionLegacyHelper;
-import android.net.Uri;
 import android.os.Binder;
 import android.os.Bundle;
 import android.os.DeviceIdleManager;
@@ -165,7 +164,6 @@ import android.service.dreams.IDreamManager;
 import android.service.vr.IPersistentVrStateCallbacks;
 import android.speech.RecognizerIntent;
 import android.telecom.TelecomManager;
-import android.text.TextUtils;
 import android.util.Log;
 import android.util.MutableBoolean;
 import android.util.PrintWriterPrinter;
@@ -389,7 +387,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
     AppOpsManager mAppOpsManager;
     PackageManager mPackageManager;
     SideFpsEventHandler mSideFpsEventHandler;
-    AlertSliderObserver mAlertSliderObserver;
     private boolean mHasFeatureAuto;
     private boolean mHasFeatureWatch;
     private boolean mHasFeatureLeanback;
@@ -631,8 +628,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
     private static final int MSG_LAUNCH_ASSIST = 23;
     private static final int MSG_RINGER_TOGGLE_CHORD = 24;
 
-    private boolean mHasAlertSlider = false;
-
     private class PolicyHandler extends Handler {
         @Override
         public void handleMessage(Message msg) {
@@ -727,9 +722,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
     };
 
     class SettingsObserver extends ContentObserver {
-        private final Uri SWAP_ALERT_SLIDER_ORDER_URI =
-                Settings.System.getUriFor(Settings.System.ALERT_SLIDER_ORDER);
-
         SettingsObserver(Handler handler) {
             super(handler);
         }
@@ -776,21 +768,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
             resolver.registerContentObserver(Settings.Global.getUriFor(
                     Settings.Global.POWER_BUTTON_SUPPRESSION_DELAY_AFTER_GESTURE_WAKE), false, this,
                     UserHandle.USER_ALL);
-            resolver.registerContentObserver(Settings.System.getUriFor(
-                    Settings.System.ALERT_SLIDER_ORDER), false, this,
-                    UserHandle.USER_ALL);
             updateSettings();
         }
 
-        @Override
-        public void onChange(boolean selfChange, Uri uri) {
-            if (SWAP_ALERT_SLIDER_ORDER_URI.equals(uri)
-                    && mSystemReady && mAlertSliderObserver != null) {
-                mAlertSliderObserver.update();
-            } else {
-                updateSettings();
-                updateRotation(false);
-            }
+        @Override public void onChange(boolean selfChange) {
+            updateSettings();
+            updateRotation(false);
         }
     }
 
@@ -1676,11 +1659,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
         mWakeOnBackKeyPress =
                 res.getBoolean(com.android.internal.R.bool.config_wakeOnBackKeyPress);
 
-        // Init alert slider
-        mHasAlertSlider = mContext.getResources().getBoolean(R.bool.config_hasAlertSlider)
-                && !TextUtils.isEmpty(mContext.getResources().getString(R.string.alert_slider_state_path))
-                && !TextUtils.isEmpty(mContext.getResources().getString(R.string.alert_slider_uevent_match_path));
-
         // Init display burn-in protection
         boolean burnInProtectionEnabled = context.getResources().getBoolean(
                 com.android.internal.R.bool.config_enableBurnInProtection);
@@ -4812,11 +4790,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
             mVrManagerInternal.addPersistentVrModeStateListener(mPersistentVrModeListener);
         }
 
-        if (mHasAlertSlider) {
-            mAlertSliderObserver = new AlertSliderObserver(mContext);
-            mAlertSliderObserver.startObserving(com.android.internal.R.string.alert_slider_uevent_match_path);
-        }
-
         readCameraLensCoverState();
         updateUiMode();
         mDefaultDisplayRotation.updateOrientationListener();