Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5bf6cc01: Merge "Initialize mOtaspMode to OTASP_UNKNOWN." into honeycomb

Browse Source 
* commit '5bf6cc0126b5e554f629bb4c96716a2a5701d04b':
  Initialize mOtaspMode to OTASP_UNKNOWN.
This commit is contained in:
Wink Saville
2011-01-13 06:26:23 -08:00
committed by Android Git Automerger
parent a8e0952001 5bf6cc0126
commit a8aa5fb4ad
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/java/com/android/server/TelephonyRegistry.java
View File

@@ -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 |