update stockrom to RUU_SAGA_ICS_35_S_HTC_EU_14.01.401.2_20.76.30.0835…

…_3831.19.00.110_275068 Change-Id: I7bc122bcee54a0c6dc561ec1d6eafed9f0c1380a
MiCode · Sep 11, 2012 · 6572ef9 · 6572ef9
1 parent 884476b
commit 6572ef9
Show file tree

Hide file tree

Showing 150 changed files with 15,374 additions and 15,623 deletions.
diff --git a/HTCAlbum/smali/com/htc/album/TabPluginDLNA/SceneDlnaGridview.smali b/HTCAlbum/smali/com/htc/album/TabPluginDLNA/SceneDlnaGridview.smali
@@ -2299,12 +2299,10 @@
 
     invoke-static {v1, v3}, Lcom/htc/opensense2/album/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    .line 530
     const-string v1, "com.htc.video"
 
     const-string v3, "com.htc.video.ViewVideo"
 
-    .line 531
     move-object/from16 v0, p4
 
     iget-object v1, v0, Lcom/htc/album/TabPluginDLNA/DLNAMediumInfo;->mUri:Ljava/lang/String;

diff --git a/HTCAlbum/smali/com/htc/album/helper/MenuManager.smali b/HTCAlbum/smali/com/htc/album/helper/MenuManager.smali
@@ -5135,24 +5135,20 @@
 
     invoke-static {v5, v6}, Lcom/htc/album/AlbumUtility/Log;->d(Ljava/lang/String;Ljava/lang/String;)V
 
-    .line 1983
     const-string v5, "com.htc.video"
 
     const-string v6, "com.htc.video.ViewVideo"
 
-    .line 1984
     invoke-interface {p1}, Lcom/htc/opensense2/album/util/ImageManager$IImage;->getMimeType()Ljava/lang/String;
 
     move-result-object v5
 
     invoke-virtual {v2, v4, v5}, Landroid/content/Intent;->setDataAndType(Landroid/net/Uri;Ljava/lang/String;)Landroid/content/Intent;
 
-    .line 1985
     const-string v5, "Extras"
 
     invoke-virtual {v2, v5, p2}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Landroid/os/Bundle;)Landroid/content/Intent;
 
-    .line 1987
     const/16 v5, 0x13bb
 
     invoke-virtual {p0, v2, v5}, Landroid/app/Activity;->startActivityForResult(Landroid/content/Intent;I)V

diff --git a/HTCCamera/smali/com/android/camera/HTCCamera$MainHandler.smali b/HTCCamera/smali/com/android/camera/HTCCamera$MainHandler.smali
@@ -2883,7 +2883,6 @@
 
     move-object/from16 v0, v31
 
-    .line 1562
     const-string v3, "landscape"
 
     const/4 v4, 0x1
@@ -2892,7 +2891,6 @@
 
     invoke-virtual {v0, v3, v4}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Z)Landroid/content/Intent;
 
-    .line 1563
     move-object/from16 v0, p0
 
     iget-object v3, v0, Lcom/android/camera/HTCCamera$MainHandler;->this$0:Lcom/android/camera/HTCCamera;
@@ -2903,11 +2901,9 @@
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
-    .line 1571
     :goto_a
     if-nez v22, :cond_2f
 
-    .line 1576
     :try_start_1
     const-string v3, "com.htc.album"
 
@@ -2917,7 +2913,7 @@
 
     invoke-virtual {v0, v3, v4}, Landroid/content/Intent;->setClassName(Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent;
 
-    .line 1577
+    .line 1562
     const-string v3, "landscape"
 
     const/4 v4, 0x1
@@ -2926,6 +2922,7 @@
 
     invoke-virtual {v0, v3, v4}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Z)Landroid/content/Intent;
 
+    .line 1563
     .line 1578
     move-object/from16 v0, p0
 

diff --git a/HTCCamera/smali/com/android/camera/actionscreen/CommonActionScreen.smali b/HTCCamera/smali/com/android/camera/actionscreen/CommonActionScreen.smali
@@ -882,14 +882,12 @@
 
     const-string v4, "com.htc.video.ViewVideo"
 
-    .line 483
     const-string v3, "landscape"
 
     const/4 v4, 0x1
 
     invoke-virtual {v2, v3, v4}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Z)Landroid/content/Intent;
 
-    .line 484
     invoke-virtual {p0}, Lcom/android/camera/actionscreen/CommonActionScreen;->getCameraActivity()Lcom/android/camera/HTCCamera;
 
     move-result-object v3
@@ -898,26 +896,24 @@
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 
-    .line 492
     :goto_1
     if-nez v0, :cond_4
 
-    .line 497
     :try_start_1
     const-string v3, "com.htc.album"
 
     const-string v4, "com.htc.album.TabPluginDevice.ViewVideo"
 
     invoke-virtual {v2, v3, v4}, Landroid/content/Intent;->setClassName(Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent;
 
-    .line 498
+    .line 483
     const-string v3, "landscape"
 
     const/4 v4, 0x1
 
     invoke-virtual {v2, v3, v4}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Z)Landroid/content/Intent;
 
-    .line 499
+    .line 484
     invoke-virtual {p0}, Lcom/android/camera/actionscreen/CommonActionScreen;->getCameraActivity()Lcom/android/camera/HTCCamera;
 
     move-result-object v3

diff --git a/android.policy.jar.out/smali/com/android/internal/policy/impl/KeyguardViewMediator.smali b/android.policy.jar.out/smali/com/android/internal/policy/impl/KeyguardViewMediator.smali
@@ -3284,10 +3284,8 @@
     .parameter "why"
 
     .prologue
-    .line 352
     monitor-enter p0
 
-    .line 353
     const/16 v18, 0x0
 
     :try_start_0
@@ -3297,7 +3295,6 @@
 
     iput-boolean v0, v1, Lcom/android/internal/policy/impl/KeyguardViewMediator;->mScreenOn:Z
 
-    .line 359
     move-object/from16 v0, p0
 
     iget-object v0, v0, Lcom/android/internal/policy/impl/KeyguardViewMediator;->mLockPatternUtils:Lcom/android/internal/widget/LockPatternUtils;
@@ -3325,7 +3322,6 @@
     :cond_0
     const/4 v10, 0x1
 
-    .line 362
     .local v10, lockImmediately:Z
     :goto_0
     move-object/from16 v0, p0
@@ -3336,7 +3332,6 @@
 
     if-eqz v18, :cond_3
 
-    .line 364
     move-object/from16 v0, p0
 
     iget-object v0, v0, Lcom/android/internal/policy/impl/KeyguardViewMediator;->mExitSecureCallback:Landroid/view/WindowManagerPolicy$OnKeyguardExitResult;
@@ -3347,7 +3342,6 @@
 
     invoke-interface/range {v18 .. v19}, Landroid/view/WindowManagerPolicy$OnKeyguardExitResult;->onKeyguardExitResult(Z)V
 
-    .line 365
     const/16 v18, 0x0
 
     move-object/from16 v0, v18
@@ -3356,7 +3350,6 @@
 
     iput-object v0, v1, Lcom/android/internal/policy/impl/KeyguardViewMediator;->mExitSecureCallback:Landroid/view/WindowManagerPolicy$OnKeyguardExitResult;
 
-    .line 366
     move-object/from16 v0, p0
 
     iget-boolean v0, v0, Lcom/android/internal/policy/impl/KeyguardViewMediator;->mExternallyEnabled:Z
@@ -3365,25 +3358,20 @@
 
     if-nez v18, :cond_1
 
-    .line 367
     invoke-direct/range {p0 .. p0}, Lcom/android/internal/policy/impl/KeyguardViewMediator;->hideLocked()V
 
-    .line 423
     :cond_1
     :goto_1
     monitor-exit p0
 
-    .line 424
     return-void
 
-    .line 359
     .end local v10           #lockImmediately:Z
     :cond_2
     const/4 v10, 0x0
 
     goto :goto_0
 
-    .line 369
     .restart local v10       #lockImmediately:Z
     :cond_3
     move-object/from16 v0, p0
@@ -3394,15 +3382,12 @@
 
     if-eqz v18, :cond_4
 
-    .line 370
     invoke-virtual/range {p0 .. p0}, Lcom/android/internal/policy/impl/KeyguardViewMediator;->notifyScreenOffLocked()V
 
-    .line 371
     invoke-direct/range {p0 .. p0}, Lcom/android/internal/policy/impl/KeyguardViewMediator;->resetStateLocked()V
 
     goto :goto_1
 
-    .line 423
     .end local v10           #lockImmediately:Z
     :catchall_0
     move-exception v18
@@ -3413,7 +3398,6 @@
 
     throw v18
 
-    .line 372
     .restart local v10       #lockImmediately:Z
     :cond_4
     const/16 v18, 0x3
@@ -3434,7 +3418,6 @@
 
     if-nez v10, :cond_8
 
-    .line 379
     :cond_5
     :try_start_1
     move-object/from16 v0, p0
@@ -3447,7 +3430,6 @@
 
     move-result-object v4
 
-    .line 382
     .local v4, cr:Landroid/content/ContentResolver;
     const-string v18, "screen_off_timeout"
 
@@ -3465,7 +3447,6 @@
 
     int-to-long v5, v0
 
-    .line 386
     .local v5, displayTimeout:J
     const-string v18, "lock_screen_lock_after_timeout"
 
@@ -3483,7 +3464,6 @@
 
     int-to-long v8, v0
 
-    .line 391
     .local v8, lockAfterTimeout:J
     move-object/from16 v0, p0
 
@@ -3501,15 +3481,13 @@
 
     move-result-wide v11
 
-    .line 395
     .local v11, policyTimeout:J
     const-wide/16 v18, 0x0
 
     cmp-long v18, v11, v18
 
     if-lez v18, :cond_6
 
-    .line 397
     const-wide/16 v18, 0x0
 
     move-wide/from16 v0, v18
@@ -3518,7 +3496,6 @@
 
     move-result-wide v5
 
-    .line 398
     sub-long v18, v11, v5
 
     move-wide/from16 v0, v18
@@ -3527,7 +3504,6 @@
 
     move-result-wide v14
 
-    .line 403
     .local v14, timeout:J
     :goto_2
     const-wide/16 v18, 0x0
@@ -3536,7 +3512,6 @@
 
     if-gtz v18, :cond_7
 
-    .line 405
     const/16 v18, 0x1
 
     move/from16 v0, v18
@@ -3545,28 +3520,24 @@
 
     iput-boolean v0, v1, Lcom/android/internal/policy/impl/KeyguardViewMediator;->mSuppressNextLockSound:Z
 
-    .line 406
     invoke-direct/range {p0 .. p0}, Lcom/android/internal/policy/impl/KeyguardViewMediator;->doKeyguardLocked()V
 
     goto/16 :goto_1
 
-    .line 400
     .end local v14           #timeout:J
     :cond_6
     move-wide v14, v8
 
     .restart local v14       #timeout:J
     goto :goto_2
 
-    .line 409
     :cond_7
     invoke-static {}, Landroid/os/SystemClock;->elapsedRealtime()J
 
     move-result-wide v18
 
     add-long v16, v18, v14
 
-    .line 410
     .local v16, when:J
     new-instance v7, Landroid/content/Intent;
 
@@ -3576,7 +3547,6 @@
 
     invoke-direct {v7, v0}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
 
-    .line 411
     .local v7, intent:Landroid/content/Intent;
     const-string v18, "seq"
 
@@ -3592,7 +3562,6 @@
 
     invoke-virtual {v7, v0, v1}, Landroid/content/Intent;->putExtra(Ljava/lang/String;I)Landroid/content/Intent;
 
-    .line 412
     move-object/from16 v0, p0
 
     iget-object v0, v0, Lcom/android/internal/policy/impl/KeyguardViewMediator;->mContext:Landroid/content/Context;
@@ -3613,7 +3582,6 @@
 
     move-result-object v13
 
-    .line 414
     .local v13, sender:Landroid/app/PendingIntent;
     move-object/from16 v0, p0
 
@@ -3633,7 +3601,6 @@
 
     goto/16 :goto_1
 
-    .line 418
     .end local v4           #cr:Landroid/content/ContentResolver;
     .end local v5           #displayTimeout:J
     .end local v7           #intent:Landroid/content/Intent;
@@ -3651,7 +3618,6 @@
 
     if-eq v0, v1, :cond_1
 
-    .line 421
     invoke-direct/range {p0 .. p0}, Lcom/android/internal/policy/impl/KeyguardViewMediator;->doKeyguardLocked()V
     :try_end_1
     .catchall {:try_start_1 .. :try_end_1} :catchall_0