Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6af0d50a authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Fix issue #2149145: Safe Mode does not work on Sholes device 

The APIs for checking whether keys are held down now also look
at virtual keys.

However it turns out there is less than a second between the time we
start the input thread and check for safe mode, so there is not enough
time to actually open all of the devices and get the data from them
about the finger being down to determine if a virtual key is down.

So now you can also hold DPAD center, trackball center, or s to
enter safe mode.  Also give some vibrator feedback.

Change-Id: I55edce63bc0c375813bd3751766b8070beeb0153
parent aef439e6

core/java/android/view/HapticFeedbackConstants.java

+12 −0
Original line number Diff line number Diff line
@@ -35,6 +35,18 @@ public class HapticFeedbackConstants { 
     */

    public static final int VIRTUAL_KEY = 1;

    

    /**

     * This is a private constant.  Feel free to renumber as desired.

     * @hide

     */

    public static final int SAFE_MODE_DISABLED = 10000;

    

    /**

     * This is a private constant.  Feel free to renumber as desired.

     * @hide

     */

    public static final int SAFE_MODE_ENABLED = 10001;

    

    /**

     * Flag for {@link View#performHapticFeedback(int, int)

     * View.performHapticFeedback(int, int)}: Ignore the setting in the

core/java/android/view/WindowManagerPolicy.java

+1 −1
Original line number Diff line number Diff line
@@ -813,7 +813,7 @@ public interface WindowManagerPolicy { 
            boolean displayEnabled);

    

    /**

     * Called when the system is mostly done booting to dentermine whether

     * Called when the system is mostly done booting to determine whether

     * the system should go into safe mode.

     */

    public boolean detectSafeMode();

core/res/res/values/config.xml

+18 −0
Original line number Diff line number Diff line
@@ -124,6 +124,24 @@ 
        <item>30</item>

    </integer-array>



    <!-- Vibrator pattern for feedback about booting with safe mode disabled -->

    <integer-array name="config_safeModeDisabledVibePattern">

        <item>0</item>

        <item>1</item>

        <item>20</item>

        <item>21</item>

    </integer-array>



    <!-- Vibrator pattern for feedback about booting with safe mode disabled -->

    <integer-array name="config_safeModeEnabledVibePattern">

        <item>0</item>

        <item>1</item>

        <item>20</item>

        <item>21</item>

        <item>500</item>

        <item>600</item>

    </integer-array>



    <bool name="config_use_strict_phone_number_comparation">false</bool>



    <!-- Display low battery warning when battery level dips to this value -->

services/java/com/android/server/KeyInputQueue.java

+52 −4
Original line number Diff line number Diff line
@@ -337,6 +337,54 @@ public abstract class KeyInputQueue { 
        }

    }

    

    public int getScancodeState(int code) {

        synchronized (mFirst) {

            VirtualKey vk = mPressedVirtualKey;

            if (vk != null) {

                if (vk.scancode == code) {

                    return 2;

                }

            }

            return nativeGetScancodeState(code);

        }

    }

    

    public int getScancodeState(int deviceId, int code) {

        synchronized (mFirst) {

            VirtualKey vk = mPressedVirtualKey;

            if (vk != null) {

                if (vk.scancode == code) {

                    return 2;

                }

            }

            return nativeGetScancodeState(deviceId, code);

        }

    }

    

    public int getKeycodeState(int code) {

        synchronized (mFirst) {

            VirtualKey vk = mPressedVirtualKey;

            if (vk != null) {

                if (vk.lastKeycode == code) {

                    return 2;

                }

            }

            return nativeGetKeycodeState(code);

        }

    }

    

    public int getKeycodeState(int deviceId, int code) {

        synchronized (mFirst) {

            VirtualKey vk = mPressedVirtualKey;

            if (vk != null) {

                if (vk.lastKeycode == code) {

                    return 2;

                }

            }

            return nativeGetKeycodeState(deviceId, code);

        }

    }

    

    public static native String getDeviceName(int deviceId);

    public static native int getDeviceClasses(int deviceId);

    public static native void addExcludedDevice(String deviceName);
@@ -344,10 +392,10 @@ public abstract class KeyInputQueue { 
            InputDevice.AbsoluteInfo outInfo);

    public static native int getSwitchState(int sw);

    public static native int getSwitchState(int deviceId, int sw);

    public static native int getScancodeState(int sw);

    public static native int getScancodeState(int deviceId, int sw);

    public static native int getKeycodeState(int sw);

    public static native int getKeycodeState(int deviceId, int sw);

    public static native int nativeGetScancodeState(int code);

    public static native int nativeGetScancodeState(int deviceId, int code);

    public static native int nativeGetKeycodeState(int code);

    public static native int nativeGetKeycodeState(int deviceId, int code);

    public static native int scancodeToKeycode(int deviceId, int scancode);

    public static native boolean hasKeys(int[] keycodes, boolean[] keyExists);

services/java/com/android/server/SystemServer.java

+10 −1
Original line number Diff line number Diff line
@@ -365,8 +365,17 @@ class ServerThread extends Thread { 
        mContentResolver.registerContentObserver(Settings.Secure.getUriFor(Settings.Secure.ADB_ENABLED),

                false, new AdbSettingsObserver());



        // It is now time to start up the app processes...

        // Before things start rolling, be sure we have decided whether

        // we are in safe mode.

        final boolean safeMode = wm.detectSafeMode();

        if (safeMode) {

            try {

                ActivityManagerNative.getDefault().enterSafeMode();

            } catch (RemoteException e) {

            }

        }

        

        // It is now time to start up the app processes...



        if (notification != null) {

            notification.systemReady();