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

Merge "Telephony: Handle Icc Status Changed Event." into honeycomb-LTE

Browse Source
This commit is contained in:
Wink Saville
2011-05-15 14:38:59 -07:00
committed by Android (Google) Code Review
parent 9713e3c60d 3ce5de7fe2
commit 92cc1d20ae
4 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
telephony/java/com/android/internal/telephony/CommandsInterface.java
View File

@@ -234,6 +234,9 @@ public interface CommandsInterface {
void registerForSIMLockedOrAbsent(Handler h, int what, Object obj);
void unregisterForSIMLockedOrAbsent(Handler h);
void registerForIccStatusChanged(Handler h, int what, Object obj);
void unregisterForIccStatusChanged(Handler h);
void registerForCallStateChanged(Handler h, int what, Object obj);
void unregisterForCallStateChanged(Handler h);
void registerForVoiceNetworkStateChanged(Handler h, int what, Object obj);

10
telephony/java/com/android/internal/telephony/IccCard.java
View File

@@ -87,6 +87,7 @@ public abstract class IccCard {
private static final int EVENT_CHANGE_ICC_PASSWORD_DONE = 9;
private static final int EVENT_QUERY_FACILITY_FDN_DONE = 10;
private static final int EVENT_CHANGE_FACILITY_FDN_DONE = 11;
private static final int EVENT_ICC_STATUS_CHANGED = 12;
/*
UNKNOWN is a transient state, for example, after uesr inputs ICC pin under
@@ -140,11 +141,14 @@ public abstract class IccCard {
public IccCard(PhoneBase phone, String logTag, Boolean dbg) {
mPhone = phone;
mPhone.mCM.registerForIccStatusChanged(mHandler, EVENT_ICC_STATUS_CHANGED, null);
mLogTag = logTag;
mDbg = dbg;
}
abstract public void dispose();
public void dispose() {
mPhone.mCM.unregisterForIccStatusChanged(mHandler);
}
protected void finalize() {
if(mDbg) Log.d(mLogTag, "IccCard finalized");
@@ -601,6 +605,10 @@ public abstract class IccCard {
= ar.exception;
((Message)ar.userObj).sendToTarget();
break;
case EVENT_ICC_STATUS_CHANGED:
Log.d(mLogTag, "Received Event EVENT_ICC_STATUS_CHANGED");
mPhone.mCM.getIccCardStatus(obtainMessage(EVENT_GET_ICC_STATUS_DONE));
break;
default:
Log.e(mLogTag, "[IccCard] Unknown Event " + msg.what);
}

1
telephony/java/com/android/internal/telephony/cdma/RuimCard.java
View File

@@ -35,6 +35,7 @@ public final class RuimCard extends IccCard {
@Override
public void dispose() {
super.dispose();
//Unregister for all events
mPhone.mCM.unregisterForRUIMLockedOrAbsent(mHandler);
mPhone.mCM.unregisterForOffOrNotAvailable(mHandler);

1
telephony/java/com/android/internal/telephony/gsm/SimCard.java
View File

@@ -55,6 +55,7 @@ public final class SimCard extends IccCard {
@Override
public void dispose() {
super.dispose();
//Unregister for all events
mPhone.mCM.unregisterForSIMLockedOrAbsent(mHandler);
mPhone.mCM.unregisterForOffOrNotAvailable(mHandler);