Merge pull request #1 from MiCode/v6-kitkat

pull
MiCode · Apr 30, 2015 · 9da56de · 9da56de
2 parents fb0077c + 92af838
commit 9da56de
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/...al/telephony/uicc/UiccCard$TimeTask.smali → ...l/telephony/uicc/UiccCard$TimerTask.smali b/...al/telephony/uicc/UiccCard$TimeTask.smali → ...l/telephony/uicc/UiccCard$TimerTask.smali
@@ -1,4 +1,4 @@
-.class Lcom/android/internal/telephony/uicc/UiccCard$TimeTask;
+.class Lcom/android/internal/telephony/uicc/UiccCard$TimerTask;
 .super Ljava/util/TimerTask;
 .source "UiccCard.java"
 
@@ -27,11 +27,11 @@
     .locals 0
 
     .prologue
-    iput-object p1, p0, Lcom/android/internal/telephony/uicc/UiccCard$TimeTask;->this$0:Lcom/android/internal/telephony/uicc/UiccCard;
+    iput-object p1, p0, Lcom/android/internal/telephony/uicc/UiccCard$TimerTask;->this$0:Lcom/android/internal/telephony/uicc/UiccCard;
 
-    iput-object p2, p0, Lcom/android/internal/telephony/uicc/UiccCard$TimeTask;->val$dialog:Landroid/app/AlertDialog;
+    iput-object p2, p0, Lcom/android/internal/telephony/uicc/UiccCard$TimerTask;->val$dialog:Landroid/app/AlertDialog;
 
-    iput-object p3, p0, Lcom/android/internal/telephony/uicc/UiccCard$TimeTask;->val$t:Ljava/util/Timer;
+    iput-object p3, p0, Lcom/android/internal/telephony/uicc/UiccCard$TimerTask;->val$t:Ljava/util/Timer;
 
     invoke-direct {p0}, Ljava/util/TimerTask;-><init>()V
 
@@ -44,16 +44,16 @@
     .locals 1
 
     .prologue
-    iget-object v0, p0, Lcom/android/internal/telephony/uicc/UiccCard$TimeTask;->val$dialog:Landroid/app/AlertDialog;
+    iget-object v0, p0, Lcom/android/internal/telephony/uicc/UiccCard$TimerTask;->val$dialog:Landroid/app/AlertDialog;
 
     if-eqz v0, :cond_0
 
-    iget-object v0, p0, Lcom/android/internal/telephony/uicc/UiccCard$TimeTask;->val$dialog:Landroid/app/AlertDialog;
+    iget-object v0, p0, Lcom/android/internal/telephony/uicc/UiccCard$TimerTask;->val$dialog:Landroid/app/AlertDialog;
 
     invoke-virtual {v0}, Landroid/app/AlertDialog;->dismiss()V
 
     :cond_0
-    iget-object v0, p0, Lcom/android/internal/telephony/uicc/UiccCard$TimeTask;->val$t:Ljava/util/Timer;
+    iget-object v0, p0, Lcom/android/internal/telephony/uicc/UiccCard$TimerTask;->val$t:Ljava/util/Timer;
 
     invoke-virtual {v0}, Ljava/util/Timer;->cancel()V
 

diff --git a/services.jar.out/smali/com/android/server/InputMethodManagerService.smali b/services.jar.out/smali/com/android/server/InputMethodManagerService.smali
@@ -7015,7 +7015,7 @@
 
     iget-object v0, p0, Lcom/android/server/InputMethodManagerService;->mDialogBuilder:Landroid/app/AlertDialog$Builder;
 
-    const v1, 0x104047f
+    sget v1, Lcom/android/internal/R$string;->select_input_method:I
 
     invoke-virtual {v0, v1}, Landroid/app/AlertDialog$Builder;->setTitle(I)Landroid/app/AlertDialog$Builder;