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

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

Snap for 5546586 from e84f442c to qt-release 

Change-Id: Id33ee8c35cbe5f55f195d25519155f195a070cc0
parents 0829e69f e84f442c

current.txt

+5 −5
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ f7d7cb747dc01a9fdb2d39a80003b4d8df9be733d65f5842198802eb6209db69 android.hardwar 
65a021fa89085b62fc96b2b6d3bef2f9103cf4d63379c68bc154fd9eef672852 android.hardware.health@1.0::types

b7ecf29927055ec422ec44bf776223f07d79ad9f92ccf9becf167e62c2607e7a android.hardware.keymaster@4.0::IKeymasterDevice

574e8f1499436fb4075894dcae0b36682427956ecb114f17f1fe22d116a83c6b android.hardware.neuralnetworks@1.0::IPreparedModel

e75759b40a1c5f97b463b30aab91954012c9ea9e454dde308db853a56796e5a6 android.hardware.neuralnetworks@1.0::types

1e3576c07006d82ba5bc6ddbf87c101414d361c41afe7a82713750844c488725 android.hardware.neuralnetworks@1.0::types

eb754b58c93e5591613208b4c972811288b0fa16a82430d602f107c91a908b22 android.hardware.neuralnetworks@1.1::types

1d4a5776614c08b5d794a5ec5ab04697260cbd4b3441d5935cd53ee71d19da02 android.hardware.radio@1.0::IRadioResponse

ed9da80ec0c96991fd03f0a46107815d0e50f764656e49dba4980fa5c31d5bc3 android.hardware.radio@1.0::types
@@ -459,9 +459,9 @@ dffacdbe0bcf8443013de5bdc56a83479ad979d4919ed15a5585539f46091f07 android.hardwar 
5b1f4a4fb88c239e07d76026467a1f2ee0d08f4d52c1805bd93bd7c05e3fe69c android.hardware.drm@1.2::ICryptoFactory

4895f98e9ef210e9acb01982f5d07b654538377e1404b8db5e19e7858835e9d8 android.hardware.drm@1.2::ICryptoPlugin

976116b9033b2c222b940109fdf0ffcc29b77cbe631ef6b4fcc2ad5ce8e605f7 android.hardware.drm@1.2::IDrmFactory

b2efccc6425085f84795a2ca15a09d9a81ffd02f9dc3d30ba21d1a59bdfa253f android.hardware.drm@1.2::IDrmPlugin

39ca9e88404b6c090f7650455a7ed3fdee9cce4e3a356c9d547f8ff02f2e7fc8 android.hardware.drm@1.2::IDrmPluginListener

f27baaa587bc3dd9b740cb6928ab812b9b7d105b5187663938aee578105f3c39 android.hardware.drm@1.2::types

8ef1caf921c3e83a00180f770e3b8e8ff65d8a5c806482e51aa45e6d55f1aec1 android.hardware.drm@1.2::IDrmPlugin

b778fcce93eb6294446a940e1bae0200da7bd97b91b91977be2dcd31ca58374f android.hardware.drm@1.2::IDrmPluginListener

564732cbfe5c0895cfbd2bdf84c3f2b0f760ea20f2237c0d388aaeeaef2dd0a9 android.hardware.drm@1.2::types

44480c912e4ab90b9ed17e56569cd5ca98413a8a2372efb028f4181204b6b73e android.hardware.fastboot@1.0::IFastboot

7b2989744e3c555292d4b5b829acd09a7b40f96ead62ce54174cd959503b64bb android.hardware.fastboot@1.0::types

7f460e795f5d1ed5e378935f98c6db4d39497de988aef1b4c2a4a07a6c400392 android.hardware.gnss@2.0::IAGnss
@@ -515,7 +515,7 @@ b83317b66721241887d2770b5ae95fd5af1e77c5daa7530ecb08fae8892f2b43 android.hardwar 
92714960d1a53fc2ec557302b41c7cc93d2636d8364a44bd0f85be0c92927ff8 android.hardware.neuralnetworks@1.2::IExecutionCallback

36e1064c869965dee533c537cefbe87e54db8bd8cd45be7e0e93e00e8a43863a android.hardware.neuralnetworks@1.2::IPreparedModel

e1c734d1545e1a4ae749ff1dd9704a8e594c59aea7c8363159dc258e93e0df3b android.hardware.neuralnetworks@1.2::IPreparedModelCallback

e3b6176e3bf235c4e0e4e451b0166e396c7ee176cfe167c9147c3d46d7b34f0c android.hardware.neuralnetworks@1.2::types

d18bba0b6c8d2d1da3cfb52b14f556d2e04eb91551d97ee60a3524cf993a3e0e android.hardware.neuralnetworks@1.2::types

cf7a4ba516a638f9b82a249c91fb603042c2d9ca43fd5aad9cf6c0401ed2a5d7 android.hardware.nfc@1.2::INfc

abf98c2ae08bf765db54edc8068e36d52eb558cff6706b6fd7c18c65a1f3fc18 android.hardware.nfc@1.2::types

4cb252dc6372a874aef666b92a6e9529915aa187521a700f0789065c3c702ead android.hardware.power.stats@1.0::IPowerStats

drm/1.2/IDrmPlugin.hal

+18 −0
Original line number Diff line number Diff line
@@ -226,4 +226,22 @@ interface IDrmPlugin extends @1.1::IDrmPlugin { 
     * @param sessionId identifies the session the event originated from

     */

    sendSessionLostState(SessionId sessionId);



    /**

     * Send a keys change event to the listener. The keys change event

     * indicates the status of each key in the session. Keys can be

     * indicated as being usable, expired, outputnotallowed or statuspending.

     *

     * This method only differs from @1.0 version by the addition of new

     * KeyStatusType(s) in keyStatusList.

     *

     * @param sessionId identifies the session the event originated from

     * @param keyStatusList indicates the status for each key ID in the

     * session.

     * @param hasNewUsableKey indicates if the event includes at least one

     * key that has become usable.

     */

    sendKeysChange_1_2(SessionId sessionId, vec<KeyStatus> keyStatusList,

            bool hasNewUsableKey);



};

drm/1.2/IDrmPluginListener.hal

+18 −0
Original line number Diff line number Diff line
@@ -36,4 +36,22 @@ interface IDrmPluginListener extends @1.0::IDrmPluginListener { 
     * @param sessionId identifies the session that has been invalidated

     */

     oneway sendSessionLostState(SessionId sessionId);



    /**

     * Send a keys change event to the listener. The keys change event

     * indicates the status of each key in the session. Keys can be

     * indicated as being usable, expired, outputnotallowed or statuspending.

     *

     * This method only differs from @1.0 version by the addition of new

     * KeyStatusType(s) in keyStatusList.

     *

     * @param sessionId identifies the session the event originated from

     * @param keyStatusList indicates the status for each key ID in the

     * session.

     * @param hasNewUsableKey indicates if the event includes at least one

     * key that has become usable.

     */

    oneway sendKeysChange_1_2(SessionId sessionId, vec<KeyStatus> keyStatusList,

            bool hasNewUsableKey);



};

drm/1.2/types.hal

+23 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.hardware.drm@1.2;



import @1.0::KeyStatusType;

import @1.0::Status;

import @1.1::HdcpLevel;
@@ -93,3 +94,25 @@ enum HdcpLevel : @1.1::HdcpLevel { 
 * set in methods that take a KeySetId as an input parameter.

 */

typedef vec<uint8_t> KeySetId;



enum KeyStatusType : @1.0::KeyStatusType {

    /**

     * The key is not yet usable to decrypt media because the start

     * time is in the future. The key must become usable when

     * its start time is reached.

     */

    USABLEINFUTURE

};



/**

 * Used by sendKeysChange_1_2 to report the usability status of each key to the

 * app.

 *

 * This struct only differs from @1.0 version by the addition of new

 * KeyStatusType(s).

 *

 */

struct KeyStatus {

    KeySetId keyId;

    KeyStatusType type;

};

drm/1.2/vts/functional/drm_hal_common.cpp

+14 −1
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ namespace V1_2 { 
namespace vts {



const char *kCallbackLostState = "LostState";

const char *kCallbackKeysChange = "KeysChange";



drm_vts::VendorModules *DrmHalTest::gVendorModules = nullptr;
@@ -64,7 +65,19 @@ drm_vts::VendorModules *DrmHalTest::gVendorModules = nullptr; 
 */



Return<void> DrmHalPluginListener::sendSessionLostState(const hidl_vec<uint8_t>& sessionId) {

    NotifyFromCallback(kCallbackLostState, sessionId);

    ListenerEventArgs args;

    args.sessionId = sessionId;

    NotifyFromCallback(kCallbackLostState, args);

    return Void();

}



Return<void> DrmHalPluginListener::sendKeysChange_1_2(const hidl_vec<uint8_t>& sessionId,

        const hidl_vec<KeyStatus>& keyStatusList, bool hasNewUsableKey) {

    ListenerEventArgs args;

    args.sessionId = sessionId;

    args.keyStatusList = keyStatusList;

    args.hasNewUsableKey = hasNewUsableKey;

    NotifyFromCallback(kCallbackKeysChange, args);

    return Void();

}