Merge "Verify Bundle is not null before using it" into qt-dev (5012f5bd) · Commits · e / os / android_frameworks_base

core/java/android/os/GraphicsEnvironment.java

+11 −3

Original line number	Diff line number	Diff line
		@@ -453,14 +453,22 @@ public class GraphicsEnvironment {
		final boolean appIsProfileable = isProfileable(context);
		final boolean deviceIsDebuggable = getCanLoadSystemLibraries() == 1;
		if (appIsDebuggable \|\| appIsProfileable \|\| deviceIsDebuggable) {
		String debugPackage;

		String debugPackage =
		if (coreSettings != null) {
		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())) {
		return debugPackage;
		}
		}

		return "";
		}