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 
am: 7d4ed2f

* commit '7d4ed2f5aba19a6b1efb7dc0772f7debfa8a7299':
  Avoid null app context in StaticApplicationContextServiceFetcher.

Change-Id: I86ee864b37109cac50dacbd34685c9c000fb763b
This commit is contained in:
Lorenzo Colitti
2016-03-30 23:09:25 +00:00
committed by android-build-merger
parent 985a767021 7d4ed2f5ab
commit 882f62dd1a
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) {
synchronized (StaticApplicationContextServiceFetcher.this) {
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;
}