API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Feb 8th, 2013
2,637
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 43.32 KB | None | 0 0
raw download clone embed print report
  1. diff -rupN XXLS8/framework/android.policy/smali/com/android/internal/policy/impl/SimPukUnlockScreen.smali XWLSD/framework/android.policy/smali/com/android/internal/policy/impl/SimPukUnlockScreen.smali
  2. --- XXLS8/framework/android.policy/smali/com/android/internal/policy/impl/SimPukUnlockScreen.smali 2013-02-08 13:35:06.706980573 +0100
  3. +++ XWLSD/framework/android.policy/smali/com/android/internal/policy/impl/SimPukUnlockScreen.smali 2013-02-08 13:33:11.294975069 +0100
  4. @@ -786,7 +786,9 @@
  5.  
  6. iget-object v0, p0, Lcom/android/internal/policy/impl/SimPukUnlockScreen;->mUpdateMonitor:Lcom/android/internal/policy/impl/KeyguardUpdateMonitor;
  7.  
  8. - invoke-virtual {v0}, Lcom/android/internal/policy/impl/KeyguardUpdateMonitor;->reportSimUnlocked()V
  9. + sget-object v1, Lcom/android/internal/telephony/IccCard$State;->PUK_REQUIRED:Lcom/android/internal/telephony/IccCard$State;
  10. +
  11. + invoke-virtual {v0, v1}, Lcom/android/internal/policy/impl/KeyguardUpdateMonitor;->reportSimUnlocked(Lcom/android/internal/telephony/IccCard$State;)V
  12.  
  13. iget-object v0, p0, Lcom/android/internal/policy/impl/SimPukUnlockScreen;->mCallback:Lcom/android/internal/policy/impl/KeyguardScreenCallback;
  14.  
  15. diff -rupN XXLS8/framework/android.policy/smali/com/android/internal/policy/impl/SimUnlockScreen.smali XWLSD/framework/android.policy/smali/com/android/internal/policy/impl/SimUnlockScreen.smali
  16. --- XXLS8/framework/android.policy/smali/com/android/internal/policy/impl/SimUnlockScreen.smali 2013-02-08 13:35:06.718980573 +0100
  17. +++ XWLSD/framework/android.policy/smali/com/android/internal/policy/impl/SimUnlockScreen.smali 2013-02-08 13:33:11.394975074 +0100
  18. @@ -747,7 +747,9 @@
  19.  
  20. iget-object v0, p0, Lcom/android/internal/policy/impl/SimUnlockScreen;->mUpdateMonitor:Lcom/android/internal/policy/impl/KeyguardUpdateMonitor;
  21.  
  22. - invoke-virtual {v0}, Lcom/android/internal/policy/impl/KeyguardUpdateMonitor;->reportSimUnlocked()V
  23. + sget-object v1, Lcom/android/internal/telephony/IccCard$State;->PIN_REQUIRED:Lcom/android/internal/telephony/IccCard$State;
  24. +
  25. + invoke-virtual {v0, v1}, Lcom/android/internal/policy/impl/KeyguardUpdateMonitor;->reportSimUnlocked(Lcom/android/internal/telephony/IccCard$State;)V
  26.  
  27. iget-object v0, p0, Lcom/android/internal/policy/impl/SimUnlockScreen;->mCallback:Lcom/android/internal/policy/impl/KeyguardScreenCallback;
  28.  
  29. diff -rupN XXLS8/framework/framework/smali/android/media/AmrInputStream.smali XWLSD/framework/framework/smali/android/media/AmrInputStream.smali
  30. --- XXLS8/framework/framework/smali/android/media/AmrInputStream.smali 2013-02-08 13:35:39.018982113 +0100
  31. +++ XWLSD/framework/framework/smali/android/media/AmrInputStream.smali 2013-02-08 13:33:44.718976663 +0100
  32. @@ -27,7 +27,7 @@
  33. .method static constructor <clinit>()V
  34. .locals 1
  35.  
  36. - const-string v0, "media_jni"
  37. + const-string/jumbo v0, "media_jni"
  38.  
  39. invoke-static {v0}, Ljava/lang/System;->loadLibrary(Ljava/lang/String;)V
  40.  
  41. diff -rupN XXLS8/framework/framework/smali/android/media/CamcorderProfile.smali XWLSD/framework/framework/smali/android/media/CamcorderProfile.smali
  42. --- XXLS8/framework/framework/smali/android/media/CamcorderProfile.smali 2013-02-08 13:35:39.098982117 +0100
  43. +++ XWLSD/framework/framework/smali/android/media/CamcorderProfile.smali 2013-02-08 13:33:44.670976661 +0100
  44. @@ -75,7 +75,7 @@
  45. .method static constructor <clinit>()V
  46. .locals 1
  47.  
  48. - const-string v0, "media_jni"
  49. + const-string/jumbo v0, "media_jni"
  50.  
  51. invoke-static {v0}, Ljava/lang/System;->loadLibrary(Ljava/lang/String;)V
  52.  
  53. diff -rupN XXLS8/framework/framework/smali/android/media/CameraProfile.smali XWLSD/framework/framework/smali/android/media/CameraProfile.smali
  54. --- XXLS8/framework/framework/smali/android/media/CameraProfile.smali 2013-02-08 13:35:39.098982117 +0100
  55. +++ XWLSD/framework/framework/smali/android/media/CameraProfile.smali 2013-02-08 13:33:44.702976662 +0100
  56. @@ -32,7 +32,7 @@
  57.  
  58. sput-object v0, Landroid/media/CameraProfile;->sCache:Ljava/util/HashMap;
  59.  
  60. - const-string v0, "media_jni"
  61. + const-string/jumbo v0, "media_jni"
  62.  
  63. invoke-static {v0}, Ljava/lang/System;->loadLibrary(Ljava/lang/String;)V
  64.  
  65. diff -rupN XXLS8/framework/framework/smali/android/media/DecoderCapabilities.smali XWLSD/framework/framework/smali/android/media/DecoderCapabilities.smali
  66. --- XXLS8/framework/framework/smali/android/media/DecoderCapabilities.smali 2013-02-08 13:35:39.098982117 +0100
  67. +++ XWLSD/framework/framework/smali/android/media/DecoderCapabilities.smali 2013-02-08 13:33:44.574976656 +0100
  68. @@ -16,7 +16,7 @@
  69. .method static constructor <clinit>()V
  70. .locals 1
  71.  
  72. - const-string v0, "media_jni"
  73. + const-string/jumbo v0, "media_jni"
  74.  
  75. invoke-static {v0}, Ljava/lang/System;->loadLibrary(Ljava/lang/String;)V
  76.  
  77. diff -rupN XXLS8/framework/framework/smali/android/media/EncoderCapabilities.smali XWLSD/framework/framework/smali/android/media/EncoderCapabilities.smali
  78. --- XXLS8/framework/framework/smali/android/media/EncoderCapabilities.smali 2013-02-08 13:35:39.114982118 +0100
  79. +++ XWLSD/framework/framework/smali/android/media/EncoderCapabilities.smali 2013-02-08 13:33:44.590976657 +0100
  80. @@ -20,7 +20,7 @@
  81. .method static constructor <clinit>()V
  82. .locals 1
  83.  
  84. - const-string v0, "media_jni"
  85. + const-string/jumbo v0, "media_jni"
  86.  
  87. invoke-static {v0}, Ljava/lang/System;->loadLibrary(Ljava/lang/String;)V
  88.  
  89. diff -rupN XXLS8/framework/framework/smali/android/media/MediaCodecList.smali XWLSD/framework/framework/smali/android/media/MediaCodecList.smali
  90. --- XXLS8/framework/framework/smali/android/media/MediaCodecList.smali 2013-02-08 13:35:39.130982119 +0100
  91. +++ XWLSD/framework/framework/smali/android/media/MediaCodecList.smali 2013-02-08 13:33:44.658976660 +0100
  92. @@ -7,7 +7,7 @@
  93. .method static constructor <clinit>()V
  94. .locals 1
  95.  
  96. - const-string v0, "media_jni"
  97. + const-string/jumbo v0, "media_jni"
  98.  
  99. invoke-static {v0}, Ljava/lang/System;->loadLibrary(Ljava/lang/String;)V
  100.  
  101. diff -rupN XXLS8/framework/framework/smali/android/media/MediaCodec.smali XWLSD/framework/framework/smali/android/media/MediaCodec.smali
  102. --- XXLS8/framework/framework/smali/android/media/MediaCodec.smali 2013-02-08 13:35:39.130982119 +0100
  103. +++ XWLSD/framework/framework/smali/android/media/MediaCodec.smali 2013-02-08 13:33:44.734976664 +0100
  104. @@ -45,7 +45,7 @@
  105. .method static constructor <clinit>()V
  106. .locals 1
  107.  
  108. - const-string v0, "media_jni"
  109. + const-string/jumbo v0, "media_jni"
  110.  
  111. invoke-static {v0}, Ljava/lang/System;->loadLibrary(Ljava/lang/String;)V
  112.  
  113. diff -rupN XXLS8/framework/framework/smali/android/media/MediaCrypto.smali XWLSD/framework/framework/smali/android/media/MediaCrypto.smali
  114. --- XXLS8/framework/framework/smali/android/media/MediaCrypto.smali 2013-02-08 13:35:39.134982119 +0100
  115. +++ XWLSD/framework/framework/smali/android/media/MediaCrypto.smali 2013-02-08 13:33:44.614976658 +0100
  116. @@ -11,7 +11,7 @@
  117. .method static constructor <clinit>()V
  118. .locals 1
  119.  
  120. - const-string v0, "media_jni"
  121. + const-string/jumbo v0, "media_jni"
  122.  
  123. invoke-static {v0}, Ljava/lang/System;->loadLibrary(Ljava/lang/String;)V
  124.  
  125. diff -rupN XXLS8/framework/framework/smali/android/media/MediaExtractor.smali XWLSD/framework/framework/smali/android/media/MediaExtractor.smali
  126. --- XXLS8/framework/framework/smali/android/media/MediaExtractor.smali 2013-02-08 13:35:39.134982119 +0100
  127. +++ XWLSD/framework/framework/smali/android/media/MediaExtractor.smali 2013-02-08 13:33:44.726976664 +0100
  128. @@ -23,7 +23,7 @@
  129. .method static constructor <clinit>()V
  130. .locals 1
  131.  
  132. - const-string v0, "media_jni"
  133. + const-string/jumbo v0, "media_jni"
  134.  
  135. invoke-static {v0}, Ljava/lang/System;->loadLibrary(Ljava/lang/String;)V
  136.  
  137. diff -rupN XXLS8/framework/framework/smali/android/media/MediaMetadataRetriever.smali XWLSD/framework/framework/smali/android/media/MediaMetadataRetriever.smali
  138. --- XXLS8/framework/framework/smali/android/media/MediaMetadataRetriever.smali 2013-02-08 13:35:39.138982119 +0100
  139. +++ XWLSD/framework/framework/smali/android/media/MediaMetadataRetriever.smali 2013-02-08 13:33:44.614976658 +0100
  140. @@ -107,7 +107,7 @@
  141. .method static constructor <clinit>()V
  142. .locals 1
  143.  
  144. - const-string v0, "media_jni"
  145. + const-string/jumbo v0, "media_jni"
  146.  
  147. invoke-static {v0}, Ljava/lang/System;->loadLibrary(Ljava/lang/String;)V
  148.  
  149. diff -rupN XXLS8/framework/framework/smali/android/media/MediaPlayer.smali XWLSD/framework/framework/smali/android/media/MediaPlayer.smali
  150. --- XXLS8/framework/framework/smali/android/media/MediaPlayer.smali 2013-02-08 13:35:39.146982120 +0100
  151. +++ XWLSD/framework/framework/smali/android/media/MediaPlayer.smali 2013-02-08 13:33:44.650976660 +0100
  152. @@ -185,7 +185,7 @@
  153. .method static constructor <clinit>()V
  154. .locals 1
  155.  
  156. - const-string v0, "media_jni"
  157. + const-string/jumbo v0, "media_jni"
  158.  
  159. invoke-static {v0}, Ljava/lang/System;->loadLibrary(Ljava/lang/String;)V
  160.  
  161. diff -rupN XXLS8/framework/framework/smali/android/media/MediaRecorder.smali XWLSD/framework/framework/smali/android/media/MediaRecorder.smali
  162. --- XXLS8/framework/framework/smali/android/media/MediaRecorder.smali 2013-02-08 13:35:39.150982120 +0100
  163. +++ XWLSD/framework/framework/smali/android/media/MediaRecorder.smali 2013-02-08 13:33:44.706976663 +0100
  164. @@ -76,7 +76,7 @@
  165. .method static constructor <clinit>()V
  166. .locals 1
  167.  
  168. - const-string v0, "media_jni"
  169. + const-string/jumbo v0, "media_jni"
  170.  
  171. invoke-static {v0}, Ljava/lang/System;->loadLibrary(Ljava/lang/String;)V
  172.  
  173. diff -rupN XXLS8/framework/framework/smali/android/media/MediaScanner.smali XWLSD/framework/framework/smali/android/media/MediaScanner.smali
  174. --- XXLS8/framework/framework/smali/android/media/MediaScanner.smali 2013-02-08 13:35:39.174982121 +0100
  175. +++ XWLSD/framework/framework/smali/android/media/MediaScanner.smali 2013-02-08 13:33:44.730976664 +0100
  176. @@ -199,7 +199,7 @@
  177.  
  178. const/4 v2, 0x0
  179.  
  180. - const-string v0, "media_jni"
  181. + const-string/jumbo v0, "media_jni"
  182.  
  183. invoke-static {v0}, Ljava/lang/System;->loadLibrary(Ljava/lang/String;)V
  184.  
  185. diff -rupN XXLS8/framework/framework/smali/android/media/ResampleInputStream.smali XWLSD/framework/framework/smali/android/media/ResampleInputStream.smali
  186. --- XXLS8/framework/framework/smali/android/media/ResampleInputStream.smali 2013-02-08 13:35:39.182982121 +0100
  187. +++ XWLSD/framework/framework/smali/android/media/ResampleInputStream.smali 2013-02-08 13:33:44.686976662 +0100
  188. @@ -27,7 +27,7 @@
  189. .method static constructor <clinit>()V
  190. .locals 1
  191.  
  192. - const-string v0, "media_jni"
  193. + const-string/jumbo v0, "media_jni"
  194.  
  195. invoke-static {v0}, Ljava/lang/System;->loadLibrary(Ljava/lang/String;)V
  196.  
  197. diff -rupN XXLS8/framework/framework/smali/android/mtp/MtpDatabase.smali XWLSD/framework/framework/smali/android/mtp/MtpDatabase.smali
  198. --- XXLS8/framework/framework/smali/android/mtp/MtpDatabase.smali 2013-02-08 13:35:39.214982123 +0100
  199. +++ XWLSD/framework/framework/smali/android/mtp/MtpDatabase.smali 2013-02-08 13:33:44.090976633 +0100
  200. @@ -199,7 +199,7 @@
  201.  
  202. sput-object v0, Landroid/mtp/MtpDatabase;->OBJECT_INFO_PROJECTION:[Ljava/lang/String;
  203.  
  204. - const-string v0, "media_jni"
  205. + const-string/jumbo v0, "media_jni"
  206.  
  207. invoke-static {v0}, Ljava/lang/System;->loadLibrary(Ljava/lang/String;)V
  208.  
  209. @@ -245,8 +245,6 @@
  210.  
  211. return-void
  212.  
  213. - nop
  214. -
  215. :array_0
  216. .array-data 0x4
  217. 0x1t 0xdct 0x0t 0x0t
  218. diff -rupN XXLS8/framework/framework/smali/android/mtp/MtpDevice.smali XWLSD/framework/framework/smali/android/mtp/MtpDevice.smali
  219. --- XXLS8/framework/framework/smali/android/mtp/MtpDevice.smali 2013-02-08 13:35:39.214982123 +0100
  220. +++ XWLSD/framework/framework/smali/android/mtp/MtpDevice.smali 2013-02-08 13:33:44.086976633 +0100
  221. @@ -17,7 +17,7 @@
  222. .method static constructor <clinit>()V
  223. .locals 1
  224.  
  225. - const-string v0, "media_jni"
  226. + const-string/jumbo v0, "media_jni"
  227.  
  228. invoke-static {v0}, Ljava/lang/System;->loadLibrary(Ljava/lang/String;)V
  229.  
  230. diff -rupN XXLS8/framework/framework/smali/android/mtp/MtpServer.smali XWLSD/framework/framework/smali/android/mtp/MtpServer.smali
  231. --- XXLS8/framework/framework/smali/android/mtp/MtpServer.smali 2013-02-08 13:35:39.218982123 +0100
  232. +++ XWLSD/framework/framework/smali/android/mtp/MtpServer.smali 2013-02-08 13:33:44.090976633 +0100
  233. @@ -14,7 +14,7 @@
  234. .method static constructor <clinit>()V
  235. .locals 1
  236.  
  237. - const-string v0, "media_jni"
  238. + const-string/jumbo v0, "media_jni"
  239.  
  240. invoke-static {v0}, Ljava/lang/System;->loadLibrary(Ljava/lang/String;)V
  241.  
  242. diff -rupN XXLS8/framework/framework/smali/android/telephony/SignalStrength.smali XWLSD/framework/framework/smali/android/telephony/SignalStrength.smali
  243. --- XXLS8/framework/framework/smali/android/telephony/SignalStrength.smali 2013-02-08 13:35:39.778982150 +0100
  244. +++ XWLSD/framework/framework/smali/android/telephony/SignalStrength.smali 2013-02-08 13:33:44.830976669 +0100
  245. @@ -99,7 +99,7 @@
  246.  
  247. const/4 v1, -0x1
  248.  
  249. - invoke-direct/range {p0 .. p0}, Ljava/lang/Object;-><init>()V
  250. + invoke-direct {p0}, Ljava/lang/Object;-><init>()V
  251.  
  252. const/16 v0, 0x63
  253.  
  254. @@ -141,7 +141,7 @@
  255. .method public constructor <init>(IIIIIIIIIIIIZ)V
  256. .locals 1
  257.  
  258. - invoke-direct/range {p0 .. p0}, Ljava/lang/Object;-><init>()V
  259. + invoke-direct {p0}, Ljava/lang/Object;-><init>()V
  260.  
  261. iput p1, p0, Landroid/telephony/SignalStrength;->mGsmSignalStrength:I
  262.  
  263. @@ -179,7 +179,7 @@
  264. .method public constructor <init>(IIIIIIIIIIIIZI)V
  265. .locals 0
  266.  
  267. - invoke-direct/range {p0 .. p0}, Ljava/lang/Object;-><init>()V
  268. + invoke-direct {p0}, Ljava/lang/Object;-><init>()V
  269.  
  270. iput p1, p0, Landroid/telephony/SignalStrength;->mGsmSignalStrength:I
  271.  
  272. @@ -295,7 +295,7 @@
  273. .method public constructor <init>(Landroid/os/Parcel;)V
  274. .locals 1
  275.  
  276. - invoke-direct/range {p0 .. p0}, Ljava/lang/Object;-><init>()V
  277. + invoke-direct {p0}, Ljava/lang/Object;-><init>()V
  278.  
  279. invoke-virtual {p1}, Landroid/os/Parcel;->readInt()I
  280.  
  281. @@ -397,7 +397,7 @@
  282. .method public constructor <init>(Landroid/telephony/SignalStrength;)V
  283. .locals 0
  284.  
  285. - invoke-direct/range {p0 .. p0}, Ljava/lang/Object;-><init>()V
  286. + invoke-direct {p0}, Ljava/lang/Object;-><init>()V
  287.  
  288. invoke-virtual {p0, p1}, Landroid/telephony/SignalStrength;->copyFrom(Landroid/telephony/SignalStrength;)V
  289.  
  290. @@ -2069,7 +2069,7 @@
  291. :cond_1
  292. iget-boolean v4, p0, Landroid/telephony/SignalStrength;->isGsm:Z
  293.  
  294. - if-eqz v4, :cond_3
  295. + if-eqz v4, :cond_4
  296.  
  297. iget v4, p0, Landroid/telephony/SignalStrength;->mLteSignalStrength:I
  298.  
  299. @@ -2135,13 +2135,32 @@
  300. goto :goto_0
  301.  
  302. :cond_2
  303. - invoke-virtual {p0}, Landroid/telephony/SignalStrength;->getLteLevel()I
  304. + invoke-static {}, Lcom/sec/android/app/CscFeature;->getInstance()Lcom/sec/android/app/CscFeature;
  305. +
  306. + move-result-object v4
  307. +
  308. + const-string v5, "CscFeature_Wifi_Enable_Ganlite"
  309. +
  310. + invoke-virtual {v4, v5}, Lcom/sec/android/app/CscFeature;->getEnableStatus(Ljava/lang/String;)Z
  311. +
  312. + move-result v4
  313. +
  314. + if-eqz v4, :cond_3
  315. +
  316. + invoke-virtual {p0}, Landroid/telephony/SignalStrength;->getGsmLevel()I
  317.  
  318. move-result v3
  319.  
  320. goto :goto_1
  321.  
  322. :cond_3
  323. + invoke-virtual {p0}, Landroid/telephony/SignalStrength;->getLteLevel()I
  324. +
  325. + move-result v3
  326. +
  327. + goto :goto_1
  328. +
  329. + :cond_4
  330. invoke-virtual {p0}, Landroid/telephony/SignalStrength;->getCdmaLevel()I
  331.  
  332. move-result v0
  333. @@ -2150,7 +2169,7 @@
  334.  
  335. move-result v2
  336.  
  337. - if-nez v2, :cond_4
  338. + if-nez v2, :cond_5
  339.  
  340. invoke-virtual {p0}, Landroid/telephony/SignalStrength;->getCdmaLevel()I
  341.  
  342. @@ -2158,8 +2177,8 @@
  343.  
  344. goto :goto_1
  345.  
  346. - :cond_4
  347. - if-nez v0, :cond_5
  348. + :cond_5
  349. + if-nez v0, :cond_6
  350.  
  351. invoke-virtual {p0}, Landroid/telephony/SignalStrength;->getEvdoLevel()I
  352.  
  353. @@ -2167,15 +2186,15 @@
  354.  
  355. goto :goto_1
  356.  
  357. - :cond_5
  358. - if-ge v0, v2, :cond_6
  359. + :cond_6
  360. + if-ge v0, v2, :cond_7
  361.  
  362. move v3, v0
  363.  
  364. :goto_2
  365. goto :goto_1
  366.  
  367. - :cond_6
  368. + :cond_7
  369. move v3, v2
  370.  
  371. goto :goto_2
  372. diff -rupN XXLS8/framework/framework/smali/android/text/Selection.smali XWLSD/framework/framework/smali/android/text/Selection.smali
  373. --- XXLS8/framework/framework/smali/android/text/Selection.smali 2013-02-08 13:35:39.850982153 +0100
  374. +++ XWLSD/framework/framework/smali/android/text/Selection.smali 2013-02-08 13:33:42.686976566 +0100
  375. @@ -842,134 +842,85 @@
  376. .end method
  377.  
  378. .method public static setSelection(Landroid/text/Spannable;II)V
  379. - .locals 13
  380. + .locals 7
  381.  
  382. invoke-static {p0}, Landroid/text/Selection;->getSelectionStart(Ljava/lang/CharSequence;)I
  383.  
  384. - move-result v10
  385. + move-result v2
  386.  
  387. invoke-static {p0}, Landroid/text/Selection;->getSelectionEnd(Ljava/lang/CharSequence;)I
  388.  
  389. - move-result v9
  390. + move-result v1
  391.  
  392. invoke-interface {p0}, Landroid/text/Spannable;->length()I
  393.  
  394. - move-result v3
  395. + move-result v0
  396.  
  397. - if-ge p1, v3, :cond_2
  398. + if-ge p1, v0, :cond_1
  399.  
  400. - if-ge p2, v3, :cond_2
  401. + if-ge p2, v0, :cond_1
  402.  
  403. invoke-interface {p0, p1}, Landroid/text/Spannable;->charAt(I)C
  404.  
  405. - move-result v11
  406. + move-result v3
  407.  
  408. invoke-interface {p0, p2}, Landroid/text/Spannable;->charAt(I)C
  409.  
  410. - move-result v12
  411. + move-result v4
  412.  
  413. - invoke-static {v11}, Landroid/text/TextUtils;->isIndianChar(C)Z
  414. + invoke-static {v3}, Landroid/text/TextUtils;->isIndianVowel(C)Z
  415.  
  416. - move-result v2
  417. + move-result v5
  418.  
  419. - if-nez v2, :cond_0
  420. + if-nez v5, :cond_0
  421.  
  422. - invoke-static {v11}, Landroid/text/TextUtils;->isThaiChar(C)Z
  423. + invoke-static {v3}, Landroid/text/TextUtils;->isThaiVowel(C)Z
  424.  
  425. - move-result v2
  426. + move-result v5
  427.  
  428. - if-nez v2, :cond_0
  429. + if-nez v5, :cond_0
  430.  
  431. - invoke-static {v12}, Landroid/text/TextUtils;->isIndianChar(C)Z
  432. + invoke-static {v4}, Landroid/text/TextUtils;->isIndianVowel(C)Z
  433.  
  434. - move-result v2
  435. + move-result v5
  436.  
  437. - if-nez v2, :cond_0
  438. + if-nez v5, :cond_0
  439.  
  440. - invoke-static {v12}, Landroid/text/TextUtils;->isThaiChar(C)Z
  441. + invoke-static {v4}, Landroid/text/TextUtils;->isThaiVowel(C)Z
  442.  
  443. - move-result v2
  444. + move-result v5
  445.  
  446. - if-eqz v2, :cond_2
  447. + if-eqz v5, :cond_1
  448.  
  449. :cond_0
  450. - new-array v7, v3, [F
  451. -
  452. - new-array v1, v3, [C
  453. -
  454. - new-instance v0, Landroid/graphics/Paint;
  455. -
  456. - const/4 v2, 0x1
  457. -
  458. - invoke-direct {v0, v2}, Landroid/graphics/Paint;-><init>(I)V
  459. -
  460. - const/4 v2, 0x0
  461. -
  462. - const/4 v4, 0x0
  463. -
  464. - invoke-static {p0, v2, v3, v1, v4}, Landroid/text/TextUtils;->getChars(Ljava/lang/CharSequence;II[CI)V
  465. -
  466. - const/4 v2, 0x0
  467. -
  468. - const/4 v4, 0x0
  469. -
  470. - const/4 v6, 0x0
  471. -
  472. - const/4 v8, 0x0
  473. -
  474. - move v5, v3
  475. -
  476. - invoke-virtual/range {v0 .. v8}, Landroid/graphics/Paint;->getTextRunAdvances([CIIIII[FI)F
  477. -
  478. - :goto_0
  479. - if-ge p1, v3, :cond_1
  480. + if-ne p2, p1, :cond_4
  481.  
  482. - aget v2, v7, p1
  483. -
  484. - const/4 v4, 0x0
  485. -
  486. - cmpl-float v2, v2, v4
  487. -
  488. - if-nez v2, :cond_1
  489. -
  490. - add-int/lit8 p1, p1, 0x1
  491. -
  492. - goto :goto_0
  493. + add-int/lit8 p1, p2, 0x1
  494.  
  495. :cond_1
  496. - :goto_1
  497. - if-ge p2, v3, :cond_2
  498. -
  499. - aget v2, v7, p2
  500. -
  501. - const/4 v4, 0x0
  502. -
  503. - cmpl-float v2, v2, v4
  504. -
  505. - if-nez v2, :cond_2
  506. -
  507. - add-int/lit8 p2, p2, 0x1
  508. + :goto_0
  509. + if-ne v2, p1, :cond_2
  510.  
  511. - goto :goto_1
  512. + if-eq v1, p2, :cond_3
  513.  
  514. :cond_2
  515. - if-ne v10, p1, :cond_3
  516. + sget-object v5, Landroid/text/Selection;->SELECTION_START:Ljava/lang/Object;
  517.  
  518. - if-eq v9, p2, :cond_4
  519. + const/16 v6, 0x222
  520.  
  521. - :cond_3
  522. - sget-object v2, Landroid/text/Selection;->SELECTION_START:Ljava/lang/Object;
  523. + invoke-interface {p0, v5, p1, p1, v6}, Landroid/text/Spannable;->setSpan(Ljava/lang/Object;III)V
  524.  
  525. - const/16 v4, 0x222
  526. + sget-object v5, Landroid/text/Selection;->SELECTION_END:Ljava/lang/Object;
  527.  
  528. - invoke-interface {p0, v2, p1, p1, v4}, Landroid/text/Spannable;->setSpan(Ljava/lang/Object;III)V
  529. + const/16 v6, 0x22
  530.  
  531. - sget-object v2, Landroid/text/Selection;->SELECTION_END:Ljava/lang/Object;
  532. + invoke-interface {p0, v5, p2, p2, v6}, Landroid/text/Spannable;->setSpan(Ljava/lang/Object;III)V
  533.  
  534. - const/16 v4, 0x22
  535. -
  536. - invoke-interface {p0, v2, p2, p2, v4}, Landroid/text/Spannable;->setSpan(Ljava/lang/Object;III)V
  537. + :cond_3
  538. + return-void
  539.  
  540. :cond_4
  541. - return-void
  542. + add-int/lit8 p2, p2, 0x1
  543. +
  544. + goto :goto_0
  545. .end method
  546. diff -rupN XXLS8/framework/framework/smali/android/text/TextUtils.smali XWLSD/framework/framework/smali/android/text/TextUtils.smali
  547. --- XXLS8/framework/framework/smali/android/text/TextUtils.smali 2013-02-08 13:35:39.878982154 +0100
  548. +++ XWLSD/framework/framework/smali/android/text/TextUtils.smali 2013-02-08 13:33:43.114976587 +0100
  549. @@ -3025,6 +3025,195 @@
  550. goto :goto_0
  551. .end method
  552.  
  553. +.method public static isIndianVowel(C)Z
  554. + .locals 1
  555. +
  556. + const/16 v0, 0x93e
  557. +
  558. + if-lt p0, v0, :cond_0
  559. +
  560. + const/16 v0, 0x944
  561. +
  562. + if-le p0, v0, :cond_12
  563. +
  564. + :cond_0
  565. + const/16 v0, 0x946
  566. +
  567. + if-lt p0, v0, :cond_1
  568. +
  569. + const/16 v0, 0x94d
  570. +
  571. + if-le p0, v0, :cond_12
  572. +
  573. + :cond_1
  574. + const/16 v0, 0x962
  575. +
  576. + if-lt p0, v0, :cond_2
  577. +
  578. + const/16 v0, 0x963
  579. +
  580. + if-le p0, v0, :cond_12
  581. +
  582. + :cond_2
  583. + const/16 v0, 0x951
  584. +
  585. + if-lt p0, v0, :cond_3
  586. +
  587. + const/16 v0, 0x954
  588. +
  589. + if-le p0, v0, :cond_12
  590. +
  591. + :cond_3
  592. + const/16 v0, 0x9be
  593. +
  594. + if-lt p0, v0, :cond_4
  595. +
  596. + const/16 v0, 0x9cd
  597. +
  598. + if-le p0, v0, :cond_12
  599. +
  600. + :cond_4
  601. + const/16 v0, 0x9e2
  602. +
  603. + if-lt p0, v0, :cond_5
  604. +
  605. + const/16 v0, 0x9e3
  606. +
  607. + if-le p0, v0, :cond_12
  608. +
  609. + :cond_5
  610. + const/16 v0, 0x9d7
  611. +
  612. + if-eq p0, v0, :cond_12
  613. +
  614. + const/16 v0, 0xa3e
  615. +
  616. + if-lt p0, v0, :cond_6
  617. +
  618. + const/16 v0, 0xa4d
  619. +
  620. + if-le p0, v0, :cond_12
  621. +
  622. + :cond_6
  623. + const/16 v0, 0xabe
  624. +
  625. + if-lt p0, v0, :cond_7
  626. +
  627. + const/16 v0, 0xacd
  628. +
  629. + if-le p0, v0, :cond_12
  630. +
  631. + :cond_7
  632. + const/16 v0, 0xae2
  633. +
  634. + if-lt p0, v0, :cond_8
  635. +
  636. + const/16 v0, 0xae3
  637. +
  638. + if-le p0, v0, :cond_12
  639. +
  640. + :cond_8
  641. + const/16 v0, 0xbbe
  642. +
  643. + if-lt p0, v0, :cond_9
  644. +
  645. + const/16 v0, 0xbcd
  646. +
  647. + if-le p0, v0, :cond_12
  648. +
  649. + :cond_9
  650. + const/16 v0, 0xbd7
  651. +
  652. + if-eq p0, v0, :cond_12
  653. +
  654. + const/16 v0, 0xc3e
  655. +
  656. + if-lt p0, v0, :cond_a
  657. +
  658. + const/16 v0, 0xc4d
  659. +
  660. + if-le p0, v0, :cond_12
  661. +
  662. + :cond_a
  663. + const/16 v0, 0xc62
  664. +
  665. + if-lt p0, v0, :cond_b
  666. +
  667. + const/16 v0, 0xc63
  668. +
  669. + if-le p0, v0, :cond_12
  670. +
  671. + :cond_b
  672. + const/16 v0, 0xc55
  673. +
  674. + if-lt p0, v0, :cond_c
  675. +
  676. + const/16 v0, 0xc56
  677. +
  678. + if-le p0, v0, :cond_12
  679. +
  680. + :cond_c
  681. + const/16 v0, 0xcbe
  682. +
  683. + if-lt p0, v0, :cond_d
  684. +
  685. + const/16 v0, 0xccd
  686. +
  687. + if-le p0, v0, :cond_12
  688. +
  689. + :cond_d
  690. + const/16 v0, 0xcd5
  691. +
  692. + if-lt p0, v0, :cond_e
  693. +
  694. + const/16 v0, 0xcd6
  695. +
  696. + if-le p0, v0, :cond_12
  697. +
  698. + :cond_e
  699. + const/16 v0, 0xce2
  700. +
  701. + if-lt p0, v0, :cond_f
  702. +
  703. + const/16 v0, 0xce3
  704. +
  705. + if-le p0, v0, :cond_12
  706. +
  707. + :cond_f
  708. + const/16 v0, 0xd3e
  709. +
  710. + if-lt p0, v0, :cond_10
  711. +
  712. + const/16 v0, 0xd4d
  713. +
  714. + if-le p0, v0, :cond_12
  715. +
  716. + :cond_10
  717. + const/16 v0, 0xd62
  718. +
  719. + if-lt p0, v0, :cond_11
  720. +
  721. + const/16 v0, 0xd63
  722. +
  723. + if-le p0, v0, :cond_12
  724. +
  725. + :cond_11
  726. + const/16 v0, 0xd57
  727. +
  728. + if-ne p0, v0, :cond_13
  729. +
  730. + :cond_12
  731. + const/4 v0, 0x1
  732. +
  733. + :goto_0
  734. + return v0
  735. +
  736. + :cond_13
  737. + const/4 v0, 0x0
  738. +
  739. + goto :goto_0
  740. +.end method
  741. +
  742. .method public static isPrintableAscii(C)Z
  743. .locals 3
  744.  
  745. @@ -3119,6 +3308,38 @@
  746. const/4 v0, 0x0
  747.  
  748. goto :goto_0
  749. +.end method
  750. +
  751. +.method public static isThaiVowel(C)Z
  752. + .locals 1
  753. +
  754. + const/16 v0, 0xe30
  755. +
  756. + if-lt p0, v0, :cond_0
  757. +
  758. + const/16 v0, 0xe3a
  759. +
  760. + if-le p0, v0, :cond_1
  761. +
  762. + :cond_0
  763. + const/16 v0, 0xe47
  764. +
  765. + if-lt p0, v0, :cond_2
  766. +
  767. + const/16 v0, 0xe4e
  768. +
  769. + if-gt p0, v0, :cond_2
  770. +
  771. + :cond_1
  772. + const/4 v0, 0x1
  773. +
  774. + :goto_0
  775. + return v0
  776. +
  777. + :cond_2
  778. + const/4 v0, 0x0
  779. +
  780. + goto :goto_0
  781. .end method
  782.  
  783. .method public static join(Ljava/lang/Iterable;)Ljava/lang/CharSequence;
  784. diff -rupN XXLS8/framework/framework/smali/android/webkit/HTML5Audio.smali XWLSD/framework/framework/smali/android/webkit/HTML5Audio.smali
  785. --- XXLS8/framework/framework/smali/android/webkit/HTML5Audio.smali 2013-02-08 13:35:40.246982172 +0100
  786. +++ XWLSD/framework/framework/smali/android/webkit/HTML5Audio.smali 2013-02-08 13:33:46.054976727 +0100
  787. @@ -67,6 +67,8 @@
  788.  
  789. .field private mNativePointer:I
  790.  
  791. +.field private mPausedByAudioFocusLoss:Z
  792. +
  793. .field private mProcessingOnEnd:Z
  794.  
  795. .field private mState:I
  796. @@ -132,6 +134,8 @@
  797.  
  798. iput-boolean v1, p0, Landroid/webkit/HTML5Audio;->mProcessingOnEnd:Z
  799.  
  800. + iput-boolean v1, p0, Landroid/webkit/HTML5Audio;->mPausedByAudioFocusLoss:Z
  801. +
  802. iput-boolean v1, p0, Landroid/webkit/HTML5Audio;->mIsRegisteredListener:Z
  803.  
  804. new-instance v0, Landroid/webkit/HTML5Audio$1;
  805. @@ -764,9 +768,52 @@
  806.  
  807. :cond_0
  808. :goto_0
  809. + :pswitch_0
  810. return-void
  811.  
  812. - :pswitch_0
  813. + :pswitch_1
  814. + iget-object v0, p0, Landroid/webkit/HTML5Audio;->mMediaPlayer:Landroid/media/MediaPlayer;
  815. +
  816. + if-nez v0, :cond_1
  817. +
  818. + invoke-direct {p0}, Landroid/webkit/HTML5Audio;->resetMediaPlayer()V
  819. +
  820. + goto :goto_0
  821. +
  822. + :cond_1
  823. + iget-boolean v0, p0, Landroid/webkit/HTML5Audio;->mPausedByAudioFocusLoss:Z
  824. +
  825. + if-eqz v0, :cond_0
  826. +
  827. + iget v0, p0, Landroid/webkit/HTML5Audio;->mState:I
  828. +
  829. + sget v1, Landroid/webkit/HTML5Audio;->ERROR:I
  830. +
  831. + if-eq v0, v1, :cond_0
  832. +
  833. + iget-object v0, p0, Landroid/webkit/HTML5Audio;->mMediaPlayer:Landroid/media/MediaPlayer;
  834. +
  835. + invoke-virtual {v0}, Landroid/media/MediaPlayer;->isPlaying()Z
  836. +
  837. + move-result v0
  838. +
  839. + if-nez v0, :cond_0
  840. +
  841. + iget-object v0, p0, Landroid/webkit/HTML5Audio;->mMediaPlayer:Landroid/media/MediaPlayer;
  842. +
  843. + invoke-virtual {v0}, Landroid/media/MediaPlayer;->start()V
  844. +
  845. + sget v0, Landroid/webkit/HTML5Audio;->STARTED:I
  846. +
  847. + iput v0, p0, Landroid/webkit/HTML5Audio;->mState:I
  848. +
  849. + const/4 v0, 0x0
  850. +
  851. + iput-boolean v0, p0, Landroid/webkit/HTML5Audio;->mPausedByAudioFocusLoss:Z
  852. +
  853. + goto :goto_0
  854. +
  855. + :pswitch_2
  856. iget v0, p0, Landroid/webkit/HTML5Audio;->mState:I
  857.  
  858. sget v1, Landroid/webkit/HTML5Audio;->ERROR:I
  859. @@ -791,7 +838,7 @@
  860.  
  861. goto :goto_0
  862.  
  863. - :pswitch_1
  864. + :pswitch_3
  865. iget v0, p0, Landroid/webkit/HTML5Audio;->mState:I
  866.  
  867. sget v1, Landroid/webkit/HTML5Audio;->ERROR:I
  868. @@ -808,13 +855,19 @@
  869.  
  870. invoke-direct {p0}, Landroid/webkit/HTML5Audio;->pause()V
  871.  
  872. + const/4 v0, 0x1
  873. +
  874. + iput-boolean v0, p0, Landroid/webkit/HTML5Audio;->mPausedByAudioFocusLoss:Z
  875. +
  876. goto :goto_0
  877.  
  878. :pswitch_data_0
  879. .packed-switch -0x3
  880. - :pswitch_1
  881. - :pswitch_1
  882. + :pswitch_3
  883. + :pswitch_3
  884. + :pswitch_2
  885. :pswitch_0
  886. + :pswitch_1
  887. .end packed-switch
  888. .end method
  889.  
  890. diff -rupN XXLS8/framework/framework/smali/android/webkit/WebViewClassic.smali XWLSD/framework/framework/smali/android/webkit/WebViewClassic.smali
  891. --- XXLS8/framework/framework/smali/android/webkit/WebViewClassic.smali 2013-02-08 13:35:40.386982179 +0100
  892. +++ XWLSD/framework/framework/smali/android/webkit/WebViewClassic.smali 2013-02-08 13:33:45.946976722 +0100
  893. @@ -26094,12 +26094,28 @@
  894. goto :goto_0
  895.  
  896. :cond_4
  897. + invoke-virtual {p0}, Landroid/webkit/WebViewClassic;->getWebView()Landroid/webkit/WebView;
  898. +
  899. + move-result-object v6
  900. +
  901. + instance-of v6, v6, Landroid/webkit/HtmlComposerView;
  902. +
  903. + if-nez v6, :cond_b
  904. +
  905. invoke-virtual {p2}, Landroid/view/KeyEvent;->isAltPressed()Z
  906.  
  907. move-result v6
  908.  
  909. if-eqz v6, :cond_b
  910.  
  911. + const/16 v6, 0x9e
  912. +
  913. + invoke-virtual {p2}, Landroid/view/KeyEvent;->getKeyCode()I
  914. +
  915. + move-result v7
  916. +
  917. + if-ne v6, v7, :cond_b
  918. +
  919. iput v4, p0, Landroid/webkit/WebViewClassic;->mCurSelStart:I
  920.  
  921. iput v4, p0, Landroid/webkit/WebViewClassic;->mCurSelEnd:I
  922. @@ -26820,6 +26836,14 @@
  923.  
  924. if-eqz v6, :cond_6
  925.  
  926. + const/16 v6, 0x9e
  927. +
  928. + invoke-virtual {p2}, Landroid/view/KeyEvent;->getKeyCode()I
  929. +
  930. + move-result v7
  931. +
  932. + if-ne v6, v7, :cond_6
  933. +
  934. iget-object v6, p0, Landroid/webkit/WebViewClassic;->mQwertyInput:Landroid/text/method/QwertyKeyListener;
  935.  
  936. iget-object v7, p0, Landroid/webkit/WebViewClassic;->mWebView:Landroid/webkit/WebView;
  937. @@ -26834,7 +26858,7 @@
  938.  
  939. move v4, v5
  940.  
  941. - goto :goto_0
  942. + goto/16 :goto_0
  943.  
  944. :cond_6
  945. invoke-direct {p0, p1}, Landroid/webkit/WebViewClassic;->isEnterActionKey(I)Z
  946. @@ -27013,8 +27037,6 @@
  947.  
  948. goto :goto_2
  949.  
  950. - nop
  951. -
  952. :sswitch_data_0
  953. .sparse-switch
  954. 0x1d -> :sswitch_0
  955. diff -rupN XXLS8/framework/framework2/smali/com/sec/android/app/CscFeatureTagWifi.smali XWLSD/framework/framework2/smali/com/sec/android/app/CscFeatureTagWifi.smali
  956. --- XXLS8/framework/framework2/smali/com/sec/android/app/CscFeatureTagWifi.smali 2013-02-08 13:35:33.146981833 +0100
  957. +++ XWLSD/framework/framework2/smali/com/sec/android/app/CscFeatureTagWifi.smali 2013-02-08 13:33:38.406976362 +0100
  958. @@ -26,6 +26,8 @@
  959.  
  960. .field public static final TAG_CSCFEATURE_WIFI_ENABLETHRESHOLDDURINGDISCONNECTION:Ljava/lang/String; = "CscFeature_Wifi_EnableThresholdDuringDisconnection"
  961.  
  962. +.field public static final TAG_CSCFEATURE_WIFI_ENABLE_GANLITE:Ljava/lang/String; = "CscFeature_Wifi_Enable_Ganlite"
  963. +
  964. .field public static final TAG_CSCFEATURE_WIFI_ENABLE_MENU_CONNPRIORITYMODE:Ljava/lang/String; = "CscFeature_Wifi_EnableMenuConnPriorityMode"
  965.  
  966. .field public static final TAG_CSCFEATURE_WIFI_ENABLE_MENU_IWLAN4:Ljava/lang/String; = "CscFeature_Wifi_EnableMenuIWLAN4"
  967. diff -rupN XXLS8/framework/services/smali/com/android/server/pm/PackageManagerService.smali XWLSD/framework/services/smali/com/android/server/pm/PackageManagerService.smali
  968. --- XXLS8/framework/services/smali/com/android/server/pm/PackageManagerService.smali 2013-02-08 13:35:55.826982915 +0100
  969. +++ XWLSD/framework/services/smali/com/android/server/pm/PackageManagerService.smali 2013-02-08 13:34:02.126977493 +0100
  970. @@ -19513,7 +19513,7 @@
  971.  
  972. iget-object v6, v0, Lcom/android/server/pm/PackageManagerService;->mSettings:Lcom/android/server/pm/Settings;
  973.  
  974. - if-eqz v19, :cond_9
  975. + if-eqz v19, :cond_a
  976.  
  977. move-object/from16 v0, v19
  978.  
  979. @@ -19528,13 +19528,13 @@
  980. :try_end_1
  981. .catchall {:try_start_1 .. :try_end_1} :catchall_0
  982.  
  983. - if-eqz v24, :cond_b
  984. + if-eqz v24, :cond_c
  985.  
  986. and-int/lit8 v3, p2, 0x1
  987.  
  988. - if-eqz v3, :cond_b
  989. + if-eqz v3, :cond_c
  990.  
  991. - if-eqz v19, :cond_b
  992. + if-eqz v19, :cond_c
  993.  
  994. move-object/from16 v0, v19
  995.  
  996. @@ -19546,7 +19546,7 @@
  997.  
  998. move-result v3
  999.  
  1000. - if-nez v3, :cond_b
  1001. + if-nez v3, :cond_c
  1002.  
  1003. move-object/from16 v0, v18
  1004.  
  1005. @@ -19556,7 +19556,7 @@
  1006.  
  1007. iget v5, v0, Lcom/android/server/pm/PackageSetting;->versionCode:I
  1008.  
  1009. - if-ge v3, v5, :cond_a
  1010. + if-ge v3, v5, :cond_b
  1011.  
  1012. sget-object v3, Lcom/android/server/pm/PackageManagerService;->EnableLinuxCOMMONAPI4:Ljava/lang/String;
  1013.  
  1014. @@ -19661,6 +19661,85 @@
  1015.  
  1016. invoke-static {v3, v5}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
  1017.  
  1018. + move-object/from16 v0, v24
  1019. +
  1020. + iget-object v3, v0, Lcom/android/server/pm/PackageSetting;->codePath:Ljava/io/File;
  1021. +
  1022. + move-object/from16 v0, p1
  1023. +
  1024. + invoke-virtual {v3, v0}, Ljava/io/File;->equals(Ljava/lang/Object;)Z
  1025. +
  1026. + move-result v3
  1027. +
  1028. + if-nez v3, :cond_9
  1029. +
  1030. + const-string v3, "PackageManager"
  1031. +
  1032. + new-instance v5, Ljava/lang/StringBuilder;
  1033. +
  1034. + invoke-direct {v5}, Ljava/lang/StringBuilder;-><init>()V
  1035. +
  1036. + const-string v6, "Code path for hidden system pkg : "
  1037. +
  1038. + invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
  1039. +
  1040. + move-result-object v5
  1041. +
  1042. + move-object/from16 v0, v19
  1043. +
  1044. + iget-object v6, v0, Lcom/android/server/pm/PackageSetting;->name:Ljava/lang/String;
  1045. +
  1046. + invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
  1047. +
  1048. + move-result-object v5
  1049. +
  1050. + const-string v6, " changing from "
  1051. +
  1052. + invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
  1053. +
  1054. + move-result-object v5
  1055. +
  1056. + move-object/from16 v0, v24
  1057. +
  1058. + iget-object v6, v0, Lcom/android/server/pm/PackageSetting;->codePathString:Ljava/lang/String;
  1059. +
  1060. + invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
  1061. +
  1062. + move-result-object v5
  1063. +
  1064. + const-string v6, " to "
  1065. +
  1066. + invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
  1067. +
  1068. + move-result-object v5
  1069. +
  1070. + move-object/from16 v0, p1
  1071. +
  1072. + invoke-virtual {v5, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
  1073. +
  1074. + move-result-object v5
  1075. +
  1076. + invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
  1077. +
  1078. + move-result-object v5
  1079. +
  1080. + invoke-static {v3, v5}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
  1081. +
  1082. + move-object/from16 v0, p1
  1083. +
  1084. + move-object/from16 v1, v24
  1085. +
  1086. + iput-object v0, v1, Lcom/android/server/pm/PackageSetting;->codePath:Ljava/io/File;
  1087. +
  1088. + invoke-virtual/range {p1 .. p1}, Ljava/io/File;->toString()Ljava/lang/String;
  1089. +
  1090. + move-result-object v3
  1091. +
  1092. + move-object/from16 v0, v24
  1093. +
  1094. + iput-object v3, v0, Lcom/android/server/pm/PackageSetting;->codePathString:Ljava/lang/String;
  1095. +
  1096. + :cond_9
  1097. const/4 v3, -0x5
  1098.  
  1099. move-object/from16 v0, p0
  1100. @@ -19671,7 +19750,7 @@
  1101.  
  1102. goto/16 :goto_1
  1103.  
  1104. - :cond_9
  1105. + :cond_a
  1106. :try_start_2
  1107. move-object/from16 v0, v18
  1108.  
  1109. @@ -19688,7 +19767,7 @@
  1110.  
  1111. throw v3
  1112.  
  1113. - :cond_a
  1114. + :cond_b
  1115. move-object/from16 v0, p0
  1116.  
  1117. iget-object v5, v0, Lcom/android/server/pm/PackageManagerService;->mPackages:Ljava/util/HashMap;
  1118. @@ -19850,12 +19929,12 @@
  1119. :try_end_5
  1120. .catchall {:try_start_5 .. :try_end_5} :catchall_3
  1121.  
  1122. - :cond_b
  1123. - if-eqz v24, :cond_c
  1124. + :cond_c
  1125. + if-eqz v24, :cond_d
  1126.  
  1127. or-int/lit8 p2, p2, 0x1
  1128.  
  1129. - :cond_c
  1130. + :cond_d
  1131. move-object/from16 v3, p0
  1132.  
  1133. move-object/from16 v5, v19
  1134. @@ -19870,7 +19949,7 @@
  1135.  
  1136. move-result v3
  1137.  
  1138. - if-nez v3, :cond_d
  1139. + if-nez v3, :cond_e
  1140.  
  1141. const-string v3, "PackageManager"
  1142.  
  1143. @@ -19932,22 +20011,22 @@
  1144.  
  1145. throw v3
  1146.  
  1147. - :cond_d
  1148. + :cond_e
  1149. const/16 v23, 0x0
  1150.  
  1151. - if-nez v24, :cond_e
  1152. + if-nez v24, :cond_f
  1153.  
  1154. - if-eqz v19, :cond_e
  1155. + if-eqz v19, :cond_f
  1156.  
  1157. and-int/lit8 v3, p2, 0x40
  1158.  
  1159. - if-eqz v3, :cond_e
  1160. + if-eqz v3, :cond_f
  1161.  
  1162. invoke-static/range {v19 .. v19}, Lcom/android/server/pm/PackageManagerService;->isSystemApp(Lcom/android/server/pm/PackageSetting;)Z
  1163.  
  1164. move-result v3
  1165.  
  1166. - if-nez v3, :cond_e
  1167. + if-nez v3, :cond_f
  1168.  
  1169. move-object/from16 v0, v19
  1170.  
  1171. @@ -19963,7 +20042,7 @@
  1172.  
  1173. move-result v3
  1174.  
  1175. - if-eqz v3, :cond_10
  1176. + if-eqz v3, :cond_11
  1177.  
  1178. move-object/from16 v0, v18
  1179.  
  1180. @@ -19983,9 +20062,9 @@
  1181.  
  1182. const/16 v19, 0x0
  1183.  
  1184. - :cond_e
  1185. + :cond_f
  1186. :goto_5
  1187. - if-eqz v19, :cond_f
  1188. + if-eqz v19, :cond_10
  1189.  
  1190. move-object/from16 v0, v19
  1191.  
  1192. @@ -19999,26 +20078,26 @@
  1193.  
  1194. move-result v3
  1195.  
  1196. - if-nez v3, :cond_f
  1197. + if-nez v3, :cond_10
  1198.  
  1199. or-int/lit8 p2, p2, 0x10
  1200.  
  1201. - :cond_f
  1202. + :cond_10
  1203. const/4 v12, 0x0
  1204.  
  1205. const/16 v20, 0x0
  1206.  
  1207. and-int/lit8 v3, p2, 0x10
  1208.  
  1209. - if-eqz v3, :cond_13
  1210. + if-eqz v3, :cond_14
  1211.  
  1212. - if-eqz v19, :cond_12
  1213. + if-eqz v19, :cond_13
  1214.  
  1215. move-object/from16 v0, v19
  1216.  
  1217. iget-object v3, v0, Lcom/android/server/pm/PackageSetting;->resourcePathString:Ljava/lang/String;
  1218.  
  1219. - if-eqz v3, :cond_12
  1220. + if-eqz v3, :cond_13
  1221.  
  1222. move-object/from16 v0, v19
  1223.  
  1224. @@ -20091,7 +20170,7 @@
  1225.  
  1226. throw v3
  1227.  
  1228. - :cond_10
  1229. + :cond_11
  1230. move-object/from16 v0, v18
  1231.  
  1232. iget v3, v0, Landroid/content/pm/PackageParser$Package;->mVersionCode:I
  1233. @@ -20100,13 +20179,13 @@
  1234.  
  1235. iget v5, v0, Lcom/android/server/pm/PackageSetting;->versionCode:I
  1236.  
  1237. - if-ge v3, v5, :cond_11
  1238. + if-ge v3, v5, :cond_12
  1239.  
  1240. const/16 v23, 0x1
  1241.  
  1242. goto :goto_5
  1243.  
  1244. - :cond_11
  1245. + :cond_12
  1246. const-string v3, "PackageManager"
  1247.  
  1248. new-instance v5, Ljava/lang/StringBuilder;
  1249. @@ -20235,7 +20314,7 @@
  1250.  
  1251. throw v3
  1252.  
  1253. - :cond_12
  1254. + :cond_13
  1255. const-string v3, "PackageManager"
  1256.  
  1257. new-instance v5, Ljava/lang/StringBuilder;
  1258. @@ -20264,7 +20343,7 @@
  1259.  
  1260. goto/16 :goto_6
  1261.  
  1262. - :cond_13
  1263. + :cond_14
  1264. move-object/from16 v0, v18
  1265.  
  1266. iget-object v0, v0, Landroid/content/pm/PackageParser$Package;->mScanPath:Ljava/lang/String;
  1267. diff -rupN XXLS8/framework/services/smali/com/android/server/WifiService$8.smali XWLSD/framework/services/smali/com/android/server/WifiService$8.smali
  1268. --- XXLS8/framework/services/smali/com/android/server/WifiService$8.smali 2013-02-08 13:35:56.206982933 +0100
  1269. +++ XWLSD/framework/services/smali/com/android/server/WifiService$8.smali 2013-02-08 13:34:01.690977472 +0100
  1270. @@ -212,7 +212,7 @@
  1271.  
  1272. move-result v10
  1273.  
  1274. - if-eqz v10, :cond_6
  1275. + if-eqz v10, :cond_7
  1276.  
  1277. invoke-static {}, Lcom/android/server/WifiService;->access$2300()Z
  1278.  
  1279. @@ -233,6 +233,35 @@
  1280.  
  1281. invoke-static {v10, v11}, Lcom/android/server/WifiService;->access$2602(Lcom/android/server/WifiService;Z)Z
  1282.  
  1283. + invoke-static {}, Lcom/sec/android/app/CscFeature;->getInstance()Lcom/sec/android/app/CscFeature;
  1284. +
  1285. + move-result-object v10
  1286. +
  1287. + const-string v11, "CscFeature_Wifi_Enable_Ganlite"
  1288. +
  1289. + invoke-virtual {v10, v11}, Lcom/sec/android/app/CscFeature;->getEnableStatus(Ljava/lang/String;)Z
  1290. +
  1291. + move-result v10
  1292. +
  1293. + if-eqz v10, :cond_4
  1294. +
  1295. + const-string v10, "WifiService"
  1296. +
  1297. + const-string v11, "GanOn is true,enableRssiPolling(true)"
  1298. +
  1299. + invoke-static {v10, v11}, Landroid/util/Slog;->d(Ljava/lang/String;Ljava/lang/String;)I
  1300. +
  1301. + iget-object v10, p0, Lcom/android/server/WifiService$8;->this$0:Lcom/android/server/WifiService;
  1302. +
  1303. + invoke-static {v10}, Lcom/android/server/WifiService;->access$600(Lcom/android/server/WifiService;)Landroid/net/wifi/WifiStateMachine;
  1304. +
  1305. + move-result-object v10
  1306. +
  1307. + const/4 v11, 0x1
  1308. +
  1309. + invoke-virtual {v10, v11}, Landroid/net/wifi/WifiStateMachine;->enableRssiPolling(Z)V
  1310. +
  1311. + :cond_4
  1312. iget-object v10, p0, Lcom/android/server/WifiService$8;->this$0:Lcom/android/server/WifiService;
  1313.  
  1314. invoke-static {v10}, Lcom/android/server/WifiService;->access$2800(Lcom/android/server/WifiService;)I
  1315. @@ -255,13 +284,13 @@
  1316.  
  1317. sget-object v11, Landroid/net/NetworkInfo$DetailedState;->CONNECTED:Landroid/net/NetworkInfo$DetailedState;
  1318.  
  1319. - if-ne v10, v11, :cond_5
  1320. + if-ne v10, v11, :cond_6
  1321.  
  1322. invoke-static {}, Lcom/android/server/WifiService;->access$2300()Z
  1323.  
  1324. move-result v10
  1325.  
  1326. - if-eqz v10, :cond_4
  1327. + if-eqz v10, :cond_5
  1328.  
  1329. const-string v10, "WifiService"
  1330.  
  1331. @@ -291,7 +320,7 @@
  1332.  
  1333. invoke-static {v10, v11}, Landroid/util/Slog;->d(Ljava/lang/String;Ljava/lang/String;)I
  1334.  
  1335. - :cond_4
  1336. + :cond_5
  1337. iget-object v10, p0, Lcom/android/server/WifiService$8;->this$0:Lcom/android/server/WifiService;
  1338.  
  1339. invoke-static {v10}, Lcom/android/server/WifiService;->access$2500(Lcom/android/server/WifiService;)Landroid/app/AlarmManager;
  1340. @@ -314,25 +343,25 @@
  1341.  
  1342. invoke-virtual {v10, v11, v12, v13, v14}, Landroid/app/AlarmManager;->set(IJLandroid/app/PendingIntent;)V
  1343.  
  1344. - goto :goto_0
  1345. + goto/16 :goto_0
  1346.  
  1347. - :cond_5
  1348. + :cond_6
  1349. iget-object v10, p0, Lcom/android/server/WifiService$8;->this$0:Lcom/android/server/WifiService;
  1350.  
  1351. const/4 v11, 0x1
  1352.  
  1353. invoke-static {v10, v11}, Lcom/android/server/WifiService;->access$2700(Lcom/android/server/WifiService;Z)V
  1354.  
  1355. - goto :goto_0
  1356. + goto/16 :goto_0
  1357.  
  1358. - :cond_6
  1359. + :cond_7
  1360. const-string v10, "com.android.server.WifiManager.action.DEVICE_IDLE"
  1361.  
  1362. invoke-virtual {v1, v10}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
  1363.  
  1364. move-result v10
  1365.  
  1366. - if-eqz v10, :cond_7
  1367. + if-eqz v10, :cond_8
  1368.  
  1369. iget-object v10, p0, Lcom/android/server/WifiService$8;->this$0:Lcom/android/server/WifiService;
  1370.  
  1371. @@ -342,14 +371,14 @@
  1372.  
  1373. goto/16 :goto_0
  1374.  
  1375. - :cond_7
  1376. + :cond_8
  1377. const-string v10, "android.intent.action.BATTERY_CHANGED"
  1378.  
  1379. invoke-virtual {v1, v10}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
  1380.  
  1381. move-result v10
  1382.  
  1383. - if-eqz v10, :cond_c
  1384. + if-eqz v10, :cond_d
  1385.  
  1386. const-string v10, "plugged"
  1387.  
  1388. @@ -365,7 +394,7 @@
  1389.  
  1390. move-result v10
  1391.  
  1392. - if-eqz v10, :cond_8
  1393. + if-eqz v10, :cond_9
  1394.  
  1395. const-string v10, "WifiService"
  1396.  
  1397. @@ -389,14 +418,14 @@
  1398.  
  1399. invoke-static {v10, v11}, Landroid/util/Slog;->d(Ljava/lang/String;Ljava/lang/String;)I
  1400.  
  1401. - :cond_8
  1402. + :cond_9
  1403. iget-object v10, p0, Lcom/android/server/WifiService$8;->this$0:Lcom/android/server/WifiService;
  1404.  
  1405. invoke-static {v10}, Lcom/android/server/WifiService;->access$2600(Lcom/android/server/WifiService;)Z
  1406.  
  1407. move-result v10
  1408.  
  1409. - if-eqz v10, :cond_a
  1410. + if-eqz v10, :cond_b
  1411.  
  1412. iget-object v10, p0, Lcom/android/server/WifiService$8;->this$0:Lcom/android/server/WifiService;
  1413.  
  1414. @@ -408,13 +437,13 @@
  1415.  
  1416. move-result v10
  1417.  
  1418. - if-eqz v10, :cond_a
  1419. + if-eqz v10, :cond_b
  1420.  
  1421. invoke-direct {p0, v7, v5}, Lcom/android/server/WifiService$8;->shouldWifiStayAwake(II)Z
  1422.  
  1423. move-result v10
  1424.  
  1425. - if-nez v10, :cond_a
  1426. + if-nez v10, :cond_b
  1427.  
  1428. invoke-static {}, Ljava/lang/System;->currentTimeMillis()J
  1429.  
  1430. @@ -426,7 +455,7 @@
  1431.  
  1432. move-result v10
  1433.  
  1434. - if-eqz v10, :cond_9
  1435. + if-eqz v10, :cond_a
  1436.  
  1437. const-string v10, "WifiService"
  1438.  
  1439. @@ -456,7 +485,7 @@
  1440.  
  1441. invoke-static {v10, v11}, Landroid/util/Slog;->d(Ljava/lang/String;Ljava/lang/String;)I
  1442.  
  1443. - :cond_9
  1444. + :cond_a
  1445. iget-object v10, p0, Lcom/android/server/WifiService$8;->this$0:Lcom/android/server/WifiService;
  1446.  
  1447. invoke-static {v10}, Lcom/android/server/WifiService;->access$2500(Lcom/android/server/WifiService;)Landroid/app/AlarmManager;
  1448. @@ -473,8 +502,8 @@
  1449.  
  1450. invoke-virtual {v10, v11, v8, v9, v12}, Landroid/app/AlarmManager;->set(IJLandroid/app/PendingIntent;)V
  1451.  
  1452. - :cond_a
  1453. - if-nez v5, :cond_b
  1454. + :cond_b
  1455. + if-nez v5, :cond_c
  1456.  
  1457. iget-object v10, p0, Lcom/android/server/WifiService$8;->this$0:Lcom/android/server/WifiService;
  1458.  
  1459. @@ -497,7 +526,7 @@
  1460. :try_end_0
  1461. .catchall {:try_start_0 .. :try_end_0} :catchall_0
  1462.  
  1463. - :cond_b
  1464. + :cond_c
  1465. iget-object v10, p0, Lcom/android/server/WifiService$8;->this$0:Lcom/android/server/WifiService;
  1466.  
  1467. invoke-static {v10, v5}, Lcom/android/server/WifiService;->access$2802(Lcom/android/server/WifiService;I)I
  1468. @@ -514,14 +543,14 @@
  1469.  
  1470. throw v10
  1471.  
  1472. - :cond_c
  1473. + :cond_d
  1474. const-string v10, "android.bluetooth.adapter.action.CONNECTION_STATE_CHANGED"
  1475.  
  1476. invoke-virtual {v1, v10}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
  1477.  
  1478. move-result v10
  1479.  
  1480. - if-eqz v10, :cond_d
  1481. + if-eqz v10, :cond_e
  1482.  
  1483. const-string v10, "android.bluetooth.adapter.extra.CONNECTION_STATE"
  1484.  
  1485. @@ -543,7 +572,7 @@
  1486.  
  1487. goto/16 :goto_0
  1488.  
  1489. - :cond_d
  1490. + :cond_e
  1491. const-string v10, "android.intent.action.EMERGENCY_CALLBACK_MODE_CHANGED"
  1492.  
  1493. invoke-virtual {v1, v10}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!