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

Commit 5bf6cc01 authored by Wink Saville's avatar Wink Saville Committed by Android (Google) Code Review
Browse files

Merge "Initialize mOtaspMode to OTASP_UNKNOWN." into honeycomb

parents 96100195 c9330ddc

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

+2 −1
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import com.android.internal.telephony.ITelephonyRegistry; 
import com.android.internal.telephony.IPhoneStateListener;

import com.android.internal.telephony.DefaultPhoneNotifier;

import com.android.internal.telephony.Phone;

import com.android.internal.telephony.ServiceStateTracker;

import com.android.internal.telephony.TelephonyIntents;

import com.android.server.am.BatteryStatsService;
@@ -103,7 +104,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { 


    private int mDataConnectionNetworkType;



    private int mOtaspMode;

    private int mOtaspMode = ServiceStateTracker.OTASP_UNKNOWN;



    static final int PHONE_STATE_PERMISSION_MASK =

                PhoneStateListener.LISTEN_CALL_FORWARDING_INDICATOR |