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

Commit 4786a87b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 8debb9f3 6cb49429

drm/common/include/DrmEngineBase.h

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




    /**

    /**

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

     * 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

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

     * @return status_t

     * @return status_t

drm/common/include/IDrmEngine.h

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




    /**

    /**

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

     * 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

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

     * @return status_t

     * @return status_t

drm/libdrmframework/include/DrmManagerClientImpl.h

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




    /**

    /**

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

     * 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

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

     * @return status_t

     * @return status_t

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

+1 −2
Original line number Original line 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

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

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

 * DRM framework. Does nothing for Forward Lock Engine.

 * Forward Lock Engine.

 *

 *

 * @param uniqueId Unique identifier for a session

 * @param uniqueId Unique identifier for a session

 * @return status_t

 * @return status_t

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

+1 −1
Original line number Original line 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

<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

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

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;

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

background:#F2F2F2'>

background:#F2F2F2'>