diff options
-rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 1954172..c59dd3c 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -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()); |