commit da120f4e3d32ca97c5b4c21d6c505d834a29ab8d
author Santos Cordon <santoscordon@google.com> Wed Aug 06 04:44:34 2014 -0700
committer Santos Cordon <santoscordon@google.com> Wed Aug 06 04:44:34 2014 -0700
tree 232ab9cf052dcadd7766385d6b7bec0602dda910
parent f16de200ad667aab71cc8103921c9e5aaf882f04

Remove ldaps from AOSP code.

Bug: 16327484
Change-Id: Ic51f12e52db0839a9ee6b727755873edf65cd044

src/com/android/phone/CallController.java

diff --git a/src/com/android/phone/CallController.java b/src/com/android/phone/CallController.java
index c517343..1cb4c80 100644
--- a/src/com/android/phone/CallController.java
+++ b/src/com/android/phone/CallController.java
@@ -141,7 +141,7 @@
                     // Reset the mThreeWayCallOrigStateDialing state
                     mApp.cdmaPhoneCallState.setThreeWayCallOrigState(false);
 
-                    // TODO(sail): Remove this code.
+                    // TODO: Remove this code.
                     //mApp.getCallModeler().setCdmaOutgoing3WayCall(null);
                 }
                 break;
@@ -423,7 +423,7 @@
                 // Note: Normally, many of these values we gather from the Connection object but
                 // since no such object is created for unconnected calls, we have to build them
                 // manually.
-                // TODO(santoscordon): Try to restructure code so that we can handle failure-
+                // TODO: Try to restructure code so that we can handle failure-
                 // condition call logging in a single place (placeCall()) that also has access to
                 // the number we attempted to dial (not placeCall()).
                 mCallLogger.logCall(null /* callerInfo */, number, 0 /* presentation */,

src/com/android/phone/CallFeaturesSetting.java

diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index 39197f6..9f0dad7 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -807,7 +807,7 @@
             mChangingVMorFwdDueToProviderChange = isVMProviderSettingsForced;
             final String fwdNum = data.getStringExtra(FWD_NUMBER_EXTRA);
 
-            // TODO(iliat): It would be nice to load the current network setting for this and
+            // TODO: It would be nice to load the current network setting for this and
             // send it to the provider when it's config is invoked so it can use this as default
             final int fwdNumTime = data.getIntExtra(FWD_NUMBER_TIME_EXTRA, 20);
 
@@ -2100,7 +2100,7 @@
      * Simulates user clicking on a passed preference.
      * Usually needed when the preference is a dialog preference and we want to invoke
      * a dialog for this preference programmatically.
-     * TODO(iliat): figure out if there is a cleaner way to cause preference dlg to come up
+     * TODO: figure out if there is a cleaner way to cause preference dlg to come up
      */
     private void simulatePreferenceClick(Preference preference) {
         // Go through settings until we find our setting

src/com/android/phone/CallNotifier.java

diff --git a/src/com/android/phone/CallNotifier.java b/src/com/android/phone/CallNotifier.java
index 8baded6..1bab321 100644
--- a/src/com/android/phone/CallNotifier.java
+++ b/src/com/android/phone/CallNotifier.java
@@ -1588,7 +1588,7 @@
             new SignalInfoTonePlayer(toneID).start();
         }
 
-        // TODO(sail): Remove this.
+        // TODO: Remove this.
         //mCallModeler.onCdmaCallWaiting(infoCW);
     }
 
@@ -1642,7 +1642,7 @@
 
         // Call modeler needs to know about this event regardless of the
         // state conditionals in the previous code.
-        // TODO(sail): Remove this.
+        // TODO: Remove this.
         //mCallModeler.onCdmaCallWaitingReject();
     }
 

src/com/android/phone/OutgoingCallBroadcaster.java

diff --git a/src/com/android/phone/OutgoingCallBroadcaster.java b/src/com/android/phone/OutgoingCallBroadcaster.java
index fc5cdab..6d8830e 100644
--- a/src/com/android/phone/OutgoingCallBroadcaster.java
+++ b/src/com/android/phone/OutgoingCallBroadcaster.java
@@ -309,7 +309,7 @@
      */
     private void startSipCallOptionHandler(Context context, Intent intent,
             Uri uri, String number) {
-        // TODO(sail): Remove this code.
+        // TODO: Remove this code.
     }
 
     /**

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 16e39e5..2f290b5 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1560,7 +1560,7 @@
     }
 
     private static int getWhenToMakeWifiCallsDefaultPreference() {
-        // TODO(sail): Use a build property to choose this value.
+        // TODO: Use a build property to choose this value.
         return TelephonyManager.WifiCallingChoices.ALWAYS_USE;
     }
 

src/com/android/phone/PhoneUtils.java

diff --git a/src/com/android/phone/PhoneUtils.java b/src/com/android/phone/PhoneUtils.java
index 57285fc..06dacb8 100644
--- a/src/com/android/phone/PhoneUtils.java
+++ b/src/com/android/phone/PhoneUtils.java
@@ -629,7 +629,7 @@
             app.cdmaPhoneCallState.setCurrentCallState(
                 CdmaPhoneCallState.PhoneCallState.THRWAY_ACTIVE);
 
-            // TODO(sail): Remove this code.
+            // TODO: Remove this code.
             //app.getCallModeler().setCdmaOutgoing3WayCall(connection);
         }
     }