am 5dbe9228: am 6588bba3: Merge "Notify the sim state after callback registration." into ics-factoryrom

* commit '5dbe9228a95c4ee5bfcdf2791634f59ce119c0e6':
  Notify the sim state after callback registration.
This commit is contained in:
John Wang
2011-09-21 19:10:54 -07:00
committed by Android Git Automerger

View File

@@ -484,6 +484,9 @@ public class KeyguardUpdateMonitor {
public void registerInfoCallback(InfoCallback callback) {
if (!mInfoCallbacks.contains(callback)) {
mInfoCallbacks.add(callback);
// notify the register the current state right away
// TODO: need call other callback methods
callback.onRefreshCarrierInfo(mTelephonyPlmn, mTelephonySpn);
} else {
if (DEBUG) Log.e(TAG, "Object tried to add another INFO callback",
new Exception("Whoops"));
@@ -497,6 +500,10 @@ public class KeyguardUpdateMonitor {
public void registerSimStateCallback(SimStateCallback callback) {
if (!mSimStateCallbacks.contains(callback)) {
mSimStateCallbacks.add(callback);
// notify the register the current sim state right away,
// otherwise the register won't receive any state until
// sim state gets changed again.
callback.onSimStateChanged(mSimState);
} else {
if (DEBUG) Log.e(TAG, "Object tried to add another SIM callback",
new Exception("Whoops"));