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

Commit 7a87fda6 authored by Cody Kesting's avatar Cody Kesting Committed by Automerger Merge Worker
Browse files

Merge "Specify 'package' for CarrierPrivilegesTracker IntentFilter." am: db57d337 

Change-Id: I543d8835fd72ad9e1a1756218cb4516a308cc407
parents b057a539 db57d337

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

+15 −8
Original line number Original line Diff line number Diff line
@@ -217,14 +217,21 @@ public class CarrierPrivilegesTracker extends Handler { 
        mPhone = phone;

        mPhone = phone;

        mLocalLog = new LocalLog(100);

        mLocalLog = new LocalLog(100);





        IntentFilter filter = new IntentFilter();

        IntentFilter certFilter = new IntentFilter();

        filter.addAction(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);

        certFilter.addAction(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);

        filter.addAction(TelephonyManager.ACTION_SIM_CARD_STATE_CHANGED);

        certFilter.addAction(TelephonyManager.ACTION_SIM_CARD_STATE_CHANGED);

        filter.addAction(TelephonyManager.ACTION_SIM_APPLICATION_STATE_CHANGED);

        certFilter.addAction(TelephonyManager.ACTION_SIM_APPLICATION_STATE_CHANGED);

        filter.addAction(Intent.ACTION_PACKAGE_ADDED);

        mContext.registerReceiver(mIntentReceiver, certFilter);

        filter.addAction(Intent.ACTION_PACKAGE_REPLACED);



        filter.addAction(Intent.ACTION_PACKAGE_REMOVED);

        IntentFilter packageFilter = new IntentFilter();

        mContext.registerReceiver(mIntentReceiver, filter);

        packageFilter.addAction(Intent.ACTION_PACKAGE_ADDED);

        packageFilter.addAction(Intent.ACTION_PACKAGE_REPLACED);

        packageFilter.addAction(Intent.ACTION_PACKAGE_REMOVED);



        // For package-related broadcasts, specify the data scheme for "package" to receive the

        // package name along with the broadcast

        packageFilter.addDataScheme("package");

        mContext.registerReceiver(mIntentReceiver, packageFilter);





        mRegistrantList = new RegistrantList();

        mRegistrantList = new RegistrantList();

        mCarrierConfigCerts = new ArraySet<>();

        mCarrierConfigCerts = new ArraySet<>();