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

Commit cac76b72 authored by Sungsoo Lim's avatar Sungsoo Lim Committed by Android (Google) Code Review
Browse files

Merge "Fixed typos: when when"

parents 9c165d76 0d3d1f82

graphics/java/android/graphics/Canvas.java

+1 −1
Original line number Diff line number Diff line
@@ -484,7 +484,7 @@ public class Canvas { 
     *

     * @param bounds    The maximum size the offscreen bitmap needs to be

     *                  (in local coordinates)

     * @param alpha     The alpha to apply to the offscreen when when it is

     * @param alpha     The alpha to apply to the offscreen when it is

                        drawn during restore()

     * @param saveFlags see _SAVE_FLAG constants, generally {@link #ALL_SAVE_FLAG} is recommended

     *                  for performance reasons.

media/java/android/media/browse/MediaBrowser.java

+2 −2
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ public final class MediaBrowser { 
    /**

     * Gets the root id.

     * <p>

     * Note that the root id may become invalid or change when when the

     * Note that the root id may become invalid or change when the

     * browser is disconnected.

     * </p>

     *
@@ -270,7 +270,7 @@ public final class MediaBrowser { 
    /**

     * Gets the media session token associated with the media browser.

     * <p>

     * Note that the session token may become invalid or change when when the

     * Note that the session token may become invalid or change when the

     * browser is disconnected.

     * </p>

     *

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

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ class AppWindowToken extends WindowToken { 
            if (win.mAttrs.type == WindowManager.LayoutParams.TYPE_BASE_APPLICATION

                    || win.mAttrs.type == WindowManager.LayoutParams.TYPE_APPLICATION_STARTING) {

                // In cases where there are multiple windows, we prefer the non-exiting window. This

                // happens for example when when replacing windows during an activity relaunch. When

                // happens for example when replacing windows during an activity relaunch. When

                // constructing the animation, we want the new window, not the exiting one.

                if (win.mExiting) {

                    candidate = win;

wifi/java/android/net/wifi/WifiManager.java

+1 −1
Original line number Diff line number Diff line
@@ -665,7 +665,7 @@ public class WifiManager { 
     * </ul>

     * @return a list of network configurations in the form of a list

     * of {@link WifiConfiguration} objects. Upon failure to fetch or

     * when when Wi-Fi is turned off, it can be null.

     * when Wi-Fi is turned off, it can be null.

     */

    public List<WifiConfiguration> getConfiguredNetworks() {

        try {