apply patch to new stockrom b932

Change-Id: I33a8ae19106901ce54b28a10b48a4bf0dba2714e
MiCode · Aug 30, 2012 · 72a0abc · 72a0abc
1 parent 43da91f
commit 72a0abc
Show file tree

Hide file tree

Showing 147 changed files with 6,078 additions and 5,264 deletions.
diff --git a/ProjectMenuAct/AndroidManifest.xml b/ProjectMenuAct/AndroidManifest.xml
@@ -40,8 +40,8 @@
     <uses-permission android:name="android.permission.BATTERY_STATS" />
     <uses-permission android:name="com.android.launcher.permission.READ_SETTINGS" />
     <uses-permission android:name="com.android.launcher.permission.WRITE_SETTINGS" />
-    <application android:label="@string/app_name" android:icon="@drawable/icon">
+    <application android:label="@string/app_name" android:icon="@drawable/icon" android:theme="@android:style/Theme.Holo.Light">
-        <activity android:label="@string/app_name" android:name=".ProjectMenuAct" android:taskAffinity="android.task.projectmenu" android:clearTaskOnLaunch="true" android:launchMode="singleTask">
+        <activity android:label="@string/app_name" android:name=".ProjectMenuAct" android:taskAffinity="android.task.projectmenu" android:clearTaskOnLaunch="true" android:launchMode="singleTask" >
             <intent-filter>
                 <action android:name="com.android.huawei.PROJECT_MENU" />
                 <category android:name="android.intent.category.DEFAULT" />

diff --git a/ProjectMenuAct/apktool.yml b/ProjectMenuAct/apktool.yml
@@ -4,3 +4,4 @@ isFrameworkApk: false
 usesFramework:
   ids:
   - 1
+  - 6
diff --git a/SettingsProvider/smali/com/android/providers/settings/SettingsProvider.smali b/SettingsProvider/smali/com/android/providers/settings/SettingsProvider.smali
@@ -2050,6 +2050,10 @@
     .locals 13
     .parameter "uri"
     .parameter "mode"
+    .annotation build Landroid/annotation/MiuiHook;
+        value = .enum Landroid/annotation/MiuiHook$MiuiHookType;->CHANGE_CODE:Landroid/annotation/MiuiHook$MiuiHookType;
+    .end annotation
+
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/FileNotFoundException;
@@ -2106,23 +2110,25 @@
 
     move-result v0
 
+    if-nez v0, :cond_0
+
+    invoke-static {v12}, Landroid/media/ExtraRingtoneManager;->isExtraCases(Landroid/net/Uri;)Z
+
+    move-result v0
+
     if-eqz v0, :cond_2
 
-    .line 689
     :cond_0
     if-eqz v10, :cond_1
 
-    .line 694
     :try_start_0
     invoke-static {v7}, Landroid/provider/DrmStore;->enforceAccessDrmPermission(Landroid/content/Context;)V
     :try_end_0
     .catch Ljava/lang/SecurityException; {:try_start_0 .. :try_end_0} :catch_0
 
-    .line 700
+    :goto_0
-    :cond_1
     const/4 v1, 0x0
 
-    .line 702
     .local v1, pfd:Landroid/os/ParcelFileDescriptor;
     :try_start_1
     invoke-virtual {v7}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
@@ -2150,7 +2156,7 @@
     .end local v7           #context:Landroid/content/Context;
     .end local v10           #isDrmAuthority:Z
     .end local v12           #soundUri:Landroid/net/Uri;
-    :goto_0
+    :goto_1
     return-object v0
 
     .line 695
@@ -2173,13 +2179,18 @@
 
     throw v0
 
-    .line 704
     .end local v8           #e:Ljava/lang/SecurityException;
+    :cond_1
+    invoke-static {v12, v11}, Landroid/media/ExtraRingtoneManager;->getUriForExtraCases(Landroid/net/Uri;I)Landroid/net/Uri;
+
+    move-result-object v12
+
+    goto :goto_0
+
     .restart local v1       #pfd:Landroid/os/ParcelFileDescriptor;
     :catch_1
     move-exception v0
 
-    .line 710
     .end local v1           #pfd:Landroid/os/ParcelFileDescriptor;
     :cond_2
     :try_start_2
@@ -2189,7 +2200,7 @@
 
     move-result-object v0
 
-    goto :goto_0
+    goto :goto_1
 
     .line 711
     :catch_2
@@ -2207,7 +2218,7 @@
 
     move-result-object v0
 
-    goto :goto_0
+    goto :goto_1
 
     .line 720
     .end local v6           #authority:Ljava/lang/String;
@@ -2228,13 +2239,17 @@
 
     move-result-object v0
 
-    goto :goto_0
+    goto :goto_1
 .end method
 
 .method public openFile(Landroid/net/Uri;Ljava/lang/String;)Landroid/os/ParcelFileDescriptor;
     .locals 8
     .parameter "uri"
     .parameter "mode"
+    .annotation build Landroid/annotation/MiuiHook;
+        value = .enum Landroid/annotation/MiuiHook$MiuiHookType;->CHANGE_CODE:Landroid/annotation/MiuiHook$MiuiHookType;
+    .end annotation
+
     .annotation system Ldalvik/annotation/Throws;
         value = {
             Ljava/io/FileNotFoundException;
@@ -2291,20 +2306,23 @@
 
     move-result v6
 
+    if-nez v6, :cond_0
+
+    invoke-static {v5}, Landroid/media/ExtraRingtoneManager;->isExtraCases(Landroid/net/Uri;)Z
+
+    move-result v6
+
     if-eqz v6, :cond_2
 
-    .line 648
     :cond_0
     if-eqz v3, :cond_1
 
-    .line 653
     :try_start_0
     invoke-static {v1}, Landroid/provider/DrmStore;->enforceAccessDrmPermission(Landroid/content/Context;)V
     :try_end_0
     .catch Ljava/lang/SecurityException; {:try_start_0 .. :try_end_0} :catch_0
 
-    .line 659
+    :goto_0
-    :cond_1
     invoke-virtual {v1}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
 
     move-result-object v6
@@ -2318,7 +2336,7 @@
     .end local v1           #context:Landroid/content/Context;
     .end local v3           #isDrmAuthority:Z
     .end local v5           #soundUri:Landroid/net/Uri;
-    :goto_0
+    :goto_1
     return-object v6
 
     .line 654
@@ -2341,6 +2359,14 @@
 
     throw v6
 
+    .end local v2           #e:Ljava/lang/SecurityException;
+    :cond_1
+    invoke-static {v5, v4}, Landroid/media/ExtraRingtoneManager;->getUriForExtraCases(Landroid/net/Uri;I)Landroid/net/Uri;
+
+    move-result-object v5
+
+    goto :goto_0
+
     .line 664
     .end local v0           #authority:Ljava/lang/String;
     .end local v1           #context:Landroid/content/Context;
@@ -2352,7 +2378,7 @@
 
     move-result-object v6
 
-    goto :goto_0
+    goto :goto_1
 .end method
 
 .method public query(Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;

diff --git a/...policy.jar.out/smali/com/android/internal/policy/impl/KeyguardUpdateMonitor$SimArgs.smali b/...policy.jar.out/smali/com/android/internal/policy/impl/KeyguardUpdateMonitor$SimArgs.smali
@@ -273,7 +273,9 @@
     .line 181
     .end local v2           #state:Lcom/android/internal/telephony/IccCard$State;
     :cond_8
-    sget-object v2, Lcom/android/internal/telephony/IccCard$State;->UNKNOWN:Lcom/android/internal/telephony/IccCard$State;
+    invoke-static {v3}, Lcom/android/internal/policy/impl/KeyguardUpdateMonitor$SimArgs;->getIccCardState(Ljava/lang/String;)Lcom/android/internal/telephony/IccCard$State;
+
+    move-result-object v2
 
     .restart local v2       #state:Lcom/android/internal/telephony/IccCard$State;
     goto :goto_0
@@ -294,3 +296,48 @@
 
     return-object v0
 .end method
+
+.method private static getIccCardState(Ljava/lang/String;)Lcom/android/internal/telephony/IccCard$State;
+    .locals 2
+    .parameter "stateExtra"
+    .annotation build Landroid/annotation/MiuiHook;
+        value = .enum Landroid/annotation/MiuiHook$MiuiHookType;->NEW_METHOD:Landroid/annotation/MiuiHook$MiuiHookType;
+    .end annotation
+
+    .prologue
+    const-string v1, "IMSI"
+
+    invoke-virtual {v1, p0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_0
+
+    sget-object v0, Lcom/android/internal/telephony/IccCard$State;->READY:Lcom/android/internal/telephony/IccCard$State;
+
+    .local v0, state:Lcom/android/internal/telephony/IccCard$State;
+    :goto_0
+    return-object v0
+
+    .end local v0           #state:Lcom/android/internal/telephony/IccCard$State;
+    :cond_0
+    const-string v1, "LOADED"
+
+    invoke-virtual {v1, p0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+    move-result v1
+
+    if-eqz v1, :cond_1
+
+    sget-object v0, Lcom/android/internal/telephony/IccCard$State;->READY:Lcom/android/internal/telephony/IccCard$State;
+
+    .restart local v0       #state:Lcom/android/internal/telephony/IccCard$State;
+    goto :goto_0
+
+    .end local v0           #state:Lcom/android/internal/telephony/IccCard$State;
+    :cond_1
+    sget-object v0, Lcom/android/internal/telephony/IccCard$State;->UNKNOWN:Lcom/android/internal/telephony/IccCard$State;
+
+    .restart local v0       #state:Lcom/android/internal/telephony/IccCard$State;
+    goto :goto_0
+.end method
diff --git a/android.policy.jar.out/smali/com/android/internal/policy/impl/KeyguardViewBase.smali b/android.policy.jar.out/smali/com/android/internal/policy/impl/KeyguardViewBase.smali
@@ -472,3 +472,16 @@
 
 .method public abstract wakeWhenReadyTq(I)V
 .end method
+
+.method public isDisplayDesktop()Z
+    .locals 1
+    .annotation build Landroid/annotation/MiuiHook;
+        value = .enum Landroid/annotation/MiuiHook$MiuiHookType;->NEW_METHOD:Landroid/annotation/MiuiHook$MiuiHookType;
+    .end annotation
+
+    .prologue
+    const/4 v0, 0x0
+
+    return v0
+.end method
+