PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Physical Keyboard Setting] Add log and null check

Browse Source 
update getParcelable api usage, add null check and logging.

Bug: 317416208
Test: Verified on device
Change-Id: I125a6c9cdb5c86be7582ad5102257efb1fa6a1a4
This commit is contained in:
shaoweishen
2024-01-08 08:33:01 +00:00
committed by Shaowei Shen
parent 2a1051cbab
commit ff74d9db0b
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/inputmethod/NewKeyboardLayoutEnabledLocalesFragment.java
View File

@@ -105,8 +105,13 @@ public class NewKeyboardLayoutEnabledLocalesFragment extends DashboardFragment
public void onActivityCreated(final Bundle icicle) { public void onActivityCreated(final Bundle icicle) {
super.onActivityCreated(icicle); super.onActivityCreated(icicle);
Bundle arguments = getArguments(); Bundle arguments = getArguments();
if (arguments == null) {
Log.e(TAG, "Arguments should not be null");
return;
}
mInputDeviceIdentifier = mInputDeviceIdentifier =
arguments.getParcelable(NewKeyboardSettingsUtils.EXTRA_INPUT_DEVICE_IDENTIFIER); arguments.getParcelable(NewKeyboardSettingsUtils.EXTRA_INPUT_DEVICE_IDENTIFIER,
InputDeviceIdentifier.class);
if (mInputDeviceIdentifier == null) { if (mInputDeviceIdentifier == null) {
Log.e(TAG, "The inputDeviceIdentifier should not be null"); Log.e(TAG, "The inputDeviceIdentifier should not be null");
return; return;
@@ -128,6 +133,7 @@ public class NewKeyboardLayoutEnabledLocalesFragment extends DashboardFragment
InputDevice inputDevice = InputDevice inputDevice =
NewKeyboardSettingsUtils.getInputDevice(mIm, mInputDeviceIdentifier); NewKeyboardSettingsUtils.getInputDevice(mIm, mInputDeviceIdentifier);
if (inputDevice == null) { if (inputDevice == null) {
Log.e(TAG, "Unable to start: input device is null");
getActivity().finish(); getActivity().finish();
return; return;
} }

9
src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
View File

@@ -151,7 +151,8 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment
mKeyboardA11yCategory.removePreference(mAccessibilityStickyKeys); mKeyboardA11yCategory.removePreference(mAccessibilityStickyKeys);
} }
InputDeviceIdentifier inputDeviceIdentifier = activity.getIntent().getParcelableExtra( InputDeviceIdentifier inputDeviceIdentifier = activity.getIntent().getParcelableExtra(
KeyboardLayoutPickerFragment.EXTRA_INPUT_DEVICE_IDENTIFIER); KeyboardLayoutPickerFragment.EXTRA_INPUT_DEVICE_IDENTIFIER,
InputDeviceIdentifier.class);
int intentFromWhere = int intentFromWhere =
activity.getIntent().getIntExtra(android.provider.Settings.EXTRA_ENTRYPOINT, -1); activity.getIntent().getIntExtra(android.provider.Settings.EXTRA_ENTRYPOINT, -1);
if (intentFromWhere != -1) { if (intentFromWhere != -1) {
@@ -168,7 +169,8 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment
} }
private static boolean isAutoSelection(Bundle bundle, InputDeviceIdentifier identifier) { private static boolean isAutoSelection(Bundle bundle, InputDeviceIdentifier identifier) {
if (bundle != null && bundle.getParcelable(EXTRA_AUTO_SELECTION) != null) { if (bundle != null && bundle.getParcelable(EXTRA_AUTO_SELECTION,
InputDeviceIdentifier.class) != null) {
return false; return false;
} }
return identifier != null; return identifier != null;
@@ -446,7 +448,8 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment
if (mIntentWaitingForResult != null) { if (mIntentWaitingForResult != null) {
InputDeviceIdentifier inputDeviceIdentifier = mIntentWaitingForResult InputDeviceIdentifier inputDeviceIdentifier = mIntentWaitingForResult
.getParcelableExtra(KeyboardLayoutPickerFragment.EXTRA_INPUT_DEVICE_IDENTIFIER); .getParcelableExtra(KeyboardLayoutPickerFragment.EXTRA_INPUT_DEVICE_IDENTIFIER,
InputDeviceIdentifier.class);
mIntentWaitingForResult = null; mIntentWaitingForResult = null;
showKeyboardLayoutDialog(inputDeviceIdentifier); showKeyboardLayoutDialog(inputDeviceIdentifier);
} }