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

Merge "Verify Bundle is not null before using it" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-22 15:09:28 +00:00
committed by Android (Google) Code Review
parent a99ff5fa9a 5973ec9678
commit 5012f5bdce
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/os/GraphicsEnvironment.java
View File

@@ -453,14 +453,22 @@ public class GraphicsEnvironment {
final boolean appIsProfileable = isProfileable(context); final boolean appIsProfileable = isProfileable(context);
final boolean deviceIsDebuggable = getCanLoadSystemLibraries() == 1; final boolean deviceIsDebuggable = getCanLoadSystemLibraries() == 1;
if (appIsDebuggable || appIsProfileable || deviceIsDebuggable) { if (appIsDebuggable || appIsProfileable || deviceIsDebuggable) {
String debugPackage;
String debugPackage = if (coreSettings != null) {
coreSettings.getString(Settings.Global.GLOBAL_SETTINGS_ANGLE_DEBUG_PACKAGE); debugPackage =
coreSettings.getString(Settings.Global.GLOBAL_SETTINGS_ANGLE_DEBUG_PACKAGE);
} else {
ContentResolver contentResolver = context.getContentResolver();
debugPackage = Settings.Global.getString(contentResolver,
Settings.Global.GLOBAL_SETTINGS_ANGLE_DEBUG_PACKAGE);
}
if ((debugPackage != null) && (!debugPackage.isEmpty())) { if ((debugPackage != null) && (!debugPackage.isEmpty())) {
return debugPackage; return debugPackage;
} }
} }
return ""; return "";
} }