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

Commit 5bef8414 authored by Cody Kesting's avatar Cody Kesting Committed by Automerger Merge Worker
Browse files

Merge "Specify 'package' for CarrierPrivilegesTracker IntentFilter." into... 

Merge "Specify 'package' for CarrierPrivilegesTracker IntentFilter." into rvc-dev am: 3781621f am: 4f0c2b29

Original change: undetermined

Change-Id: I687804a9e534224e7141e1862674fd4e31fb89ac
parents 83c3e43a 4f0c2b29

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

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

        mLocalLog = new LocalLog(100);



        IntentFilter filter = new IntentFilter();

        filter.addAction(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);

        filter.addAction(TelephonyManager.ACTION_SIM_CARD_STATE_CHANGED);

        filter.addAction(TelephonyManager.ACTION_SIM_APPLICATION_STATE_CHANGED);

        filter.addAction(Intent.ACTION_PACKAGE_ADDED);

        filter.addAction(Intent.ACTION_PACKAGE_REPLACED);

        filter.addAction(Intent.ACTION_PACKAGE_REMOVED);

        mContext.registerReceiver(mIntentReceiver, filter);

        IntentFilter certFilter = new IntentFilter();

        certFilter.addAction(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);

        certFilter.addAction(TelephonyManager.ACTION_SIM_CARD_STATE_CHANGED);

        certFilter.addAction(TelephonyManager.ACTION_SIM_APPLICATION_STATE_CHANGED);

        mContext.registerReceiver(mIntentReceiver, certFilter);



        IntentFilter packageFilter = new IntentFilter();

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

        mCarrierConfigCerts = new ArraySet<>();