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

Commit 7fd0e9c0 authored by Zhengping Jiang's avatar Zhengping Jiang Committed by Android (Google) Code Review
Browse files

Merge "Flag removal: com.android.hardware.input.hid_bluetooth_wakeup" into main

parents 56139acd bc4d4656

core/java/android/hardware/input/input_framework.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -178,13 +178,6 @@ flag { 
    }

}



flag {

    name: "hid_bluetooth_wakeup"

    namespace: "desktop_pnp"

    description: "Allow Bluetooth HID profile connection to fully wake up the device."

    bug: "385357349"

}



flag {

    name: "create_virtual_keyboard_api"

    namespace: "input"

services/core/java/com/android/server/policy/PhoneWindowManager.java

+2 −5
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ import static android.view.WindowManagerGlobal.ADD_PERMISSION_DENIED; 
import static android.view.contentprotection.flags.Flags.createAccessibilityOverlayAppOpEnabled;



import static com.android.hardware.input.Flags.enableNew25q2Keycodes;

import static com.android.hardware.input.Flags.hidBluetoothWakeup;

import static com.android.server.policy.SingleKeyGestureEvent.ACTION_CANCEL;

import static com.android.server.policy.SingleKeyGestureEvent.ACTION_COMPLETE;

import static com.android.server.policy.SingleKeyGestureEvent.ACTION_START;
@@ -2416,10 +2415,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        mContext.registerReceiver(mMultiuserReceiver, filter);



        // register for Bluetooth HID profile broadcasts.

        if (hidBluetoothWakeup()) {

        filter = new IntentFilter(ACTION_CONNECTION_STATE_CHANGED);

        mContext.registerReceiver(mBluetoothHidReceiver, filter);

        }



        mVibrator = (Vibrator) mContext.getSystemService(Context.VIBRATOR_SERVICE);

services/tests/wmtests/src/com/android/server/policy/PhoneWindowManagerTests.java

+0 −2
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import static com.android.dx.mockito.inline.extended.ExtendedMockito.spy; 
import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.verify;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.when;

import static com.android.hardware.input.Flags.FLAG_HID_BLUETOOTH_WAKEUP;

import static com.android.server.policy.PhoneWindowManager.EXTRA_TRIGGER_HUB;

import static com.android.server.policy.PhoneWindowManager.SHORT_PRESS_POWER_DREAM_OR_AWAKE_OR_SLEEP;

import static com.android.server.policy.PhoneWindowManager.SHORT_PRESS_POWER_GO_TO_SLEEP;
@@ -587,7 +586,6 @@ public class PhoneWindowManagerTests { 
    }



    @Test

    @EnableFlags(FLAG_HID_BLUETOOTH_WAKEUP)

    public void testBluetoothHidConnectionBroadcastCanWakeup() {

        when(mContext.getPackageManager()).thenReturn(mPackageManager);

        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_PC)).thenReturn(true);