Merge "Handle IllegalStateExceptions in CellularSecurityPreferenceController" into main (8dde780a) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/network/CellularSecurityPreferenceController.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -88,10 +88,10 @@ public class CellularSecurityPreferenceController extends BasePreferenceControll
		} catch (UnsupportedOperationException e) {
		Log.i(LOG_TAG, "Null cipher enablement is unsupported, hiding divider: "
		+ e.getMessage());
		} catch (Exception e) {
		} catch (IllegalStateException e) {
		Log.e(LOG_TAG,
		"Failed isNullCipherAndIntegrityEnabled. Setting availability to "
		+ "CONDITIONALLY_UNAVAILABLE. Exception: "
		+ "UNSUPPORTED_ON_DEVICE. Exception: "
		+ e.getMessage());
		}

		@@ -104,6 +104,12 @@ public class CellularSecurityPreferenceController extends BasePreferenceControll
		} catch (UnsupportedOperationException e) {
		Log.i(LOG_TAG, "Cellular security notifications are unsupported, hiding divider: "
		+ e.getMessage());
		} catch (IllegalStateException e) {
		Log.e(LOG_TAG,
		"Failed isNullCipherNotificationsEnabled, "
		+ "isCellularIdentifierDisclosureNotificationsEnabled. "
		+ "Setting availability to UNSUPPORTED_ON_DEVICE. Exception: "
		+ e.getMessage());
		}

		if (isNullCipherDisablementAvailable \|\| areCellSecNotificationsAvailable) {