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

Commit 5fe0e808 authored by Robert Horvath's avatar Robert Horvath Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-9f8bb648ce0f433e8e25f513fb46227c" 

* changes:
  [automerge] Correct permission name in javadoc 2p: 52a698ce 2p: abf82cef
  [automerge] Correct permission name in javadoc 2p: 52a698ce
  Correct permission name in javadoc
parents 1542073b 0da0cf09

services/core/java/com/android/server/wm/DisplayContent.java

+1 −1
Original line number Diff line number Diff line
@@ -5499,7 +5499,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
     * display, which set unrestricted keep-clear areas.

     *

     * For context on restricted vs unrestricted keep-clear areas, see

     * {@link android.Manifest.permission.USE_UNRESTRICTED_KEEP_CLEAR_AREAS}.

     * {@link android.Manifest.permission.SET_UNRESTRICTED_KEEP_CLEAR_AREAS}.

     */

    void getKeepClearAreas(List<Rect> outRestricted, List<Rect> outUnrestricted) {

        final Matrix tmpMatrix = new Matrix();