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

Commit 9db4f05e authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "Don't crash if subscription list is missing" into tm-qpr-dev am: d633ada5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/21429877



Change-Id: I4e860efdab3fefa74a25aea493d319d6bd08e61c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9985378a d633ada5

android/app/src/com/android/bluetooth/mapclient/MapClientContent.java

+4 −0
Original line number Diff line number Diff line
@@ -137,6 +137,10 @@ class MapClientContent { 
        SubscriptionManager subscriptionManager =

                context.getSystemService(SubscriptionManager.class);

        List<SubscriptionInfo> subscriptions = subscriptionManager.getActiveSubscriptionInfoList();

        if (subscriptions == null) {

            Log.w(TAG, "Active subscription list is missing");

            return;

        }

        for (SubscriptionInfo info : subscriptions) {

            if (info.getSubscriptionType() == SubscriptionManager.SUBSCRIPTION_TYPE_REMOTE_SIM) {

                clearMessages(context, info.getSubscriptionId());