Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2018-10-09 01:33:26 +00:00
committed by Android (Google) Code Review
parent 2f38a21898 82c591b78b
commit 14aa42cfda
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/accessibilityservice/AccessibilityServiceInfo.java
View File

@@ -199,8 +199,8 @@ public class AccessibilityServiceInfo implements Parcelable {
* semantics in the context of the screen content. For example, a three by three * 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, * 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. * 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 * 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 * are not important; rather it is important that there are nine evenly distributed
* elements. * elements.
* </p> * </p>
*/ */

2
core/java/android/app/FragmentHostCallback.java
View File

@@ -52,7 +52,7 @@ public abstract class FragmentHostCallback<E> extends FragmentContainer {
private ArrayMap<String, LoaderManager> mAllLoaderManagers; private ArrayMap<String, LoaderManager> mAllLoaderManagers;
/** Whether or not fragment loaders should retain their state */ /** Whether or not fragment loaders should retain their state */
private boolean mRetainLoaders; 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 LoaderManagerImpl mLoaderManager;
private boolean mCheckedForLoaderManager; private boolean mCheckedForLoaderManager;
/** Whether or not the fragment host loader manager was started */ /** Whether or not the fragment host loader manager was started */

2
core/java/android/hardware/location/NanoAppInstanceInfo.java
View File

@@ -24,7 +24,7 @@ import android.os.Parcelable;
import libcore.util.EmptyArray; 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. * TODO(b/69270990) Remove this class once the old API is deprecated.
* *

2
services/core/java/com/android/server/wm/AccessibilityController.java
View File

@@ -71,7 +71,7 @@ import java.util.List;
import java.util.Set; 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 { final class AccessibilityController {

2
telecomm/java/android/telecom/ConnectionService.java
View File

@@ -71,7 +71,7 @@ import java.util.concurrent.ConcurrentHashMap;
* See {@link PhoneAccount} and {@link TelecomManager#registerPhoneAccount} for more information. * See {@link PhoneAccount} and {@link TelecomManager#registerPhoneAccount} for more information.
* <p> * <p>
* System managed {@link ConnectionService}s must be enabled by the user in the phone app settings * 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. * appropriate permission before Telecom will bind to them.
* <p> * <p>
* Once registered and enabled by the user in the phone app settings or granted permission, telecom * Once registered and enabled by the user in the phone app settings or granted permission, telecom