Merge "Fix TelephonyManager to grab the best context" into ics-mr1 (33fe4a36) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -60,16 +60,16 @@ public class TelephonyManager {

		/** @hide */
		public TelephonyManager(Context context) {
		context = context.getApplicationContext();
		if (sContext == null) {
		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());
		}
		}