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

Commit 25013a7e 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: f98e615b am: 9016cc88 am: fbeb17c9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399715

Change-Id: I918d86a0f93f9e5262e922ad4d3110e9856b38f1
parents a3fdb079 fbeb17c9

drm/java/android/drm/DrmManagerClient.java

+1 −1
Original line number Diff line number Diff line
@@ -751,7 +751,7 @@ public class DrmManagerClient implements AutoCloseable { 


    /**

     * Removes all the rights information of every DRM plug-in (agent) associated with

     * the DRM framework. Will be used during a master reset.

     * the DRM framework.

     *

     * @return ERROR_NONE for success; ERROR_UNKNOWN for failure.

     */