diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-25 14:40:27 -0400 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-25 14:40:27 -0400 |
commit | a0cad2f5d19d95cfe496ebb82f3227dd4ed7c169 (patch) | |
tree | 0a44f5ca00775c9e319dd47e307ec97325b89fd2 | |
parent | 52c37d6402f14d180f6855cc1438ca62141205ca (diff) | |
parent | 4ef8ec3a21da69091200aeebff80dbcde336709c (diff) | |
download | frameworks_base-a0cad2f5d19d95cfe496ebb82f3227dd4ed7c169.zip frameworks_base-a0cad2f5d19d95cfe496ebb82f3227dd4ed7c169.tar.gz frameworks_base-a0cad2f5d19d95cfe496ebb82f3227dd4ed7c169.tar.bz2 |
Merge change 27078 into eclair
* changes:
Fix generic build boot sequence.
-rw-r--r-- | services/java/com/android/server/TelephonyRegistry.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/services/java/com/android/server/TelephonyRegistry.java b/services/java/com/android/server/TelephonyRegistry.java index 170a9f8..aacae18 100644 --- a/services/java/com/android/server/TelephonyRegistry.java +++ b/services/java/com/android/server/TelephonyRegistry.java @@ -109,7 +109,13 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { // handler before they get to app code. 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; mBatteryStats = BatteryStatsService.getService(); } |