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

Commit 2ae7a47e authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Don't trigger face or active unlock on display group added" into...

Merge "Merge "Don't trigger face or active unlock on display group added" into udc-qpr-dev am: 07702af2" into udc-qpr-dev-plus-aosp am: 65d296db

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24308913



Change-Id: I3bfedbcdf84cf2603c6911b15ec2583f2ebfeb60
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 71c3c882 65d296db
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -687,7 +687,6 @@
        <item>6</item> <!-- WAKE_REASON_WAKE_KEY -->
        <item>7</item> <!-- WAKE_REASON_WAKE_MOTION -->
        <item>9</item> <!-- WAKE_REASON_LID -->
        <item>10</item> <!-- WAKE_REASON_DISPLAY_GROUP_ADDED -->
        <item>12</item> <!-- WAKE_REASON_UNFOLD_DEVICE -->
        <item>15</item> <!-- WAKE_REASON_TAP -->
        <item>16</item> <!-- WAKE_REASON_LIFT -->