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

am a0cad2f5: Merge change 27078 into eclair

Browse Source 
Merge commit 'a0cad2f5d19d95cfe496ebb82f3227dd4ed7c169' into eclair-plus-aosp

* commit 'a0cad2f5d19d95cfe496ebb82f3227dd4ed7c169':
  Fix generic build boot sequence.
This commit is contained in:
David 'Digit' Turner
2009-09-25 11:47:44 -07:00
committed by Android Git Automerger
parent ba65129773 a0cad2f5d1
commit 6c52fdb684
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/TelephonyRegistry.java
View File

@@ -109,7 +109,13 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
// handler before they get to app code. // handler before they get to app code.
TelephonyRegistry(Context context) { TelephonyRegistry(Context context) {
CellLocation.getEmpty().fillInNotifierBundle(mCellLocation); CellLocation location = CellLocation.getEmpty();
// Note that location can be null for non-phone builds like
// like the generic one.
if (location != null) {
location.fillInNotifierBundle(mCellLocation);
}
mContext = context; mContext = context;
mBatteryStats = BatteryStatsService.getService(); mBatteryStats = BatteryStatsService.getService();
} }