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

Merge "resolve merge conflicts of 70adfe3 to nyc-dev" into nyc-dev

Browse Source
This commit is contained in:
Kevin Hufnagle
2016-04-27 05:24:42 +00:00
committed by Android (Google) Code Review
parent 892a6a343d 8ce7d79c64
commit 5dcd5e5ba5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/app/Application.java
View File

@@ -33,7 +33,7 @@ import android.os.Bundle;
* AndroidManifest.xml's <application> tag, which will cause that class * AndroidManifest.xml's <application> tag, which will cause that class
* to be instantiated for you when the process for your application/package is * to be instantiated for you when the process for your application/package is
* created. * created.
* *
* <p class="note">There is normally no need to subclass Application. In * <p class="note">There is normally no need to subclass Application. In
* most situation, static singletons can provide the same functionality in a * most situation, static singletons can provide the same functionality in a
* more modular way. If your singleton needs a global context (for example * more modular way. If your singleton needs a global context (for example
@@ -84,7 +84,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 {
/** /**
* Called when the application is starting, before any activity, service, * Called when the application is starting, before any activity, service,
* or receiver objects (excluding content providers) have been created. * or receiver objects (excluding content providers) have been created.
* Implementations should be as quick as possible (for example using * Implementations should be as quick as possible (for example using
* lazy initialization of state) since the time spent in this function * lazy initialization of state) since the time spent in this function
* directly impacts the performance of starting the first activity, * directly impacts the performance of starting the first activity,
* service, or receiver in a process. * service, or receiver in a process.
@@ -179,7 +179,7 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 {
} }
// ------------------ Internal API ------------------ // ------------------ Internal API ------------------
/** /**
* @hide * @hide
*/ */