Permalink
Browse files

apply patch to new stockrom b932

Change-Id: I33a8ae19106901ce54b28a10b48a4bf0dba2714e
  • Loading branch information...
1 parent 43da91f commit 72a0abce6e81f3957dc1cc157c414777948b6aea @yu88my yu88my committed Aug 30, 2012
Showing with 6,078 additions and 5,264 deletions.
  1. +2 −2 ProjectMenuAct/AndroidManifest.xml
  2. +1 −0 ProjectMenuAct/apktool.yml
  3. +43 −17 SettingsProvider/smali/com/android/providers/settings/SettingsProvider.smali
  4. +48 −1 android.policy.jar.out/smali/com/android/internal/policy/impl/KeyguardUpdateMonitor$SimArgs.smali
  5. +13 −0 android.policy.jar.out/smali/com/android/internal/policy/impl/KeyguardViewBase.smali
  6. +86 −23 android.policy.jar.out/smali/com/android/internal/policy/impl/KeyguardViewManager.smali
  7. +15 −45 android.policy.jar.out/smali/com/android/internal/policy/impl/KeyguardViewMediator.smali
  8. +1 −1 android.policy.jar.out/smali/com/android/internal/policy/impl/LockPatternKeyguardView$3.smali
  9. +72 −43 android.policy.jar.out/smali/com/android/internal/policy/impl/LockPatternKeyguardView.smali
  10. +12 −3 android.policy.jar.out/smali/com/android/internal/policy/impl/PhoneFallbackEventHandler.smali
  11. +105 −1 android.policy.jar.out/smali/com/android/internal/policy/impl/PhoneWindow$DecorView.smali
  12. +80 −1 android.policy.jar.out/smali/com/android/internal/policy/impl/PhoneWindow.smali
  13. +3 −2 android.policy.jar.out/smali/com/android/internal/policy/impl/PhoneWindowManager$24$1.smali
  14. +4 −2 android.policy.jar.out/smali/com/android/internal/policy/impl/PhoneWindowManager$24.smali
  15. +8 −15 android.policy.jar.out/smali/com/android/internal/policy/impl/PhoneWindowManager.smali
  16. +10 −10 android.policy.jar.out/smali/com/android/internal/policy/impl/Policy.smali
  17. +0 −1 framework-res/res/drawable/screen_background_selector_light.xml
  18. +7 −0 framework-res/res/values/arrays.xml
  19. +1 −1 framework-res/res/xml/power_profile.xml
  20. +2 −2 framework.jar.out/smali/android/accounts/AccountManagerService.smali
  21. +27 −4 framework.jar.out/smali/android/app/Activity.smali
  22. +3 −7 framework.jar.out/smali/android/app/ActivityManager.smali
  23. +29 −13 framework.jar.out/smali/android/app/ActivityThread.smali
  24. +1 −1 framework.jar.out/smali/android/app/ApplicationPackageManager$ResourceName.smali
  25. +25 −40 framework.jar.out/smali/android/app/ApplicationPackageManager.smali
  26. +3 −4 framework.jar.out/smali/android/app/ContextImpl$11.smali
  27. +73 −5 framework.jar.out/smali/android/app/ContextImpl.smali
  28. +22 −14 framework.jar.out/smali/android/app/DownloadManager$CursorTranslator.smali
  29. +49 −9 framework.jar.out/smali/android/app/DownloadManager$Query.smali
  30. +1 −1 framework.jar.out/smali/android/app/DownloadManager.smali
  31. +12 −6 framework.jar.out/smali/android/app/LoadedApk.smali
  32. +4 −7 framework.jar.out/smali/android/bluetooth/BluetoothAdapter.smali
  33. +2 −0 framework.jar.out/smali/android/content/pm/ApplicationInfo.smali
  34. +4 −2 framework.jar.out/smali/android/content/pm/PackageItemInfo.smali
  35. +4 −0 framework.jar.out/smali/android/content/pm/PackageManager.smali
  36. +86 −13 framework.jar.out/smali/android/content/pm/PackageParser.smali
  37. +2 −0 framework.jar.out/smali/android/content/pm/ParceledListSlice$1.smali
  38. +46 −6 framework.jar.out/smali/android/content/pm/ResolveInfo.smali
  39. +4 −20 framework.jar.out/smali/android/content/res/AssetManager.smali
  40. +101 −155 framework.jar.out/smali/android/content/res/Configuration.smali
  41. +2 −2 framework.jar.out/smali/android/content/res/Resources$Theme.smali
  42. +58 −20 framework.jar.out/smali/android/content/res/Resources.smali
  43. +2 −2 framework.jar.out/smali/android/graphics/drawable/AnimationDrawable$AnimationState.smali
  44. +1 −1 framework.jar.out/smali/android/graphics/drawable/AnimationDrawable.smali
  45. +8 −13 framework.jar.out/smali/android/graphics/drawable/DrawableContainer$DrawableContainerState.smali
  46. +6 −0 framework.jar.out/smali/android/graphics/drawable/NinePatchDrawable.smali
  47. +37 −41 framework.jar.out/smali/android/media/AudioService.smali
  48. +35 −44 framework.jar.out/smali/android/media/MediaFile.smali
  49. +110 −12 framework.jar.out/smali/android/media/MediaScanner$MyMediaScannerClient.smali
  50. +1 −1 framework.jar.out/smali/android/media/MediaScanner.smali
  51. +2 −14 framework.jar.out/smali/android/net/NetworkPolicyManager.smali
  52. +3 −12 framework.jar.out/smali/android/net/Proxy.smali
  53. +11 −0 framework.jar.out/smali/android/os/Vibrator.smali
  54. +32 −4 framework.jar.out/smali/android/preference/CheckBoxPreference.smali
  55. +6 −0 framework.jar.out/smali/android/preference/RingtonePreference.smali
  56. +54 −4 framework.jar.out/smali/android/provider/CallLog$Calls.smali
  57. +4 −5 framework.jar.out/smali/android/provider/Telephony$Sms.smali
  58. +19 −25 framework.jar.out/smali/android/telephony/PhoneNumberUtils.smali
  59. +4 −3 framework.jar.out/smali/android/telephony/TelephonyManager.smali
  60. +9 −2 framework.jar.out/smali/android/text/format/DateFormat.smali
  61. +3 −0 framework.jar.out/smali/android/view/HapticFeedbackConstants.smali
  62. +46 −498 framework.jar.out/smali/android/view/View.smali
  63. +97 −29 framework.jar.out/smali/android/view/ViewRootImpl.smali
  64. +2 −2 framework.jar.out/smali/android/webkit/HTML5VideoViewProxy$VideoPlayer.smali
  65. +77 −2 framework.jar.out/smali/android/widget/AbsListView.smali
  66. +3 −1 framework.jar.out/smali/android/widget/LinearLayout.smali
  67. +9 −13 framework.jar.out/smali/android/widget/QuickContactBadge$QueryHandler.smali
  68. +51 −48 framework.jar.out/smali/android/widget/QuickContactBadge.smali
  69. +20 −3 framework.jar.out/smali/android/widget/RemoteViews.smali
  70. +1 −9 framework.jar.out/smali/android/widget/SuggestionsAdapter.smali
  71. +0 −12 framework.jar.out/smali/android/widget/TextView$InsertionPointCursorController.smali
  72. +87 −0 framework.jar.out/smali/android/widget/TextView$PastePanelOnClickListener.smali
  73. +7 −7 framework.jar.out/smali/android/widget/TextView$SelectionActionModeCallback.smali
  74. +2 −2 framework.jar.out/smali/android/widget/TextView$SuggestionsPopupWindow$CustomPopupWindow.smali
  75. +1 −1 framework.jar.out/smali/android/widget/TextView$TextViewPositionListener.smali
  76. +1,635 −2,748 framework.jar.out/smali/android/widget/TextView.smali
  77. +4 −3 framework.jar.out/smali/android/widget/TimePicker$4.smali
  78. +4 −3 framework.jar.out/smali/android/widget/TimePicker$5.smali
  79. +4 −10 framework.jar.out/smali/android/widget/TimePicker.smali
  80. +10 −0 framework.jar.out/smali/android/widget/Toast$TN.smali
  81. +20 −0 framework.jar.out/smali/android/widget/Toast.smali
  82. +2 −3 framework.jar.out/smali/com/android/internal/app/ShutdownThread$3.smali
  83. +30 −3 framework.jar.out/smali/com/android/internal/app/ShutdownThread$CloseDialogReceiver.smali
  84. +151 −7 framework.jar.out/smali/com/android/internal/app/ShutdownThread.smali
  85. +2 −6 framework.jar.out/smali/com/android/internal/telephony/AdnRecord.smali
  86. +60 −22 framework.jar.out/smali/com/android/internal/telephony/AdnRecordCache.smali
  87. +21 −33 framework.jar.out/smali/com/android/internal/telephony/CallerInfo.smali
  88. +9 −0 ...r.out/smali/com/android/internal/telephony/CallerInfoAsyncQuery$CallerInfoAsyncQueryHandler.smali
  89. +31 −1 framework.jar.out/smali/com/android/internal/telephony/CallerInfoAsyncQuery.smali
  90. +54 −2 framework.jar.out/smali/com/android/internal/telephony/DataConnectionTracker.smali
  91. +116 −0 framework.jar.out/smali/com/android/internal/telephony/IIccPhoneBook$Stub$Proxy.smali
  92. +40 −5 framework.jar.out/smali/com/android/internal/telephony/IIccPhoneBook$Stub.smali
  93. +16 −0 framework.jar.out/smali/com/android/internal/telephony/IIccPhoneBook.smali
  94. +1 −1 framework.jar.out/smali/com/android/internal/telephony/ITelephony$Stub.smali
  95. +1 −1 framework.jar.out/smali/com/android/internal/telephony/IccCard$1.smali
  96. +5 −5 framework.jar.out/smali/com/android/internal/telephony/IccCard$State.smali
  97. +4 −9 framework.jar.out/smali/com/android/internal/telephony/IccCardProxy.smali
  98. +26 −0 framework.jar.out/smali/com/android/internal/telephony/IccPhoneBookInterfaceManager.smali
  99. +26 −0 framework.jar.out/smali/com/android/internal/telephony/IccPhoneBookInterfaceManagerProxy.smali
  100. +3 −3 framework.jar.out/smali/com/android/internal/telephony/IccProvider.smali
  101. +47 −13 framework.jar.out/smali/com/android/internal/telephony/SMSDispatcher.smali
  102. +13 −3 framework.jar.out/smali/com/android/internal/telephony/SmsUsageMonitor.smali
  103. +2 −5 framework.jar.out/smali/com/android/internal/telephony/UiccCardApplication.smali
  104. +29 −1 framework.jar.out/smali/com/android/internal/telephony/WapPushOverSms.smali
  105. +2 −11 framework.jar.out/smali/com/android/internal/telephony/cdma/CdmaConnection.smali
  106. +90 −3 framework.jar.out/smali/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.smali
  107. +87 −4 framework.jar.out/smali/com/android/internal/telephony/gsm/GsmDataConnectionTracker.smali
  108. +42 −15 framework.jar.out/smali/com/android/internal/telephony/gsm/SIMRecords.smali
  109. +8 −0 framework.jar.out/smali/com/android/internal/view/menu/ActionMenuItemView.smali
  110. +1 −29 framework.jar.out/smali/com/android/internal/view/menu/ActionMenuPresenter.smali
  111. +75 −10 framework.jar.out/smali/com/android/internal/view/menu/ActionMenuView.smali
  112. +26 −0 framework.jar.out/smali/com/android/internal/view/menu/MenuItemImpl.smali
  113. +50 −4 framework.jar.out/smali/com/android/internal/widget/ActionBarContainer.smali
  114. +42 −88 framework.jar.out/smali/com/android/internal/widget/ActionBarView$HomeView.smali
  115. +42 −1 framework.jar.out/smali/com/android/internal/widget/LockPatternUtils$PasswordFileObserver.smali
  116. +84 −2 framework.jar.out/smali/com/android/internal/widget/LockPatternUtils.smali
  117. +2 −3 framework.jar.out/smali/com/android/internal/widget/ScrollingTabContainerView.smali
  118. +3 −3 framework.jar.out/smali/com/android/internal/widget/multiwaveview/Ease$Quad.smali
  119. +2 −2 framework.jar.out/smali/com/android/internal/widget/multiwaveview/Ease.smali
  120. +89 −182 framework.jar.out/smali/com/android/internal/widget/multiwaveview/MultiWaveView.smali
  121. +2 −2 framework.jar.out/smali/com/android/internal/widget/multiwaveview/Tweener.smali
  122. +1 −1 makefile
  123. +12 −16 other/{build-b923.prop → build-b932.prop}
  124. +27 −0 services.jar.out/smali/com/android/server/AppWidgetService$3.smali
  125. +13 −6 services.jar.out/smali/com/android/server/AppWidgetService.smali
  126. +146 −19 services.jar.out/smali/com/android/server/BackupManagerService.smali
  127. +39 −32 services.jar.out/smali/com/android/server/ConnectivityService.smali
  128. +10 −10 services.jar.out/smali/com/android/server/LightsService$Light.smali
  129. +1 −1 services.jar.out/smali/com/android/server/LightsService.smali
  130. +103 −5 services.jar.out/smali/com/android/server/NotificationManagerService.smali
  131. +58 −38 services.jar.out/smali/com/android/server/PowerManagerService.smali
  132. +4 −9 services.jar.out/smali/com/android/server/ServerThread.smali
  133. +61 −36 services.jar.out/smali/com/android/server/UiModeManagerService.smali
  134. +13 −3 services.jar.out/smali/com/android/server/am/ActivityManagerService$2.smali
  135. +165 −45 services.jar.out/smali/com/android/server/am/ActivityManagerService.smali
  136. +10 −0 services.jar.out/smali/com/android/server/am/ActivityStack.smali
  137. +55 −5 services.jar.out/smali/com/android/server/am/AppErrorDialog$1.smali
  138. +36 −14 services.jar.out/smali/com/android/server/am/AppErrorDialog.smali
  139. +17 −4 services.jar.out/smali/com/android/server/am/AppNotRespondingDialog$1.smali
  140. +1 −5 services.jar.out/smali/com/android/server/am/BaseErrorDialog.smali
  141. +38 −0 services.jar.out/smali/com/android/server/location/GpsLocationProvider.smali
  142. +81 −451 services.jar.out/smali/com/android/server/net/NetworkPolicyManagerService.smali
  143. +1 −3 services.jar.out/smali/com/android/server/pm/GrantedPermissions.smali
  144. +75 −0 services.jar.out/smali/com/android/server/pm/PackageManagerService$PackageHandler.smali
  145. +262 −5 services.jar.out/smali/com/android/server/pm/PackageManagerService.smali
  146. +12 −1 services.jar.out/smali/com/android/server/pm/Settings.smali
  147. +3 −0 services.jar.out/smali/com/android/server/wm/WindowManagerService.smali
@@ -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">
- <activity android:label="@string/app_name" android:name=".ProjectMenuAct" android:taskAffinity="android.task.projectmenu" android:clearTaskOnLaunch="true" android:launchMode="singleTask">
+ <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" >
<intent-filter>
<action android:name="com.android.huawei.PROJECT_MENU" />
<category android:name="android.intent.category.DEFAULT" />
@@ -4,3 +4,4 @@ isFrameworkApk: false
usesFramework:
ids:
- 1
+ - 6
@@ -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
- :cond_1
+ :goto_0
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
- :cond_1
+ :goto_0
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;
@@ -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
@@ -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
+
Oops, something went wrong.

0 comments on commit 72a0abc

Please sign in to comment.