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

Commit 52d0f988 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

More robust check around TelephonyManager init. 

Only complain when Context radically changed.

Bug: 4676714
Change-Id: Ia183f9ba51056c857e634d901c618a73e45d2d05
parent 27c6837d

telephony/java/android/telephony/TelephonyManager.java

+3 −2
Original line number Diff line number Diff line
@@ -60,12 +60,13 @@ public class TelephonyManager { 


    /** @hide */

    public TelephonyManager(Context context) {

        context = context.getApplicationContext();

        if (sContext == null) {

            sContext = context.getApplicationContext();

            sContext = context;



            sRegistry = ITelephonyRegistry.Stub.asInterface(ServiceManager.getService(

                    "telephony.registry"));

        } else {

        } else if (sContext != context) {

            Log.e(TAG, "Hidden constructor called more than once per process!");

            Log.e(TAG, "Original: " + sContext.getPackageName() + ", new: " +

                    context.getPackageName());