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

Merge "Avoid null app context in StaticApplicationContextServiceFetcher." into nyc-dev

Browse Source
This commit is contained in:
Lorenzo Colitti
2016-03-30 23:03:17 +00:00
committed by Android (Google) Code Review
parent 69fccd629b 0ad9ab07fa
commit 7d4ed2f5ab
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/app/SystemServiceRegistry.java
View File

@@ -882,7 +882,12 @@ final class SystemServiceRegistry {
public final T getService(ContextImpl ctx) { public final T getService(ContextImpl ctx) {
synchronized (StaticApplicationContextServiceFetcher.this) { synchronized (StaticApplicationContextServiceFetcher.this) {
if (mCachedInstance == null) { if (mCachedInstance == null) {
mCachedInstance = createService(ctx.getApplicationContext()); Context appContext = ctx.getApplicationContext();
// If the application context is null, we're either in the system process or
// it's the application context very early in app initialization. In both these
// cases, the passed-in ContextImpl will not be freed, so it's safe to pass it
// to the service. http://b/27532714 .
mCachedInstance = createService(appContext != null ? appContext : ctx);
} }
return mCachedInstance; return mCachedInstance;
} }