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

Commit 4462d4b3 authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

Merge "Do not post timeout message if no SMS filter packages found." 

am: f78b7922

Change-Id: I543694d565ab9c87f4c624b1faa5543d57ea895e
parents 83463dcf f78b7922

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

+13 −8
Original line number Diff line number Diff line
@@ -109,15 +109,20 @@ public class CarrierServicesSmsFilter { 
            throw new RuntimeException(errMsg);

        }



        mFilterAggregator = new FilterAggregator(smsFilterPackages.size());

        int numPackages = smsFilterPackages.size();

        if (numPackages > 0) {

            mFilterAggregator = new FilterAggregator(numPackages);

            //start the timer

            mCallbackTimeoutHandler.sendMessageDelayed(mCallbackTimeoutHandler

                .obtainMessage(EVENT_ON_FILTER_COMPLETE_NOT_CALLED), FILTER_COMPLETE_TIMEOUT_MS);

                            .obtainMessage(EVENT_ON_FILTER_COMPLETE_NOT_CALLED),

                    FILTER_COMPLETE_TIMEOUT_MS);

            for (String smsFilterPackage : smsFilterPackages) {

                filterWithPackage(smsFilterPackage, mFilterAggregator);

            }

        boolean handled = smsFilterPackages.size() > 0;

        return handled;

            return true;

        } else {

            return false;

        }

    }



    private Optional<String> getCarrierAppPackageForFiltering() {