| commit | 6cb494294a77195241c923c9792b6b0bdac67865 | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Thu Aug 13 15:53:28 2020 -0700 |
| committer | Jeff Tinker <jtinker@google.com> | Thu Aug 13 16:01:12 2020 -0700 |
| tree | e935bf4ca96db944d29486b20dcce04a70e5361f | |
| parent | 8debb9f333ed410669e3acbd0fb5cb7d694a2bad [diff] |
Update language to comply with Android's inclusive language guidance See https://source.android.com/setup/contribute/respectful-code for reference BUG=161896447 Change-Id: I0d42ed10f23013477f2dfba48b128ec13aef30ea
diff --git a/drm/libdrmframework/include/DrmManagerClientImpl.h b/drm/libdrmframework/include/DrmManagerClientImpl.h index 3858675..8c8783b 100644 --- a/drm/libdrmframework/include/DrmManagerClientImpl.h +++ b/drm/libdrmframework/include/DrmManagerClientImpl.h
@@ -230,7 +230,7 @@ /** * 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
diff --git a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/include/FwdLockEngine.h b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/include/FwdLockEngine.h index b62ddb9..eb5b0f6 100644 --- a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/include/FwdLockEngine.h +++ b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/include/FwdLockEngine.h
@@ -252,8 +252,7 @@ /** * 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
diff --git a/drm/libdrmframework/plugins/forward-lock/internal-format/doc/FwdLock.html b/drm/libdrmframework/plugins/forward-lock/internal-format/doc/FwdLock.html index 8f95cd2..c1d5b3d 100644 --- a/drm/libdrmframework/plugins/forward-lock/internal-format/doc/FwdLock.html +++ b/drm/libdrmframework/plugins/forward-lock/internal-format/doc/FwdLock.html
@@ -488,7 +488,7 @@ <p class=MsoBodyText><b>Note:</b> The key-encryption key must be unique to each device; this is what makes the files forward lockÂprotected. 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'>