1 files changed, 19 insertions, 28 deletions
diff --git a/telephony/java/com/android/internal/telephony/IccSmsInterfaceManagerProxy.java b/telephony/java/com/android/internal/telephony/IccSmsInterfaceManagerProxy.java
index 90c0ec098da6..a51d074104c7 100644
--- a/telephony/java/com/android/internal/telephony/IccSmsInterfaceManagerProxy.java
+++ b/telephony/java/com/android/internal/telephony/IccSmsInterfaceManagerProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006 The Android Open Source Project
+ * Copyright (C) 2008 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,58 +17,49 @@
 package com.android.internal.telephony;
 
 import android.app.PendingIntent;
-import android.content.Context;
-import android.os.AsyncResult;
-import android.os.Handler;
-import android.os.Message;
 import android.os.ServiceManager;
-import android.telephony.gsm.SmsManager;
-import android.util.Log;
 
-import java.util.ArrayList;
 import java.util.List;
 
-//TODO remove after moving SmsRawData and ISms.Stub to telephony
-import com.android.internal.telephony.gsm.*;
-
 public class IccSmsInterfaceManagerProxy extends ISms.Stub {
     private IccSmsInterfaceManager mIccSmsInterfaceManager;
 
-    public IccSmsInterfaceManagerProxy(IccSmsInterfaceManager 
+    public IccSmsInterfaceManagerProxy(IccSmsInterfaceManager
             iccSmsInterfaceManager) {
         this.mIccSmsInterfaceManager = iccSmsInterfaceManager;
-        ServiceManager.addService("isms", this);
+        if(ServiceManager.getService("isms") == null) {
+            ServiceManager.addService("isms", this);
+        }
+    }
+
+    public void setmIccSmsInterfaceManager(IccSmsInterfaceManager iccSmsInterfaceManager) {
+        this.mIccSmsInterfaceManager = iccSmsInterfaceManager;
     }
 
     public boolean
-    //TODO Investigate
-    updateMessageOnSimEf(int index, int status, byte[] pdu) throws android.os.RemoteException {
-         return mIccSmsInterfaceManager.updateMessageOnSimEf(index, status, pdu);
+    updateMessageOnIccEf(int index, int status, byte[] pdu) throws android.os.RemoteException {
+         return mIccSmsInterfaceManager.updateMessageOnIccEf(index, status, pdu);
     }
 
-    //TODO Investigate
-    public boolean copyMessageToSimEf(int status, byte[] pdu,
+    public boolean copyMessageToIccEf(int status, byte[] pdu,
             byte[] smsc) throws android.os.RemoteException {
-        return mIccSmsInterfaceManager.copyMessageToSimEf(status, pdu, smsc);
+        return mIccSmsInterfaceManager.copyMessageToIccEf(status, pdu, smsc);
     }
 
-    //TODO Investigate
-    public List<SmsRawData> getAllMessagesFromSimEf() throws android.os.RemoteException {
-        return mIccSmsInterfaceManager.getAllMessagesFromSimEf();
+    public List<SmsRawData> getAllMessagesFromIccEf() throws android.os.RemoteException {
+        return mIccSmsInterfaceManager.getAllMessagesFromIccEf();
     }
 
-    //TODO Investigate
     public void sendRawPdu(byte[] smsc, byte[] pdu, PendingIntent sentIntent,
             PendingIntent deliveryIntent) throws android.os.RemoteException {
-        mIccSmsInterfaceManager.sendRawPdu(smsc, pdu, sentIntent, 
+        mIccSmsInterfaceManager.sendRawPdu(smsc, pdu, sentIntent,
                 deliveryIntent);
     }
 
-    //TODO Investigate
-    public void sendMultipartText(String destinationAddress, String scAddress, 
-            List<String> parts, List<PendingIntent> sentIntents, 
+    public void sendMultipartText(String destinationAddress, String scAddress,
+            List<String> parts, List<PendingIntent> sentIntents,
             List<PendingIntent> deliveryIntents) throws android.os.RemoteException {
-        mIccSmsInterfaceManager.sendMultipartText(destinationAddress, scAddress, 
+        mIccSmsInterfaceManager.sendMultipartText(destinationAddress, scAddress,
                 parts, sentIntents, deliveryIntents);
     }