diff options
| -rwxr-xr-x | telephony/java/android/telephony/TelephonyManager.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 8ead45ebb953..db78e2e98dea 100755 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -60,16 +60,16 @@ public class TelephonyManager { /** @hide */ public TelephonyManager(Context context) { - context = context.getApplicationContext(); if (sContext == null) { - sContext = context; + Context appContext = context.getApplicationContext(); + if (appContext != null) { + sContext = appContext; + } else { + sContext = context; + } sRegistry = ITelephonyRegistry.Stub.asInterface(ServiceManager.getService( "telephony.registry")); - } else if (sContext != context) { - Log.e(TAG, "Hidden constructor called more than once per process!"); - Log.e(TAG, "Original: " + sContext.getPackageName() + ", new: " + - context.getPackageName()); } } |