--- TelephonyManager.smali	2011-02-15 16:14:11.000000000 -0600
+++ TelephonyManager.smali	2011-02-02 19:17:21.000000000 -0600
@@ -82,6 +82,8 @@

 .field private static final TAG:Ljava/lang/String; = "TelephonyManager"

+.field private static final TAG_CWX:Ljava/lang/String; = "CLOCKWORX"
+
 .field private static sInstance:Landroid/telephony/TelephonyManager;


@@ -687,52 +689,73 @@
 .end method

 .method public getDeviceId()Ljava/lang/String;
-    .locals 3
+    .locals 5

     .prologue
-    const/4 v2, 0x0
+    .line 191
+    const-string v0, "35828001"

-    .line 187
-    :try_start_0
-    invoke-direct {p0}, Landroid/telephony/TelephonyManager;->getSubscriberInfo()Lcom/android/internal/telephony/IPhoneSubInfo;
+    .line 192
+    .local v0, fakeDevId:Ljava/lang/String;
+    new-instance v1, Ljava/util/Random;

-    move-result-object v1
+    invoke-direct {v1}, Ljava/util/Random;-><init>()V

-    invoke-interface {v1}, Lcom/android/internal/telephony/IPhoneSubInfo;->getDeviceId()Ljava/lang/String;
-    :try_end_0
-    .catch Landroid/os/RemoteException; {:try_start_0 .. :try_end_0} :catch_0
-    .catch Ljava/lang/NullPointerException; {:try_start_0 .. :try_end_0} :catch_1
+    .line 193
+    .local v1, randomGenerator:Ljava/util/Random;
+    new-instance v2, Ljava/lang/StringBuilder;

-    move-result-object v1
+    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V

-    .line 191
-    :goto_0
-    return-object v1
+    invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;

-    .line 188
-    :catch_0
-    move-exception v1
+    move-result-object v2

-    move-object v0, v1
+    const v3, 0xf4240

-    .local v0, ex:Landroid/os/RemoteException;
-    move-object v1, v2
+    invoke-virtual {v1, v3}, Ljava/util/Random;->nextInt(I)I

-    .line 189
-    goto :goto_0
+    move-result v3

-    .line 190
-    .end local v0           #ex:Landroid/os/RemoteException;
-    :catch_1
-    move-exception v1
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;

-    move-object v0, v1
+    move-result-object v2

-    .local v0, ex:Ljava/lang/NullPointerException;
-    move-object v1, v2
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;

-    .line 191
-    goto :goto_0
+    move-result-object v0
+
+    .line 203
+    const-string v2, "TAG_CWX"
+
+    new-instance v3, Ljava/lang/StringBuilder;
+
+    invoke-direct {v3}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v4, "Generated:"
+
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v3
+
+    invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v3
+
+    const-string v4, "."
+
+    invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    move-result-object v3
+
+    invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object v3
+
+    invoke-static {v2, v3}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
+
+    .line 204
+    return-object v0
 .end method

 .method public getDeviceSoftwareVersion()Ljava/lang/String;
@@ -1139,70 +1162,20 @@
 .end method

 .method public getPhoneType()I
-    .locals 3
+    .locals 2

     .prologue
-    .line 282
-    :try_start_0
-    invoke-direct {p0}, Landroid/telephony/TelephonyManager;->getITelephony()Lcom/android/internal/telephony/ITelephony;
-
-    move-result-object v1
-
-    .line 283
-    .local v1, telephony:Lcom/android/internal/telephony/ITelephony;
-    if-eqz v1, :cond_0
-
-    .line 284
-    invoke-interface {v1}, Lcom/android/internal/telephony/ITelephony;->getActivePhoneType()I
-
-    move-result v2
-
-    .line 296
-    .end local v1           #telephony:Lcom/android/internal/telephony/ITelephony;
-    :goto_0
-    return v2
-
-    .line 287
-    .restart local v1       #telephony:Lcom/android/internal/telephony/ITelephony;
-    :cond_0
-    invoke-direct {p0}, Landroid/telephony/TelephonyManager;->getPhoneTypeFromProperty()I
-    :try_end_0
-    .catch Landroid/os/RemoteException; {:try_start_0 .. :try_end_0} :catch_0
-    .catch Ljava/lang/NullPointerException; {:try_start_0 .. :try_end_0} :catch_1
+    .line 318
+    const-string v0, "CLOCKWORX"

-    move-result v2
+    const-string v1, "Returning 1."

-    goto :goto_0
+    invoke-static {v0, v1}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I

-    .line 289
-    .end local v1           #telephony:Lcom/android/internal/telephony/ITelephony;
-    :catch_0
-    move-exception v2
-
-    move-object v0, v2
-
-    .line 292
-    .local v0, ex:Landroid/os/RemoteException;
-    invoke-direct {p0}, Landroid/telephony/TelephonyManager;->getPhoneTypeFromProperty()I
-
-    move-result v2
-
-    goto :goto_0
-
-    .line 293
-    .end local v0           #ex:Landroid/os/RemoteException;
-    :catch_1
-    move-exception v2
-
-    move-object v0, v2
-
-    .line 296
-    .local v0, ex:Ljava/lang/NullPointerException;
-    invoke-direct {p0}, Landroid/telephony/TelephonyManager;->getPhoneTypeFromProperty()I
-
-    move-result v2
-
-    goto :goto_0
+    .line 319
+    const/4 v0, 0x1
+
+    return v0
 .end method

 .method public getSimCountryIso()Ljava/lang/String;