diff options
| -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(); } |