Fix generic build boot sequence.
The TelephonyRegistry service crashed badly in the generic build, because
there is no system property to tell if the phone is GSM or CDMA. Adding a
simple null check solves the issue and allows the system to boot properly.
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 @@
// 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();
}
