diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2011-08-31 11:15:34 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2011-08-31 11:15:34 -0700 |
| commit | 52d0f9882fc8f33d1aef1d0e79f15733daf4ebe2 (patch) | |
| tree | ca6191705dade4cc9cc6ede0924cbe3d7c1dd559 /telephony/java/android | |
| parent | 27c6837d57be4e3a8de9b5d31ee5ee6da8675d1a (diff) | |
| download | frameworks_base-52d0f9882fc8f33d1aef1d0e79f15733daf4ebe2.zip frameworks_base-52d0f9882fc8f33d1aef1d0e79f15733daf4ebe2.tar.gz frameworks_base-52d0f9882fc8f33d1aef1d0e79f15733daf4ebe2.tar.bz2 | |
More robust check around TelephonyManager init.
Only complain when Context radically changed.
Bug: 4676714
Change-Id: Ia183f9ba51056c857e634d901c618a73e45d2d05
Diffstat (limited to 'telephony/java/android')
| -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()); |