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

Merge "Fix NPE if app context is null" into pi-dev

Browse Source 
am: a08a8569bf

Change-Id: I64ad0cbfa7e30cf298ba7e658cf0edab1e14630f
This commit is contained in:
John Reck
2018-03-08 00:47:15 +00:00
committed by android-build-merger
parent f054b17357 a08a8569bf
commit a25a677ab5
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/view/ThreadedRenderer.java
View File

@@ -1068,11 +1068,15 @@ public final class ThreadedRenderer {
mInitialized = true;
mAppContext = context.getApplicationContext();
nSetDebuggingEnabled(
(mAppContext.getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0
|| Build.IS_DEBUGGABLE);
initSched(renderProxy);
initGraphicsStats();
if (mAppContext != null) {
final boolean appDebuggable =
(mAppContext.getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE)
!= 0;
nSetDebuggingEnabled(appDebuggable || Build.IS_DEBUGGABLE);
initGraphicsStats();
}
}
private void initSched(long renderProxy) {