Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 33fe4a36: Merge "Fix TelephonyManager to grab the best context" into ics-mr1

Browse Source 
* commit '33fe4a36b7d1ef84b13447f2a765db465ef96e56':
  Fix TelephonyManager to grab the best context
This commit is contained in:
Robert Greenwalt
2011-11-16 12:46:23 -08:00
committed by Android Git Automerger
parent 7765fc651a 33fe4a36b7
commit 795fcd0794
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -60,16 +60,16 @@ public class TelephonyManager {
/** @hide */ /** @hide */
public TelephonyManager(Context context) { public TelephonyManager(Context context) {
context = context.getApplicationContext();
if (sContext == null) { if (sContext == null) {
sContext = context; Context appContext = context.getApplicationContext();
if (appContext != null) {
sContext = appContext;
} else {
sContext = context;
}
sRegistry = ITelephonyRegistry.Stub.asInterface(ServiceManager.getService( sRegistry = ITelephonyRegistry.Stub.asInterface(ServiceManager.getService(
"telephony.registry")); "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());
} }
} }