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

Commit 162d6a6f authored by Yu Shan's avatar Yu Shan Committed by Sainath Varanasi
Browse files

Update generated lib to backport PER_DISPLAY_MAX_BRIGHTNESS. 

Manually update generated VHAL libs to backport
PER_DISPLAY_MAX_BRIGHTNESS. This is required otherwise it will
be filtered out at DefaultVehicleHal layer if v3 version lib
is used.

Flag: EXEMPT HAL change
Test: Manual test, verify PER_DISPLAY_MAX_BRIGHTNESS is not filtered.
Bug: 361417708
Bug: 391669331
Merged-In: I86f66ed8a9c775e03d7ad65b83d370c97dd38e76
Change-Id: I86f66ed8a9c775e03d7ad65b83d370c97dd38e76
parent 7f320048

automotive/vehicle/aidl/generated_lib/3/cpp/AccessForVehicleProperty.h

+7 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,10 @@ 
#include <aidl/android/hardware/automotive/vehicle/VehicleProperty.h>

#include <aidl/android/hardware/automotive/vehicle/VehicleProperty.h>

#include <aidl/android/hardware/automotive/vehicle/VehiclePropertyAccess.h>

#include <aidl/android/hardware/automotive/vehicle/VehiclePropertyAccess.h>





// Start manual edit: backport PER_DISPLAY_MAX_BRIGHTNESS.

#include <PerDisplayMaxBrightness.h>

// End manual edit: backport PER_DISPLAY_MAX_BRIGHTNESS.



#include <unordered_map>

#include <unordered_map>





namespace aidl {

namespace aidl {
@@ -302,6 +306,9 @@ std::unordered_map<VehicleProperty, VehiclePropertyAccess> AccessForVehiclePrope 
        {VehicleProperty::CROSS_TRAFFIC_MONITORING_WARNING_STATE, VehiclePropertyAccess::READ},

        {VehicleProperty::CROSS_TRAFFIC_MONITORING_WARNING_STATE, VehiclePropertyAccess::READ},

        {VehicleProperty::LOW_SPEED_AUTOMATIC_EMERGENCY_BRAKING_ENABLED, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::LOW_SPEED_AUTOMATIC_EMERGENCY_BRAKING_ENABLED, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::LOW_SPEED_AUTOMATIC_EMERGENCY_BRAKING_STATE, VehiclePropertyAccess::READ},

        {VehicleProperty::LOW_SPEED_AUTOMATIC_EMERGENCY_BRAKING_STATE, VehiclePropertyAccess::READ},

        // Start manual edit: backport PER_DISPLAY_MAX_BRIGHTNESS.

        {PER_DISPLAY_MAX_BRIGHTNESS, VehiclePropertyAccess::READ},

        // End manual edit: backport PER_DISPLAY_MAX_BRIGHTNESS.

};

};





}  // namespace vehicle

}  // namespace vehicle

automotive/vehicle/aidl/generated_lib/3/cpp/ChangeModeForVehicleProperty.h

+7 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,10 @@ 
#include <aidl/android/hardware/automotive/vehicle/VehicleProperty.h>

#include <aidl/android/hardware/automotive/vehicle/VehicleProperty.h>

#include <aidl/android/hardware/automotive/vehicle/VehiclePropertyChangeMode.h>

#include <aidl/android/hardware/automotive/vehicle/VehiclePropertyChangeMode.h>





// Start manual edit: backport PER_DISPLAY_MAX_BRIGHTNESS.

#include <PerDisplayMaxBrightness.h>

// End manual edit: backport PER_DISPLAY_MAX_BRIGHTNESS.



#include <unordered_map>

#include <unordered_map>





namespace aidl {

namespace aidl {
@@ -302,6 +306,9 @@ std::unordered_map<VehicleProperty, VehiclePropertyChangeMode> ChangeModeForVehi 
        {VehicleProperty::CROSS_TRAFFIC_MONITORING_WARNING_STATE, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::CROSS_TRAFFIC_MONITORING_WARNING_STATE, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::LOW_SPEED_AUTOMATIC_EMERGENCY_BRAKING_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::LOW_SPEED_AUTOMATIC_EMERGENCY_BRAKING_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::LOW_SPEED_AUTOMATIC_EMERGENCY_BRAKING_STATE, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::LOW_SPEED_AUTOMATIC_EMERGENCY_BRAKING_STATE, VehiclePropertyChangeMode::ON_CHANGE},

        // Start manual edit: backport PER_DISPLAY_MAX_BRIGHTNESS.

        {PER_DISPLAY_MAX_BRIGHTNESS, VehiclePropertyChangeMode::STATIC},

        // End manual edit: backport PER_DISPLAY_MAX_BRIGHTNESS.

};

};





}  // namespace vehicle

}  // namespace vehicle

automotive/vehicle/aidl/generated_lib/3/cpp/PerDisplayMaxBrightness.h

0 → 100644
+26 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2024 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.

 */



#pragma once



#include <aidl/android/hardware/automotive/vehicle/VehicleProperty.h>



namespace aidl::android::hardware::automotive::vehicle {



// Same as VehicleProperty::PER_DISPLAY_MAX_BRIGHTNESS as defined in v4.

static constexpr VehicleProperty PER_DISPLAY_MAX_BRIGHTNESS = (VehicleProperty)0x11410F4E;



}  // namespace aidl::android::hardware::automotive::vehicle

automotive/vehicle/aidl/generated_lib/3/cpp/VersionForVehicleProperty.h

+7 −0
Original line number Original line Diff line number Diff line
@@ -26,6 +26,10 @@ 




#include <aidl/android/hardware/automotive/vehicle/VehicleProperty.h>

#include <aidl/android/hardware/automotive/vehicle/VehicleProperty.h>





// Start manual edit: backport PER_DISPLAY_MAX_BRIGHTNESS.

#include <PerDisplayMaxBrightness.h>

// End manual edit: backport PER_DISPLAY_MAX_BRIGHTNESS.



#include <unordered_map>

#include <unordered_map>





namespace aidl {

namespace aidl {
@@ -301,6 +305,9 @@ std::unordered_map<VehicleProperty, int32_t> VersionForVehicleProperty = { 
        {VehicleProperty::CROSS_TRAFFIC_MONITORING_WARNING_STATE, 3},

        {VehicleProperty::CROSS_TRAFFIC_MONITORING_WARNING_STATE, 3},

        {VehicleProperty::LOW_SPEED_AUTOMATIC_EMERGENCY_BRAKING_ENABLED, 3},

        {VehicleProperty::LOW_SPEED_AUTOMATIC_EMERGENCY_BRAKING_ENABLED, 3},

        {VehicleProperty::LOW_SPEED_AUTOMATIC_EMERGENCY_BRAKING_STATE, 3},

        {VehicleProperty::LOW_SPEED_AUTOMATIC_EMERGENCY_BRAKING_STATE, 3},

        // Start manual edit: backport PER_DISPLAY_MAX_BRIGHTNESS.

        {PER_DISPLAY_MAX_BRIGHTNESS, 2},

        // End manual edit: backport PER_DISPLAY_MAX_BRIGHTNESS.

};

};





}  // namespace vehicle

}  // namespace vehicle

automotive/vehicle/aidl/generated_lib/3/java/AccessForVehicleProperty.java

+8 −1
Original line number Original line Diff line number Diff line
@@ -28,6 +28,10 @@ import java.util.Map; 




public final class AccessForVehicleProperty {

public final class AccessForVehicleProperty {





    // Start manual edit: backport PER_DISPLAY_MAX_BRIGHTNESS.

    private static final int PER_DISPLAY_MAX_BRIGHTNESS = 0x11410F4E;

    // End manual edit: backport PER_DISPLAY_MAX_BRIGHTNESS.



    public static final Map<Integer, Integer> values = Map.ofEntries(

    public static final Map<Integer, Integer> values = Map.ofEntries(

        Map.entry(VehicleProperty.INFO_VIN, VehiclePropertyAccess.READ),

        Map.entry(VehicleProperty.INFO_VIN, VehiclePropertyAccess.READ),

        Map.entry(VehicleProperty.INFO_MAKE, VehiclePropertyAccess.READ),

        Map.entry(VehicleProperty.INFO_MAKE, VehiclePropertyAccess.READ),
@@ -294,7 +298,10 @@ public final class AccessForVehicleProperty { 
        Map.entry(VehicleProperty.CROSS_TRAFFIC_MONITORING_ENABLED, VehiclePropertyAccess.READ_WRITE),

        Map.entry(VehicleProperty.CROSS_TRAFFIC_MONITORING_ENABLED, VehiclePropertyAccess.READ_WRITE),

        Map.entry(VehicleProperty.CROSS_TRAFFIC_MONITORING_WARNING_STATE, VehiclePropertyAccess.READ),

        Map.entry(VehicleProperty.CROSS_TRAFFIC_MONITORING_WARNING_STATE, VehiclePropertyAccess.READ),

        Map.entry(VehicleProperty.LOW_SPEED_AUTOMATIC_EMERGENCY_BRAKING_ENABLED, VehiclePropertyAccess.READ_WRITE),

        Map.entry(VehicleProperty.LOW_SPEED_AUTOMATIC_EMERGENCY_BRAKING_ENABLED, VehiclePropertyAccess.READ_WRITE),

        Map.entry(VehicleProperty.LOW_SPEED_AUTOMATIC_EMERGENCY_BRAKING_STATE, VehiclePropertyAccess.READ)

        Map.entry(VehicleProperty.LOW_SPEED_AUTOMATIC_EMERGENCY_BRAKING_STATE, VehiclePropertyAccess.READ),

        // Start manual edit: backport PER_DISPLAY_MAX_BRIGHTNESS.

        Map.entry(PER_DISPLAY_MAX_BRIGHTNESS, VehiclePropertyAccess.READ)

        // End manual edit: backport PER_DISPLAY_MAX_BRIGHTNESS.

    );

    );





}
 
}