summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2011-05-09 20:32:34 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-09 20:32:34 -0700
commitd1736a3ddae04f5cbe4ebc0ba31e605b6bdae72c (patch)
tree16109194e60579dbd0fe2702c2a06e2089a1b72b
parent05be6d6fe09ddfb706d1bef3b20c3d37f45e3c8a (diff)
parentd237bcb241b2be8b2f3f3baed87fce973de00fa7 (diff)
downloadframeworks_base-d1736a3ddae04f5cbe4ebc0ba31e605b6bdae72c.zip
frameworks_base-d1736a3ddae04f5cbe4ebc0ba31e605b6bdae72c.tar.gz
frameworks_base-d1736a3ddae04f5cbe4ebc0ba31e605b6bdae72c.tar.bz2
am d237bcb2: Merge "Add unset and setOnIccRefresh." into honeycomb-LTE
* commit 'd237bcb241b2be8b2f3f3baed87fce973de00fa7': Add unset and setOnIccRefresh.
-rw-r--r--telephony/java/com/android/internal/telephony/BaseCommands.java6
-rw-r--r--telephony/java/com/android/internal/telephony/CommandsInterface.java3
2 files changed, 9 insertions, 0 deletions
diff --git a/telephony/java/com/android/internal/telephony/BaseCommands.java b/telephony/java/com/android/internal/telephony/BaseCommands.java
index 0c6a747..ee9ceaf 100644
--- a/telephony/java/com/android/internal/telephony/BaseCommands.java
+++ b/telephony/java/com/android/internal/telephony/BaseCommands.java
@@ -459,6 +459,9 @@ public abstract class BaseCommands implements CommandsInterface {
Registrant r = new Registrant (h, what, obj);
mIccRefreshRegistrants.add(r);
}
+ public void setOnIccRefresh(Handler h, int what, Object obj) {
+ registerForIccRefresh(h, what, obj);
+ }
public void setEmergencyCallbackMode(Handler h, int what, Object obj) {
mEmergencyCallbackModeRegistrant = new Registrant (h, what, obj);
@@ -467,6 +470,9 @@ public abstract class BaseCommands implements CommandsInterface {
public void unregisterForIccRefresh(Handler h) {
mIccRefreshRegistrants.remove(h);
}
+ public void unsetOnIccRefresh(Handler h) {
+ unregisterForIccRefresh(h);
+ }
public void setOnCallRing(Handler h, int what, Object obj) {
mRingRegistrant = new Registrant (h, what, obj);
diff --git a/telephony/java/com/android/internal/telephony/CommandsInterface.java b/telephony/java/com/android/internal/telephony/CommandsInterface.java
index f87d188..96788ef 100644
--- a/telephony/java/com/android/internal/telephony/CommandsInterface.java
+++ b/telephony/java/com/android/internal/telephony/CommandsInterface.java
@@ -360,6 +360,9 @@ public interface CommandsInterface {
void registerForIccRefresh(Handler h, int what, Object obj);
void unregisterForIccRefresh(Handler h);
+ void setOnIccRefresh(Handler h, int what, Object obj);
+ void unsetOnIccRefresh(Handler h);
+
/**
* Sets the handler for RING notifications.
* Unlike the register* methods, there's only one notification handler