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

Commit 32ec0297 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android's inclusive language guidance"... 

Merge "Update language to comply with Android's inclusive language guidance" am: 4786a87b am: a19f43a1

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1399657

Change-Id: Idf30bcb2c00ec3fd13f8c327757bd2818698b307
parents fa5e39ea a19f43a1

drm/common/include/DrmEngineBase.h

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ protected: 


    /**

     * Removes all the rights information of each plug-in associated with

     * DRM framework. Will be used in master reset

     * DRM framework.

     *

     * @param[in] uniqueId Unique identifier for a session

     * @return status_t

drm/common/include/IDrmEngine.h

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ public: 


    /**

     * Removes all the rights information of each plug-in associated with

     * DRM framework. Will be used in master reset

     * DRM framework.

     *

     * @param[in] uniqueId Unique identifier for a session

     * @return status_t

drm/libdrmframework/include/DrmManagerClientImpl.h

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ public: 


    /**

     * Removes all the rights information of each plug-in associated with

     * DRM framework. Will be used in master reset

     * DRM framework.

     *

     * @param[in] uniqueId Unique identifier for a session

     * @return status_t

drm/libdrmframework/plugins/forward-lock/FwdLockEngine/include/FwdLockEngine.h

+1 −2
Original line number Diff line number Diff line
@@ -252,8 +252,7 @@ status_t onRemoveRights(int uniqueId, const String8& path); 


/**

 * Removes all the rights information of each plug-in associated with

 * DRM framework. Will be used in master reset but does nothing for

 * Forward Lock Engine.

 * DRM framework. Does nothing for Forward Lock Engine.

 *

 * @param uniqueId Unique identifier for a session

 * @return status_t

drm/libdrmframework/plugins/forward-lock/internal-format/doc/FwdLock.html

+1 −1
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ key-encryption scheme.</p> 
<p class=MsoBodyText><b>Note:</b> The key-encryption key must be unique to each

device; this is what makes the files forward lockprotected. Ideally, it should

be derived from secret hardware parameters, but at the very least it should be

persistent from one master reset to the next.</p>

persistent from one factory reset to the next.</p>



<div style='margin-bottom:24.0pt;border:solid windowtext 1.0pt;padding:1.0pt 4.0pt 1.0pt 4.0pt;

background:#F2F2F2'>