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

Commit 6762b2bd authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9762093 from 64a756c0 to udc-release 

Change-Id: If9968a08e436f78aa8f123c6fddd3a20233affdf
parents c1ac9d1a 64a756c0

automotive/evs/aidl/aidl_api/android.hardware.automotive.evs/current/android/hardware/automotive/evs/IEvsEnumerator.aidl

+1 −0
Original line number Original line Diff line number Diff line
@@ -47,4 +47,5 @@ interface IEvsEnumerator { 
  android.hardware.automotive.evs.IEvsDisplay openDisplay(in int id);

  android.hardware.automotive.evs.IEvsDisplay openDisplay(in int id);

  android.hardware.automotive.evs.IEvsUltrasonicsArray openUltrasonicsArray(in String ultrasonicsArrayId);

  android.hardware.automotive.evs.IEvsUltrasonicsArray openUltrasonicsArray(in String ultrasonicsArrayId);

  void registerStatusCallback(in android.hardware.automotive.evs.IEvsEnumeratorStatusCallback callback);

  void registerStatusCallback(in android.hardware.automotive.evs.IEvsEnumeratorStatusCallback callback);

  android.hardware.automotive.evs.DisplayState getDisplayStateById(in int id);

}
 
}

automotive/evs/aidl/android/hardware/automotive/evs/IEvsEnumerator.aidl

+19 −4
Original line number Original line Diff line number Diff line
@@ -78,12 +78,12 @@ interface IEvsEnumerator { 
    byte[] getDisplayIdList();

    byte[] getDisplayIdList();





    /**

    /**

     * This call requests the current state of the display

     * This call requests the current state of the primary display

     *

     *

     * If there is no open display, this returns DisplayState::NOT_OPEN. otherwise, it returns

     * If there is no open display, this returns DisplayState::NOT_OPEN. otherwise, it returns

     * the actual state of the active display.  This call is replicated on the IEvsEnumerator

     * the actual state of the active primary display.  This call is replicated on the

     * interface in order to allow secondary clients to monitor the state of the EVS display

     * IEvsEnumerator interface in order to allow secondary clients to monitor the state of the EVS

     * without acquiring exclusive ownership of the display.

     * display without acquiring exclusive ownership of the display.

     *

     *

     * @return Current DisplayState of this Display.

     * @return Current DisplayState of this Display.

     * @throws EvsResult::OWNERSHIP_LOST if current display is inactive

     * @throws EvsResult::OWNERSHIP_LOST if current display is inactive
@@ -163,4 +163,19 @@ interface IEvsEnumerator { 
     * @param in callback IEvsEnumeratorStatusCallback implementation

     * @param in callback IEvsEnumeratorStatusCallback implementation

     */

     */

    void registerStatusCallback(in IEvsEnumeratorStatusCallback callback);

    void registerStatusCallback(in IEvsEnumeratorStatusCallback callback);



    /**

     * This call requests the current state of the display

     *

     * If the requested display is not active, this returns DisplayState::NOT_OPEN. otherwise, it

     * returns the actual state of the active display.  This call is replicated on the

     * IEvsEnumerator interface in order to allow secondary clients to monitor the state of the EVS

     * display without acquiring exclusive ownership of the display.

     *

     * @param in id ID of the requested display.

     * @return Current DisplayState of this Display.

     * @throws EvsResult::OWNERSHIP_LOST if current display is inactive

     *        EvsResult::PERMISSION_DENIED if the process is not permitted to do this operation.

     */

    DisplayState getDisplayStateById(in int id);

}
 
}

automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleProperty.aidl

+4 −0
Original line number Original line Diff line number Diff line
@@ -407,6 +407,10 @@ enum VehicleProperty { 
     * all energy sources in a vehicle.  For example, a hybrid car's range will

     * all energy sources in a vehicle.  For example, a hybrid car's range will

     * be the sum of the ranges based on fuel and battery.

     * be the sum of the ranges based on fuel and battery.

     *

     *

     * This property may be writable because a navigation app could update the range if it has a

     * more accurate estimate based on the upcoming route. However, this property can be set to

     * VehiclePropertyAccess.READ only at the OEM's discretion.

     *

     * @change_mode VehiclePropertyChangeMode.CONTINUOUS

     * @change_mode VehiclePropertyChangeMode.CONTINUOUS

     * @access VehiclePropertyAccess.READ_WRITE

     * @access VehiclePropertyAccess.READ_WRITE

     * @unit VehicleUnit:METER

     * @unit VehicleUnit:METER

security/rkp/aidl/aidl_api/android.hardware.security.rkp/2/.hash

+1 −0
Original line number Original line Diff line number Diff line 
207c9f218b9b9e4e74ff5232eb16511eca9d7d2e

c8d34e56ae0807b61f028019622d8b60a37e0a8b
 
c8d34e56ae0807b61f028019622d8b60a37e0a8b

sensors/common/vts/2_X/VtsHalSensorsV2_XTargetTest.h

+5 −0
Original line number Original line Diff line number Diff line
@@ -559,6 +559,11 @@ TEST_P(SensorsHidlTest, CallInitializeTwice) { 
}

}





TEST_P(SensorsHidlTest, CleanupConnectionsOnInitialize) {

TEST_P(SensorsHidlTest, CleanupConnectionsOnInitialize) {

    if (getSensorsList().size() == 0) {

        // No sensors

        return;

    }



    activateAllSensors(true);

    activateAllSensors(true);





    // Verify that events are received

    // Verify that events are received