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

Commit 617d94b7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't crash if subscription list is missing" am: 5a6b5fc5 

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



Change-Id: I0eb6cdf1f2582d0f7baf8ae3bd1dc1531c51783e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7483a6ff 5a6b5fc5

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());