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

Commit 35bd4b37 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add phone id to the logs" am: 79ed0d07 am: 8a95315b 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1594453

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I78ceabf3a3aaa989db2dceb840c1afb1c98ef8a3
parents a3bb156a 8a95315b

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

+6 −5
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ import java.util.stream.Collectors; 
 * networks changes.

 */

public class AccessNetworksManager extends Handler {

    private static final String TAG = AccessNetworksManager.class.getSimpleName();

    private final String mLogTag;

    private static final boolean DBG = false;

    private final UUID mAnomalyUUID = UUID.fromString("c2d1a639-00e2-4561-9619-6acf37d90590");

    private String mLastBoundPackageName;
@@ -296,6 +296,7 @@ public class AccessNetworksManager extends Handler { 
        mPhone = phone;

        mCarrierConfigManager = (CarrierConfigManager) phone.getContext().getSystemService(

                Context.CARRIER_CONFIG_SERVICE);

        mLogTag = "ANM-" + mPhone.getPhoneId();



        IntentFilter intentFilter = new IntentFilter();

        intentFilter.addAction(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);
@@ -305,7 +306,7 @@ public class AccessNetworksManager extends Handler { 
            contextAsUser.registerReceiver(mConfigChangedReceiver, intentFilter,

                null /* broadcastPermission */, null);

        } catch (PackageManager.NameNotFoundException e) {

            Rlog.e(TAG, "Package name not found: " + e.getMessage());

            loge("Package name not found: ", e);

        }

        bindQualifiedNetworksService();

    }
@@ -483,15 +484,15 @@ public class AccessNetworksManager extends Handler { 
    }



    private void log(String s) {

        Rlog.d(TAG, s);

        Rlog.d(mLogTag, s);

    }



    private void loge(String s) {

        Rlog.e(TAG, s);

        Rlog.e(mLogTag, s);

    }



    private void loge(String s, Exception ex) {

        Rlog.e(TAG, s, ex);

        Rlog.e(mLogTag, s, ex);

    }



}

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

+5 −4
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ import java.util.stream.Collectors; 
 *          The carrier config takes precedence over the resource overlay if both exist.

 */

public class TransportManager extends Handler {

    private static final String TAG = TransportManager.class.getSimpleName();

    private final String mLogTag;



    // Key is the access network, value is the transport.

    private static final Map<Integer, Integer> ACCESS_NETWORK_TRANSPORT_TYPE_MAP;
@@ -226,6 +226,7 @@ public class TransportManager extends Handler { 
        mPendingHandoverApns = new SparseIntArray();

        mHandoverNeededEventRegistrants = new RegistrantList();

        mAvailableNetworksList = new LinkedList<>();

        mLogTag = TransportManager.class.getSimpleName() + "-" + mPhone.getPhoneId();



        if (isInLegacyMode()) {

            log("operates in legacy mode.");
@@ -492,7 +493,7 @@ public class TransportManager extends Handler { 
     */

    public void dump(FileDescriptor fd, PrintWriter printwriter, String[] args) {

        IndentingPrintWriter pw = new IndentingPrintWriter(printwriter, "  ");

        pw.println("TransportManager:");

        pw.println(mLogTag);

        pw.increaseIndent();

        pw.println("mAvailableTransports=[" + Arrays.stream(mAvailableTransports)

                .mapToObj(type -> AccessNetworkConstants.transportTypeToString(type))
@@ -521,10 +522,10 @@ public class TransportManager extends Handler { 
    }



    private void log(String s) {

        Rlog.d(TAG, s);

        Rlog.d(mLogTag, s);

    }



    private void loge(String s) {

        Rlog.e(TAG, s);

        Rlog.e(mLogTag, s);

    }

}