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

Commit d290af51 authored by Sehee Park's avatar Sehee Park Committed by android-build-merger
Browse files

Merge "Continue when receiver is not available instead of return." am: 57d3ed2c am: 95bc9d20 

am: 1468d167

Change-Id: Ia9a3bb59683c4fb1c8ac1d74a1fcd4753cd2e2f9
parents 73fc275f 1468d167

src/java/com/android/internal/telephony/CarrierSignalAgent.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -306,13 +306,13 @@ public class CarrierSignalAgent extends Handler { 
                    PackageManager.MATCH_DEFAULT_ONLY).isEmpty()) {

                    PackageManager.MATCH_DEFAULT_ONLY).isEmpty()) {

                loge("Carrier signal receivers are configured but unavailable: "

                loge("Carrier signal receivers are configured but unavailable: "

                        + signal.getComponent());

                        + signal.getComponent());

                return;

                continue;

            }

            }

            if (!wakeup && !packageManager.queryBroadcastReceivers(signal,

            if (!wakeup && !packageManager.queryBroadcastReceivers(signal,

                    PackageManager.MATCH_DEFAULT_ONLY).isEmpty()) {

                    PackageManager.MATCH_DEFAULT_ONLY).isEmpty()) {

                loge("Runtime signals shouldn't be configured in Manifest: "

                loge("Runtime signals shouldn't be configured in Manifest: "

                        + signal.getComponent());

                        + signal.getComponent());

                return;

                continue;

            }

            }





            signal.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, mPhone.getSubId());

            signal.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, mPhone.getSubId());