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

Commit 8bdd6d10 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6492800 from 9adccca5 to rvc-release

Change-Id: I8fb534ce2e8e86d79d6c4b9d67cb8eb8cff8f0fe
parents 313ec83a 9adccca5
Loading
Loading
Loading
Loading
+22 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2020 The Android Open Source Project

     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.
-->

<!-- This is the standard feature indicating device controls support on the device,
     as specified in the CDD. ONLY devices that meet the CDD's requirements may
     declare this feature. -->
<permissions>
    <feature name="android.software.controls" />
</permissions>
+3 −0
Original line number Diff line number Diff line
@@ -59,6 +59,9 @@
    <!-- Feature to specify if the device support managed users. -->
    <feature name="android.software.managed_users" notLowRam="true"/>

    <!-- Feature to specify if the device supports controls. -->
    <feature name="android.software.controls" />

    <!-- Devices with all optimizations required to support VR Mode and
         pass all CDD requirements for this feature may include
         android.hardware.vr.high_performance -->
+3 −0
Original line number Diff line number Diff line
@@ -59,6 +59,9 @@
    <!-- Feature to specify if the device support managed users. -->
    <feature name="android.software.managed_users" />

    <!-- Feature to specify if the device supports controls. -->
    <feature name="android.software.controls" />

    <!-- devices with GPS must include android.hardware.location.gps.xml -->
    <!-- devices with a rear-facing camera must include one of these as appropriate:
         android.hardware.camera.xml or
+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ static std::string motionActionToString(int32_t action) {
            return "MOVE";
        case AMOTION_EVENT_ACTION_UP:
            return "UP";
        case AMOTION_EVENT_ACTION_CANCEL:
            return "CANCEL";
        case AMOTION_EVENT_ACTION_POINTER_DOWN:
            return "POINTER_DOWN";
        case AMOTION_EVENT_ACTION_POINTER_UP:
@@ -57,6 +59,7 @@ static std::string keyActionToString(int32_t action) {
    }
    return StringPrintf("%" PRId32, action);
}

VerifiedKeyEvent verifiedKeyEventFromKeyEntry(const KeyEntry& entry) {
    return {{VerifiedInputEvent::Type::KEY, entry.deviceId, entry.eventTime, entry.source,
             entry.displayId},
+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@
#include <input/Input.h>
#include <input/TouchVideoFrame.h>
#include <utils/RefBase.h>
#include <utils/Vector.h>

namespace android {

Loading