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

Commit a9b5a3eb authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Verify package name from carrierConfig for bindService"

parents 9b299f90 9958ac7f

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

+2 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import android.telephony.INetworkServiceCallback; 
import android.telephony.NetworkRegistrationState;

import android.telephony.NetworkService;

import android.telephony.Rlog;

import android.text.TextUtils;



import java.util.Hashtable;

import java.util.Map;
@@ -219,7 +220,7 @@ public class NetworkRegistrationManager { 


        PersistableBundle b = mCarrierConfigManager.getConfigForSubId(mPhone.getSubId());



        if (b != null) {

        if (b != null && !TextUtils.isEmpty(b.getString(carrierConfig))) {

            // If carrier config overrides it, use the one from carrier config

            packageName = b.getString(carrierConfig, packageName);

        }

src/java/com/android/internal/telephony/dataconnection/DataServiceManager.java

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ public class DataServiceManager { 


        PersistableBundle b = mCarrierConfigManager.getConfigForSubId(mPhone.getSubId());



        if (b != null) {

        if (b != null && !TextUtils.isEmpty(b.getString(carrierConfig))) {

            // If carrier config overrides it, use the one from carrier config

            packageName = b.getString(carrierConfig, packageName);

        }