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

Commit e2ccc96d authored by Sanket Padawe's avatar Sanket Padawe Committed by android-build-merger
Browse files

Merge "Fix NPE at TelephonyEvenLog in RIL.java" into nyc-dev am: 652ea3a8 

am: 596b8837

* commit '596b8837':
  Fix NPE at TelephonyEvenLog in RIL.java

Change-Id: I819497c3346173c483b01b4b96c41704995d83ae
parents 8156e05b 596b8837

src/java/com/android/internal/telephony/RIL.java

+1 −2
Original line number Diff line number Diff line
@@ -732,6 +732,7 @@ public final class RIL extends BaseCommands implements CommandsInterface { 
        mPhoneType = RILConstants.NO_PHONE;

        mInstanceId = instanceId;



        mEventLog = new TelephonyEventLog(mInstanceId);

        PowerManager pm = (PowerManager)context.getSystemService(Context.POWER_SERVICE);

        mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, RILJ_LOG_TAG);

        mWakeLock.setReferenceCounted(false);
@@ -775,8 +776,6 @@ public final class RIL extends BaseCommands implements CommandsInterface { 


        TelephonyDevController tdc = TelephonyDevController.getInstance();

        tdc.registerRIL(this);



        mEventLog = new TelephonyEventLog(mInstanceId);

    }



    //***** CommandsInterface implementation