Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3095002 authored by yomna's avatar yomna
Browse files

Handle IllegalStateExceptions in CellularSecurityPreferenceController 

Bug: b/354833801, b/369941495, b/371447524, b/371689932
Flag: EXEMPT bug fix
Test: m
Change-Id: Ic21021016dcfe7fcc9cf2314117ab0e3cc84757e
parent f9d76f5c

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) {