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

Commit 40388abe authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[telephony] system_server should not call non forUser Settings.Secure.get* methods"

parents 57c38954 937eb581

telephony/common/com/android/internal/telephony/CarrierAppUtils.java

+4 −3
Original line number Diff line number Diff line
@@ -157,7 +157,8 @@ public final class CarrierAppUtils { 


        List<String> enabledCarrierPackages = new ArrayList<>();

        int carrierAppsHandledSdk =

                Settings.Secure.getInt(contentResolver, Settings.Secure.CARRIER_APPS_HANDLED, 0);

                Settings.Secure.getIntForUser(contentResolver, Settings.Secure.CARRIER_APPS_HANDLED,

                        0, contentResolver.getUserId());

        if (DEBUG) {

            Log.i(TAG, "Last execution SDK: " + carrierAppsHandledSdk);

        }
@@ -309,8 +310,8 @@ public final class CarrierAppUtils { 


            // Mark the execution so we do not disable apps again on this SDK version.

            if (!hasRunEver || !hasRunForSdk) {

                Settings.Secure.putInt(contentResolver, Settings.Secure.CARRIER_APPS_HANDLED,

                        Build.VERSION.SDK_INT);

                Settings.Secure.putIntForUser(contentResolver, Settings.Secure.CARRIER_APPS_HANDLED,

                        Build.VERSION.SDK_INT, contentResolver.getUserId());

            }



            if (!enabledCarrierPackages.isEmpty()) {