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

Commit 265c9d2a authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am fae76f5b: Fix issue #1985502: Sapphire (and any other device) reports that... 

am fae76f5b: Fix issue #1985502: Sapphire (and any other device) reports that it has a hard keyboard

Merge commit 'fae76f5b'

* commit 'fae76f5b':
  Fix issue #1985502: Sapphire (and any other device) reports that it has a hard keyboard
parents b2536b0b fae76f5b

services/java/com/android/server/am/ActivityManagerService.java

+4 −2
Original line number Diff line number Diff line
@@ -11881,10 +11881,12 @@ public final class ActivityManagerService extends ActivityManagerNative implemen 
            config.reqTouchScreen = mConfiguration.touchscreen;

            config.reqKeyboardType = mConfiguration.keyboard;

            config.reqNavigation = mConfiguration.navigation;

            if (mConfiguration.navigation != Configuration.NAVIGATION_NONAV) {

            if (mConfiguration.navigation == Configuration.NAVIGATION_DPAD

                    || mConfiguration.navigation == Configuration.NAVIGATION_TRACKBALL) {

                config.reqInputFeatures |= ConfigurationInfo.INPUT_FEATURE_FIVE_WAY_NAV;

            }

            if (mConfiguration.keyboard != Configuration.KEYBOARD_UNDEFINED) {

            if (mConfiguration.keyboard != Configuration.KEYBOARD_UNDEFINED

                    && mConfiguration.keyboard != Configuration.KEYBOARD_NOKEYS) {

                config.reqInputFeatures |= ConfigurationInfo.INPUT_FEATURE_HARD_KEYBOARD;

            }

        }