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

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

Snap for 4770446 from edb393d1 to pi-release 

Change-Id: I77b51bfff0aab8be192e37d739b6135374e7b593
parents 0929c55b edb393d1

data/etc/go_handheld_core_hardware.xml

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
    <feature name="android.software.print" />

    <feature name="android.software.companion_device_setup" />

    <feature name="android.software.autofill" />

    <feature name="android.software.cant_save_state" />



    <!-- Feature to specify if the device supports adding device admins. -->

    <feature name="android.software.device_admin" />

data/etc/handheld_core_hardware.xml

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
    <feature name="android.software.print" />

    <feature name="android.software.companion_device_setup" />

    <feature name="android.software.autofill" />

    <feature name="android.software.cant_save_state" />



    <!-- Feature to specify if the device supports adding device admins. -->

    <feature name="android.software.device_admin" />

data/etc/tablet_core_hardware.xml

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
    <feature name="android.software.print" />

    <feature name="android.software.companion_device_setup" />

    <feature name="android.software.autofill" />

    <feature name="android.software.cant_save_state" />



    <!-- Feature to specify if the device supports adding device admins. -->

    <feature name="android.software.device_admin" />

include/android/hardware_buffer_jni.h

+5 −3
Original line number Diff line number Diff line
@@ -31,9 +31,11 @@ __BEGIN_DECLS 


/**

 * Return the AHardwareBuffer associated with a Java HardwareBuffer object,

 * for interacting with it through native code.  This acquires a reference

 * on the AHardwareBuffer that is returned; be sure to use

 * AHardwareBuffer_release() when done with it so that it doesn't leak.

 * for interacting with it through native code. This method does not acquire any

 * additional reference to the AHardwareBuffer that is returned. To keep the

 * AHardwareBuffer live after the Java HardwareBuffer object got garbage

 * collected, be sure to use AHardwareBuffer_acquire() to acquire an additional

 * reference.

 */

AHardwareBuffer* AHardwareBuffer_fromHardwareBuffer(JNIEnv* env,

        jobject hardwareBufferObj);

services/surfaceflinger/DisplayHardware/HWComposer.cpp

+11 −3
Original line number Diff line number Diff line
@@ -596,7 +596,10 @@ status_t HWComposer::setPowerMode(int32_t displayId, int32_t intMode) { 
            ALOGV("setPowerMode: Calling HWC %s", to_string(mode).c_str());

            {

                auto error = hwcDisplay->setPowerMode(mode);

                LOG_HWC_ERROR(("setPowerMode(" + to_string(mode) + ")").c_str(), error, displayId);

                if (error != HWC2::Error::None) {

                    LOG_HWC_ERROR(("setPowerMode(" + to_string(mode) + ")").c_str(),

                                  error, displayId);

                }

            }

            break;

        case HWC2::PowerMode::Doze:
@@ -605,14 +608,19 @@ status_t HWComposer::setPowerMode(int32_t displayId, int32_t intMode) { 
            {

                bool supportsDoze = false;

                auto error = hwcDisplay->supportsDoze(&supportsDoze);

                if (error != HWC2::Error::None) {

                    LOG_HWC_ERROR("supportsDoze", error, displayId);

                }



                if (!supportsDoze) {

                    mode = HWC2::PowerMode::On;

                }



                error = hwcDisplay->setPowerMode(mode);

                LOG_HWC_ERROR(("setPowerMode(" + to_string(mode) + ")").c_str(), error, displayId);

                if (error != HWC2::Error::None) {

                    LOG_HWC_ERROR(("setPowerMode(" + to_string(mode) + ")").c_str(),

                                  error, displayId);

                }

            }

            break;

        default: