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

Commit f63cc00e authored by Sehee Park's avatar Sehee Park Committed by android-build-merger
Browse files

Merge "Verify package name from carrierConfig for bindService" am: a9b5a3eb am: d641a634 

am: a93a3f26

Change-Id: I4883bd1761c21a0305a40f32cdedbcf04db85813
parents 11e997c1 a93a3f26

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

        }