Merge "PrintSpooler crash if printer is reported to have only one color mode." (a7aa078f) · Commits · e / os / android_frameworks_base

packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java

+10 −6

Original line number	Diff line number	Diff line
		@@ -2206,14 +2206,18 @@ public class PrintJobConfigActivity extends Activity {
		// Select the old color mode - nothing really changed.
		setColorModeSpinnerSelectionNoCallback(oldColorModeNewIndex);
		} else {
		final int selectedColorModeIndex = Integer.numberOfTrailingZeros(
		(colorModes & defaultAttributes.getColorMode()));
		setColorModeSpinnerSelectionNoCallback(selectedColorModeIndex);
		mCurrPrintAttributes.setColorMode(mColorModeSpinnerAdapter
		.getItem(selectedColorModeIndex).value);
		final int selectedColorMode = colorModes & defaultAttributes.getColorMode();
		final int itemCount = mColorModeSpinnerAdapter.getCount();
		for (int i = 0; i < itemCount; i++) {
		SpinnerItem<Integer> item = mColorModeSpinnerAdapter.getItem(i);
		if (selectedColorMode == item.value) {
		setColorModeSpinnerSelectionNoCallback(i);
		mCurrPrintAttributes.setColorMode(selectedColorMode);
		someAttributeSelectionChanged = true;
		}
		}
		}
		}
		mColorModeSpinner.setEnabled(true);

		// Orientation