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

Commit 57adb994 authored by kopriva's avatar kopriva Committed by android-build-merger
Browse files

Merge "docs: fixing 'mange' instead of 'manage'" into pi-dev 

am: 14aa42cf

Change-Id: Id461e2430301c62be5ee76f5046370069cb1a34c
parents fcc09fe1 14aa42cf

core/java/android/accessibilityservice/AccessibilityServiceInfo.java

+2 −2
Original line number Diff line number Diff line
@@ -200,8 +200,8 @@ public class AccessibilityServiceInfo implements Parcelable { 
     * semantics in the context of the screen content. For example, a three by three

     * grid can be implemented as three horizontal linear layouts and one vertical,

     * or three vertical linear layouts and one horizontal, or one grid layout, etc.

     * In this context the actual layout mangers used to achieve the grid configuration

     * are not important, rather it is important that there are nine evenly distributed

     * In this context, the actual layout managers used to achieve the grid configuration

     * are not important; rather it is important that there are nine evenly distributed

     * elements.

     * </p>

     */

core/java/android/app/FragmentHostCallback.java

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ public abstract class FragmentHostCallback<E> extends FragmentContainer { 
    private ArrayMap<String, LoaderManager> mAllLoaderManagers;

    /** Whether or not fragment loaders should retain their state */

    private boolean mRetainLoaders;

    /** The loader manger for the fragment host [i.e. Activity#getLoaderManager()] */

    /** The loader manager for the fragment host [i.e. Activity#getLoaderManager()] */

    private LoaderManagerImpl mLoaderManager;

    private boolean mCheckedForLoaderManager;

    /** Whether or not the fragment host loader manager was started */

core/java/android/hardware/location/NanoAppInstanceInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import android.os.Parcelable; 
import libcore.util.EmptyArray;



/**

 * Describes an instance of a nanoapp, used by the internal state manged by ContextHubService.

 * Describes an instance of a nanoapp, used by the internal state managed by ContextHubService.

 *

 * TODO(b/69270990) Remove this class once the old API is deprecated.

 *

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

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ import java.util.List; 
import java.util.Set;



/**

 * This class contains the accessibility related logic of the window manger.

 * This class contains the accessibility related logic of the window manager.

 */

final class AccessibilityController {

telecomm/java/android/telecom/ConnectionService.java

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ import java.util.concurrent.ConcurrentHashMap; 
 * See {@link PhoneAccount} and {@link TelecomManager#registerPhoneAccount} for more information.

 * <p>

 * System managed {@link ConnectionService}s must be enabled by the user in the phone app settings

 * before Telecom will bind to them.  Self-manged {@link ConnectionService}s must be granted the

 * before Telecom will bind to them.  Self-managed {@link ConnectionService}s must be granted the

 * appropriate permission before Telecom will bind to them.

 * <p>

 * Once registered and enabled by the user in the phone app settings or granted permission, telecom