Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ef8ec3a authored by David 'Digit' Turner's avatar David 'Digit' Turner
Browse files

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.
parent fdf53a46

services/java/com/android/server/TelephonyRegistry.java

+7 −1
Original line number Diff line number Diff line
@@ -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();

    }