API tools faq
paste
Advertisement
voku1987

diff android 2.2.2 -> 2.2.3

voku1987
Dec 17th, 2011
143
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 37.09 KB | None | 0 0
raw download clone embed print report
  1. diff -r test/build/core/build_id.mk test2/build/core/build_id.mk
  2. 21c21
  3. < export BUILD_ID=FRK76C
  4. ---
  5. > export BUILD_ID=FRG83G
  6. diff -r test/build/core/version_defaults.mk test2/build/core/version_defaults.mk
  7. 44c44
  8. < PLATFORM_VERSION := 2.2.3
  9. ---
  10. > PLATFORM_VERSION := 2.2.2
  11. 98a99
  12. >
  13. diff -r test/dalvik/libcore/security/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi.java test2/dalvik/libcore/security/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi.java
  14. 36,38d35
  15. < // BEGIN android-added
  16. < import org.apache.harmony.xnet.provider.jsse.OpenSSLMessageDigest;
  17. < // END android-added
  18. 57,59d53
  19. < // BEGIN android-added
  20. < import org.bouncycastle.crypto.Digest;
  21. < // END android-added
  22. 100,155c94,95
  23. <
  24. < // BEGIN android-added
  25. < // From http://src.chromium.org/viewvc/chrome/trunk/src/net/base/x509_certificate.cc?revision=78748&view=markup
  26. < private static final Set<BigInteger> SERIAL_BLACKLIST = new HashSet<BigInteger>(Arrays.asList(
  27. < // Not a real certificate. For testing only.
  28. < new BigInteger(1, new byte[] {(byte)0x07,(byte)0x7a,(byte)0x59,(byte)0xbc,(byte)0xd5,(byte)0x34,(byte)0x59,(byte)0x60,(byte)0x1c,(byte)0xa6,(byte)0x90,(byte)0x72,(byte)0x67,(byte)0xa6,(byte)0xdd,(byte)0x1c}),
  29. < new BigInteger(1, new byte[] {(byte)0x04,(byte)0x7e,(byte)0xcb,(byte)0xe9,(byte)0xfc,(byte)0xa5,(byte)0x5f,(byte)0x7b,(byte)0xd0,(byte)0x9e,(byte)0xae,(byte)0x36,(byte)0xe1,(byte)0x0c,(byte)0xae,(byte)0x1e}),
  30. < new BigInteger(1, new byte[] {(byte)0xd8,(byte)0xf3,(byte)0x5f,(byte)0x4e,(byte)0xb7,(byte)0x87,(byte)0x2b,(byte)0x2d,(byte)0xab,(byte)0x06,(byte)0x92,(byte)0xe3,(byte)0x15,(byte)0x38,(byte)0x2f,(byte)0xb0}),
  31. < new BigInteger(1, new byte[] {(byte)0xb0,(byte)0xb7,(byte)0x13,(byte)0x3e,(byte)0xd0,(byte)0x96,(byte)0xf9,(byte)0xb5,(byte)0x6f,(byte)0xae,(byte)0x91,(byte)0xc8,(byte)0x74,(byte)0xbd,(byte)0x3a,(byte)0xc0}),
  32. < new BigInteger(1, new byte[] {(byte)0x92,(byte)0x39,(byte)0xd5,(byte)0x34,(byte)0x8f,(byte)0x40,(byte)0xd1,(byte)0x69,(byte)0x5a,(byte)0x74,(byte)0x54,(byte)0x70,(byte)0xe1,(byte)0xf2,(byte)0x3f,(byte)0x43}),
  33. < new BigInteger(1, new byte[] {(byte)0xe9,(byte)0x02,(byte)0x8b,(byte)0x95,(byte)0x78,(byte)0xe4,(byte)0x15,(byte)0xdc,(byte)0x1a,(byte)0x71,(byte)0x0a,(byte)0x2b,(byte)0x88,(byte)0x15,(byte)0x44,(byte)0x47}),
  34. < new BigInteger(1, new byte[] {(byte)0xd7,(byte)0x55,(byte)0x8f,(byte)0xda,(byte)0xf5,(byte)0xf1,(byte)0x10,(byte)0x5b,(byte)0xb2,(byte)0x13,(byte)0x28,(byte)0x2b,(byte)0x70,(byte)0x77,(byte)0x29,(byte)0xa3}),
  35. < new BigInteger(1, new byte[] {(byte)0xf5,(byte)0xc8,(byte)0x6a,(byte)0xf3,(byte)0x61,(byte)0x62,(byte)0xf1,(byte)0x3a,(byte)0x64,(byte)0xf5,(byte)0x4f,(byte)0x6d,(byte)0xc9,(byte)0x58,(byte)0x7c,(byte)0x06}),
  36. < new BigInteger(1, new byte[] {(byte)0x39,(byte)0x2a,(byte)0x43,(byte)0x4f,(byte)0x0e,(byte)0x07,(byte)0xdf,(byte)0x1f,(byte)0x8a,(byte)0xa3,(byte)0x05,(byte)0xde,(byte)0x34,(byte)0xe0,(byte)0xc2,(byte)0x29}),
  37. < new BigInteger(1, new byte[] {(byte)0x3e,(byte)0x75,(byte)0xce,(byte)0xd4,(byte)0x6b,(byte)0x69,(byte)0x30,(byte)0x21,(byte)0x21,(byte)0x88,(byte)0x30,(byte)0xae,(byte)0x86,(byte)0xa8,(byte)0x2a,(byte)0x71})
  38. < ));
  39. <
  40. < // From http://src.chromium.org/viewvc/chrome/branches/782/src/net/base/x509_certificate.cc?r1=98750&r2=98749&pathrev=98750
  41. < private static final byte[][] PUBLIC_KEY_SHA1_BLACKLIST = {
  42. < // C=NL, O=DigiNotar, CN=DigiNotar Root CA/[email protected]
  43. < {(byte)0x41, (byte)0x0f, (byte)0x36, (byte)0x36, (byte)0x32, (byte)0x58, (byte)0xf3, (byte)0x0b, (byte)0x34, (byte)0x7d,
  44. < (byte)0x12, (byte)0xce, (byte)0x48, (byte)0x63, (byte)0xe4, (byte)0x33, (byte)0x43, (byte)0x78, (byte)0x06, (byte)0xa8},
  45. < // Subject: CN=DigiNotar Cyber CA
  46. < // Issuer: CN=GTE CyberTrust Global Root
  47. < {(byte)0xba, (byte)0x3e, (byte)0x7b, (byte)0xd3, (byte)0x8c, (byte)0xd7, (byte)0xe1, (byte)0xe6, (byte)0xb9, (byte)0xcd,
  48. < (byte)0x4c, (byte)0x21, (byte)0x99, (byte)0x62, (byte)0xe5, (byte)0x9d, (byte)0x7a, (byte)0x2f, (byte)0x4e, (byte)0x37},
  49. < // Subject: CN=DigiNotar Services 1024 CA
  50. < // Issuer: CN=Entrust.net
  51. < {(byte)0xe2, (byte)0x3b, (byte)0x8d, (byte)0x10, (byte)0x5f, (byte)0x87, (byte)0x71, (byte)0x0a, (byte)0x68, (byte)0xd9,
  52. < (byte)0x24, (byte)0x80, (byte)0x50, (byte)0xeb, (byte)0xef, (byte)0xc6, (byte)0x27, (byte)0xbe, (byte)0x4c, (byte)0xa6},
  53. < // Subject: CN=DigiNotar PKIoverheid CA Organisatie - G2
  54. < // Issuer: CN=Staat der Nederlanden Organisatie CA - G2
  55. < {(byte)0x7b, (byte)0x2e, (byte)0x16, (byte)0xbc, (byte)0x39, (byte)0xbc, (byte)0xd7, (byte)0x2b, (byte)0x45, (byte)0x6e,
  56. < (byte)0x9f, (byte)0x05, (byte)0x5d, (byte)0x1d, (byte)0xe6, (byte)0x15, (byte)0xb7, (byte)0x49, (byte)0x45, (byte)0xdb},
  57. < // Subject: CN=DigiNotar PKIoverheid CA Overheid en Bedrijven
  58. < // Issuer: CN=Staat der Nederlanden Overheid CA
  59. < {(byte)0xe8, (byte)0xf9, (byte)0x12, (byte)0x00, (byte)0xc6, (byte)0x5c, (byte)0xee, (byte)0x16, (byte)0xe0, (byte)0x39,
  60. < (byte)0xb9, (byte)0xf8, (byte)0x83, (byte)0x84, (byte)0x16, (byte)0x61, (byte)0x63, (byte)0x5f, (byte)0x81, (byte)0xc5}
  61. < };
  62. <
  63. < private static boolean isPublicKeyBlackListed(PublicKey publicKey) {
  64. < byte[] encoded = publicKey.getEncoded();
  65. < Digest digest = OpenSSLMessageDigest.getInstance("SHA1");
  66. < digest.update(encoded, 0, encoded.length);
  67. < byte[] out = new byte[digest.getDigestSize()];
  68. < digest.doFinal(out, 0);
  69. <
  70. < for (byte[] sha1 : PUBLIC_KEY_SHA1_BLACKLIST) {
  71. < if (Arrays.equals(out, sha1)) {
  72. < return true;
  73. < }
  74. < }
  75. < return false;
  76. < }
  77. < // END android-added
  78. <
  79. ---
  80. >
  81. >
  82. 186,201d125
  83. < // BEGIN android-added
  84. < {
  85. < X509Certificate cert = (X509Certificate) certs.get(0);
  86. <
  87. < if (cert != null) {
  88. < BigInteger serial = cert.getSerialNumber();
  89. < if (serial != null && SERIAL_BLACKLIST.contains(serial)) {
  90. < // emulate CRL exception message in RFC3280CertPathUtilities.checkCRLs
  91. < String message = "Certificate revocation of serial 0x" + serial.toString(16);
  92. < System.out.println(message);
  93. < AnnotatedException e = new AnnotatedException(message);
  94. < throw new CertPathValidatorException(e.getMessage(), e, certPath, 0);
  95. < }
  96. < }
  97. < }
  98. < // END android-added
  99. 385,393d308
  100. < // BEGIN android-added
  101. < if (isPublicKeyBlackListed(workingPublicKey)) {
  102. < // emulate CRL exception message in RFC3280CertPathUtilities.checkCRLs
  103. < String message = "Certificate revocation of public key " + workingPublicKey;
  104. < System.out.println(message);
  105. < AnnotatedException e = new AnnotatedException(message);
  106. < throw new CertPathValidatorException(e.getMessage(), e, certPath, index);
  107. < }
  108. < // END android-added
  109. diff -r test/external/libpng/ANNOUNCE test2/external/libpng/ANNOUNCE
  110. 2c2
  111. < Libpng 1.2.46 - July 9, 2011
  112. ---
  113. > Libpng 1.2.44 - June 26, 2010
  114. 11,13c11,13
  115. < libpng-1.2.46.tar.xz (LZMA-compressed, recommended)
  116. < libpng-1.2.46.tar.gz
  117. < libpng-1.2.46.tar.bz2
  118. ---
  119. > libpng-1.2.44.tar.xz (LZMA-compressed, recommended)
  120. > libpng-1.2.44.tar.gz
  121. > libpng-1.2.44.tar.bz2
  122. 18,20c18,20
  123. < libpng-1.2.46-no-config.tar.xz (LZMA-compressed, recommended)
  124. < libpng-1.2.46-no-config.tar.gz
  125. < libpng-1.2.46-no-config.tar.bz2
  126. ---
  127. > libpng-1.2.44-no-config.tar.xz (LZMA-compressed, recommended)
  128. > libpng-1.2.44-no-config.tar.gz
  129. > libpng-1.2.44-no-config.tar.bz2
  130. 25,27c25,27
  131. < lpng1246.zip
  132. < lpng1246.7z
  133. < lpng1246.tar.bz2
  134. ---
  135. > lpng1244.zip
  136. > lpng1244.7z
  137. > lpng1244.tar.bz2
  138. 31,32c31,32
  139. < libpng-1.2.46-project-netware.zip
  140. < libpng-1.2.46-project-wince.zip
  141. ---
  142. > libpng-1.2.44-project-netware.zip
  143. > libpng-1.2.44-project-wince.zip
  144. 36,40c36,40
  145. < libpng-1.2.46-README.txt
  146. < libpng-1.2.46-KNOWNBUGS.txt
  147. < libpng-1.2.46-LICENSE.txt
  148. < libpng-1.2.46-Y2K-compliance.txt
  149. < libpng-1.2.46-[previous version]-diff.txt
  150. ---
  151. > libpng-1.2.44-README.txt
  152. > libpng-1.2.44-KNOWNBUGS.txt
  153. > libpng-1.2.44-LICENSE.txt
  154. > libpng-1.2.44-Y2K-compliance.txt
  155. > libpng-1.2.44-[previous version]-diff.txt
  156. 44c44,48
  157. < version 1.2.45 [July 9, 2011]
  158. ---
  159. > version 1.2.44 [June 26, 2010]
  160. >
  161. > Rewrote png_process_IDAT_data to consistently treat extra data as warnings
  162. > and handle end conditions more cleanly.
  163. > Removed the now-redundant check for out-of-bounds new_row from example.c
  164. 46,58d49
  165. < Fixed uninitialized memory read in png_format_buffer() (Bug
  166. < report by Frank Busse, related to CVE-2004-0421).
  167. < Pass "" instead of '\0' to png_default_error() in png_err(). This mistake
  168. < was introduced in libpng-1.2.20beta01.
  169. < Check for up->location !PNG_AFTER_IDAT when writing unknown chunks
  170. < before IDAT.
  171. < Ported bugfix in pngrtran.c from 1.5.3: when expanding a paletted image,
  172. < always expand to RGBA if transparency is present.
  173. < Check for integer overflow in png_set_rgb_to_gray().
  174. < Check for sCAL chunk too short.
  175. < Added CMakeLists.txt, projects/xcode, and pnggccrd.c to EXTRA_DIST in
  176. < Makefile.am and Makefile.in
  177. < Udated copyright year to 2011.
  178. 60a52
  179. >
  180. diff -r test/external/libpng/CHANGES test2/external/libpng/CHANGES
  181. 1481c1481
  182. < More cleanup of configure.ac, Makefile.am, and associated scripts.
  183. ---
  184. > More cleanup of configure.ac, Makefile.ac, and associated scripts.
  185. 2706,2737d2705
  186. <
  187. < version 1.2.45beta01 [June 7, 2011]
  188. < Fixed uninitialized memory read in png_format_buffer() (Bug
  189. < report by Frank Busse, related to CVE-2004-0421).
  190. < Pass "" instead of '\0' to png_default_error() in png_err(). This mistake
  191. < was introduced in libpng-1.2.20beta01.
  192. < Check for up->location !PNG_AFTER_IDAT when writing unknown chunks
  193. < before IDAT.
  194. < Ported bugfix in pngrtran.c from 1.5.3: when expanding a paletted image,
  195. < always expand to RGBA if transparency is present.
  196. <
  197. < version 1.2.45beta02 [June 8, 2011]
  198. < Check for integer overflow in png_set_rgb_to_gray().
  199. <
  200. < version 1.2.45beta03 [June 19, 2011]
  201. < Check for sCAL chunk too short.
  202. <
  203. < version 1.2.45rc01 and 1.0.55rc01 [June 30, 2011]
  204. < Updated "last changed" dates and copyright year.
  205. <
  206. < version 1.2.45 and 1.0.55 [July 7, 2011]
  207. < No changes.
  208. <
  209. < version 1.2.46rc01 and 1.0.56rc01 [July 8, 2011]
  210. < Reverted changes to Makefile.am and Makefile.in to libpng-1.2.44 versions.
  211. <
  212. < version 1.2.46rc02 and 1.0.56rc02 [July 8, 2011]
  213. < Added CMakeLists.txt, projects/xcode, and pnggccrd.c to EXTRA_DIST in
  214. < Makefile.am and Makefile.in
  215. <
  216. < version 1.2.46 and 1.0.56 [July 9, 2011]
  217. < Udated copyright year to 2011.
  218. diff -r test/external/libpng/CMakeLists.txt test2/external/libpng/CMakeLists.txt
  219. 25c25
  220. < set(PNGLIB_RELEASE 46)
  221. ---
  222. > set(PNGLIB_RELEASE 44)
  223. 218c218
  224. < # VERSION 0.${PNGLIB_RELEASE}.1.2.46
  225. ---
  226. > # VERSION 0.${PNGLIB_RELEASE}.1.2.44
  227. diff -r test/external/libpng/configure test2/external/libpng/configure
  228. 3c3
  229. < # Generated by GNU Autoconf 2.65 for libpng 1.2.46.
  230. ---
  231. > # Generated by GNU Autoconf 2.65 for libpng 1.2.44.
  232. 704,705c704,705
  233. < PACKAGE_VERSION='1.2.46'
  234. < PACKAGE_STRING='libpng 1.2.46'
  235. ---
  236. > PACKAGE_VERSION='1.2.44'
  237. > PACKAGE_STRING='libpng 1.2.44'
  238. 1438c1438
  239. < \`configure' configures libpng 1.2.46 to adapt to many kinds of systems.
  240. ---
  241. > \`configure' configures libpng 1.2.44 to adapt to many kinds of systems.
  242. 1508c1508
  243. < short | recursive ) echo "Configuration of libpng 1.2.46:";;
  244. ---
  245. > short | recursive ) echo "Configuration of libpng 1.2.44:";;
  246. 1615c1615
  247. < libpng configure 1.2.46
  248. ---
  249. > libpng configure 1.2.44
  250. 2040c2040
  251. < It was created by libpng $as_me 1.2.46, which was
  252. ---
  253. > It was created by libpng $as_me 1.2.44, which was
  254. 2848c2848
  255. < VERSION='1.2.46'
  256. ---
  257. > VERSION='1.2.44'
  258. 2912c2912
  259. < PNGLIB_VERSION=1.2.46
  260. ---
  261. > PNGLIB_VERSION=1.2.44
  262. 2915c2915
  263. < PNGLIB_RELEASE=46
  264. ---
  265. > PNGLIB_RELEASE=44
  266. 12082c12082
  267. < This file was extended by libpng $as_me 1.2.46, which was
  268. ---
  269. > This file was extended by libpng $as_me 1.2.44, which was
  270. 12148c12148
  271. < libpng config.status 1.2.46
  272. ---
  273. > libpng config.status 1.2.44
  274. diff -r test/external/libpng/configure.ac test2/external/libpng/configure.ac
  275. 21c21
  276. < AC_INIT([libpng], [1.2.46], [[email protected]])
  277. ---
  278. > AC_INIT([libpng], [1.2.44], [[email protected]])
  279. 26c26
  280. < PNGLIB_VERSION=1.2.46
  281. ---
  282. > PNGLIB_VERSION=1.2.44
  283. 29c29
  284. < PNGLIB_RELEASE=46
  285. ---
  286. > PNGLIB_RELEASE=44
  287. diff -r test/external/libpng/INSTALL test2/external/libpng/INSTALL
  288. 2c2
  289. < Installing libpng version 1.2.46 - July 9, 2011
  290. ---
  291. > Installing libpng version 1.2.44 - June 26, 2010
  292. 49c49
  293. < might be called "libpng-1.2.46" or "libpng12" and "zlib-1.2.3"
  294. ---
  295. > might be called "libpng-1.2.44" or "libpng12" and "zlib-1.2.3"
  296. diff -r test/external/libpng/KNOWNBUG test2/external/libpng/KNOWNBUG
  297. 2c2
  298. < Known bugs in libpng version 1.2.46
  299. ---
  300. > Known bugs in libpng version 1.2.44
  301. 4c4,11
  302. < 1. February 23, 2006: The custom makefiles don't build libpng with -lz.
  303. ---
  304. > 1. December 4, 2009: The PNG_NO_ERROR_NUMBERS macro was inadvertently
  305. > defined in libpng-1.2.41/pngconf.h, which may cause a problem with
  306. > building a binary-compatible library.
  307. >
  308. > STATUS: This will be fixed in libpng-1.2.42. In the meantime, simply
  309. > delete the definition from line :
  310. >
  311. > 2. February 23, 2006: The custom makefiles don't build libpng with -lz.
  312. 9c16
  313. < 2. February 24, 2006: The Makefile generated by the "configure" script
  314. ---
  315. > 3. February 24, 2006: The Makefile generated by the "configure" script
  316. 14c21
  317. < 3. September 4, 2007: There is a report that pngtest crashes on MacOS 10.
  318. ---
  319. > 4. September 4, 2007: There is a report that pngtest crashes on MacOS 10.
  320. Nur in test/external/libpng: libpng-1.2.46.txt.
  321. diff -r test/external/libpng/libpng.3 test2/external/libpng/libpng.3
  322. 1c1
  323. < .TH LIBPNG 3 "July 9, 2011"
  324. ---
  325. > .TH LIBPNG 3 "June 26, 2010"
  326. 3c3
  327. < libpng \- Portable Network Graphics (PNG) Reference Library 1.2.46
  328. ---
  329. > libpng \- Portable Network Graphics (PNG) Reference Library 1.2.44
  330. 824c824
  331. < libpng version 1.2.46 - July 9, 2011
  332. ---
  333. > libpng version 1.2.44 - June 26, 2010
  334. 835c835
  335. < libpng versions 0.97, January 1998, through 1.2.46 - July 9, 2011
  336. ---
  337. > libpng versions 0.97, January 1998, through 1.2.44 - June 26, 2010
  338. 1702c1702
  339. < As of libpng version 1.2.46, not all possible expansions are supported.
  340. ---
  341. > As of libpng version 1.2.44, not all possible expansions are supported.
  342. 4003c4003
  343. < July 9, 2011
  344. ---
  345. > June 26, 2010
  346. 4009c4009
  347. < upward through 1.2.46 are Y2K compliant. It is my belief that earlier
  348. ---
  349. > upward through 1.2.44 are Y2K compliant. It is my belief that earlier
  350. 4278c4278
  351. < 1.0.45 10 10045 12.so.0.45[.0]
  352. ---
  353. > 1.2.45 10 10045 12.so.0.45[.0]
  354. 4310,4317d4309
  355. < 1.2.45beta01-03 13 10245 12.so.0.45[.0]
  356. < 1.0.55rc01 10 10055 10.so.0.55[.0]
  357. < 1.2.45rc01 13 10245 12.so.0.45[.0]
  358. < 1.0.55 10 10055 10.so.0.55[.0]
  359. < 1.2.45 13 10245 12.so.0.45[.0]
  360. < 1.2.46rc01-02 13 10246 12.so.0.46[.0]
  361. < 1.0.56 10 10056 10.so.0.56[.0]
  362. < 1.2.46 13 10246 12.so.0.46[.0]
  363. 4373c4365
  364. < Libpng version 1.2.46 - July 9, 2011:
  365. ---
  366. > Libpng version 1.2.44 - June 26, 2010:
  367. 4396c4388
  368. < libpng versions 1.2.6, August 15, 2004, through 1.2.46, July 9, 2011, are
  369. ---
  370. > libpng versions 1.2.6, August 15, 2004, through 1.2.44, June 26, 2010, are
  371. 4495c4487
  372. < July 9, 2011
  373. ---
  374. > June 26, 2010
  375. diff -r test/external/libpng/libpngpf.3 test2/external/libpng/libpngpf.3
  376. 1c1
  377. < .TH LIBPNGPF 3 "July 9, 2011"
  378. ---
  379. > .TH LIBPNGPF 3 "June 26, 2010"
  380. 3c3
  381. < libpng \- Portable Network Graphics (PNG) Reference Library 1.2.46
  382. ---
  383. > libpng \- Portable Network Graphics (PNG) Reference Library 1.2.44
  384. diff -r test/external/libpng/LICENSE test2/external/libpng/LICENSE
  385. 13c13
  386. < libpng versions 1.2.6, August 15, 2004, through 1.2.46, July 9, 2011, are
  387. ---
  388. > libpng versions 1.2.6, August 15, 2004, through 1.2.44, June 26, 2010, are
  389. 111c111
  390. < July 9, 2011
  391. ---
  392. > June 26, 2010
  393. diff -r test/external/libpng/Makefile.am test2/external/libpng/Makefile.am
  394. 77d76
  395. < CMakeLists.txt \
  396. 84d82
  397. < ${srcdir}/projects/xcode/* \
  398. 87d84
  399. < ${srcdir}/contrib/pngminim/* \
  400. 92c89
  401. < example.c libpng-1.2.46.txt pnggccrd.c pngvcrd.c
  402. ---
  403. > example.c libpng-1.2.44.txt pngvcrd.c
  404. diff -r test/external/libpng/Makefile.in test2/external/libpng/Makefile.in
  405. 341d340
  406. < CMakeLists.txt \
  407. 348d346
  408. < ${srcdir}/projects/xcode/* \
  409. 352d349
  410. < ${srcdir}/contrib/pngminim/* \
  411. 357c354
  412. < example.c libpng-1.2.46.txt pnggccrd.c pngvcrd.c
  413. ---
  414. > example.c libpng-1.2.44.txt pngvcrd.c
  415. diff -r test/external/libpng/NOTICE test2/external/libpng/NOTICE
  416. 11,14c11,12
  417. < This code is released under the libpng license.
  418. <
  419. < libpng versions 1.2.6, August 15, 2004, through 1.2.46, July 9, 2011, are
  420. < Copyright (c) 2004, 2006-2009 Glenn Randers-Pehrson, and are
  421. ---
  422. > libpng versions 1.2.6, August 15, 2004, through 1.2.29, May 8, 2008, are
  423. > Copyright (c) 2004, 2006-2008 Glenn Randers-Pehrson, and are
  424. 111c109
  425. < July 9, 2011
  426. ---
  427. > May 8, 2008
  428. diff -r test/external/libpng/png.5 test2/external/libpng/png.5
  429. 1c1
  430. < .TH PNG 5 "July 9, 2011"
  431. ---
  432. > .TH PNG 5 "June 26, 2010"
  433. diff -r test/external/libpng/png.c test2/external/libpng/png.c
  434. 4,5c4,5
  435. < * Last changed in libpng 1.2.46 [February 25, 2011]
  436. < * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  437. ---
  438. > * Last changed in libpng 1.2.43 [February 25, 2010]
  439. > * Copyright (c) 1998-2010 Glenn Randers-Pehrson
  440. 20c20
  441. < typedef version_1_2_46 Your_png_h_is_not_version_1_2_46;
  442. ---
  443. > typedef version_1_2_44 Your_png_h_is_not_version_1_2_44;
  444. 727,728c727,728
  445. < "libpng version 1.2.46 - July 9, 2011" PNG_STRING_NEWLINE \
  446. < "Copyright (c) 1998-2011 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
  447. ---
  448. > "libpng version 1.2.44 - June 26, 2010" PNG_STRING_NEWLINE \
  449. > "Copyright (c) 1998-2010 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
  450. 733,734c733,734
  451. < return ((png_charp) "libpng version 1.2.46 - July 9, 2011\
  452. < Copyright (c) 1998-2011 Glenn Randers-Pehrson\
  453. ---
  454. > return ((png_charp) "libpng version 1.2.44 - June 26, 2010\
  455. > Copyright (c) 1998-2010 Glenn Randers-Pehrson\
  456. diff -r test/external/libpng/pngconf.h test2/external/libpng/pngconf.h
  457. 4,5c4,5
  458. < * libpng version 1.2.46 - July 9, 2011
  459. < * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  460. ---
  461. > * libpng version 1.2.44 - June 26, 2010
  462. > * Copyright (c) 1998-2010 Glenn Randers-Pehrson
  463. diff -r test/external/libpng/pngerror.c test2/external/libpng/pngerror.c
  464. 4,5c4,5
  465. < * Last changed in libpng 1.2.45 [July 7, 2011]
  466. < * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  467. ---
  468. > * Last changed in libpng 1.2.41 [December 3, 2009]
  469. > * Copyright (c) 1998-2009 Glenn Randers-Pehrson
  470. 90,94d89
  471. < /* Prior to 1.2.45 the error_fn received a NULL pointer, expressed
  472. < * erroneously as '\0', instead of the empty string "". This was
  473. < * apparently an error, introduced in libpng-1.2.20, and png_default_error
  474. < * will crash in this case.
  475. < */
  476. 96c91
  477. < (*(png_ptr->error_fn))(png_ptr, "");
  478. ---
  479. > (*(png_ptr->error_fn))(png_ptr, '\0');
  480. 100c95
  481. < png_default_error(png_ptr, "");
  482. ---
  483. > png_default_error(png_ptr, '\0');
  484. 189,195c184,185
  485. <
  486. < iin = 0;
  487. < while (iin < PNG_MAX_ERROR_TEXT-1 && error_message[iin] != '\0')
  488. < buffer[iout++] = error_message[iin++];
  489. <
  490. < /* iin < PNG_MAX_ERROR_TEXT, so the following is safe: */
  491. < buffer[iout] = '\0';
  492. ---
  493. > png_memcpy(buffer + iout, error_message, PNG_MAX_ERROR_TEXT);
  494. > buffer[iout + PNG_MAX_ERROR_TEXT - 1] = '\0';
  495. diff -r test/external/libpng/png.h test2/external/libpng/png.h
  496. 3,4c3,4
  497. < * libpng version 1.2.46 - July 9, 2011
  498. < * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  499. ---
  500. > * libpng version 1.2.44 - June 26, 2010
  501. > * Copyright (c) 1998-2010 Glenn Randers-Pehrson
  502. 13c13
  503. < * libpng versions 0.97, January 1998, through 1.2.46 - July 9, 2011: Glenn
  504. ---
  505. > * libpng versions 0.97, January 1998, through 1.2.44 - June 26, 2010: Glenn
  506. 234c234
  507. < * 1.0.45 10 10045 12.so.0.45[.0]
  508. ---
  509. > * 1.2.45 10 10045 12.so.0.45[.0]
  510. 265,272d264
  511. < * 1.2.45beta01-03 13 10245 12.so.0.45[.0]
  512. < * 1.0.55rc01 10 10055 10.so.0.55[.0]
  513. < * 1.2.45rc01 13 10245 12.so.0.45[.0]
  514. < * 1.0.55 10 10055 10.so.0.55[.0]
  515. < * 1.2.45 13 10245 12.so.0.45[.0]
  516. < * 1.2.46rc01-02 13 10246 12.so.0.46[.0]
  517. < * 1.0.56 10 10056 10.so.0.56[.0]
  518. < * 1.2.46 13 10246 12.so.0.46[.0]
  519. 304,305c296,297
  520. < * libpng versions 1.2.6, August 15, 2004, through 1.2.46, July 9, 2011, are
  521. < * Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
  522. ---
  523. > * libpng versions 1.2.6, August 15, 2004, through 1.2.44, June 26, 2010, are
  524. > * Copyright (c) 2004, 2006-2010 Glenn Randers-Pehrson, and are
  525. 416c408
  526. < * July 9, 2011
  527. ---
  528. > * June 26, 2010
  529. 422c414
  530. < * upward through 1.2.46 are Y2K compliant. It is my belief that earlier
  531. ---
  532. > * upward through 1.2.44 are Y2K compliant. It is my belief that earlier
  533. 478c470
  534. < #define PNG_LIBPNG_VER_STRING "1.2.46"
  535. ---
  536. > #define PNG_LIBPNG_VER_STRING "1.2.44"
  537. 480c472
  538. < " libpng version 1.2.46 - July 9, 2011\n"
  539. ---
  540. > " libpng version 1.2.44 - June 26, 2010\n"
  541. 488c480
  542. < #define PNG_LIBPNG_VER_RELEASE 46
  543. ---
  544. > #define PNG_LIBPNG_VER_RELEASE 44
  545. 518c510
  546. < #define PNG_LIBPNG_VER 10246 /* 1.2.46 */
  547. ---
  548. > #define PNG_LIBPNG_VER 10244 /* 1.2.44 */
  549. 1558c1550
  550. < typedef png_structp version_1_2_46;
  551. ---
  552. > typedef png_structp version_1_2_44;
  553. diff -r test/external/libpng/pngmem.c test2/external/libpng/pngmem.c
  554. 445c445
  555. < png_voidp /* PRIVATE */
  556. ---
  557. > png_voidp PNGAPI
  558. diff -r test/external/libpng/pngrtran.c test2/external/libpng/pngrtran.c
  559. 4,5c4,5
  560. < * Last changed in libpng 1.2.45 [July 7, 2011]
  561. < * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  562. ---
  563. > * Last changed in libpng 1.2.43 [February 25, 2010]
  564. > * Copyright (c) 1998-2010 Glenn Randers-Pehrson
  565. 679c679,680
  566. < int red_fixed, green_fixed;
  567. ---
  568. > int red_fixed = (int)((float)red*100000.0 + 0.5);
  569. > int green_fixed = (int)((float)green*100000.0 + 0.5);
  570. 682,693d682
  571. < if (red > 21474.83647 || red < -21474.83648 ||
  572. < green > 21474.83647 || green < -21474.83648)
  573. < {
  574. < png_warning(png_ptr, "ignoring out of range rgb_to_gray coefficients");
  575. < red_fixed = -1;
  576. < green_fixed = -1;
  577. < }
  578. < else
  579. < {
  580. < red_fixed = (int)((float)red*100000.0 + 0.5);
  581. < green_fixed = (int)((float)green*100000.0 + 0.5);
  582. < }
  583. 1210c1199,1200
  584. < if (png_ptr->num_trans)
  585. ---
  586. > if (png_ptr->num_trans &&
  587. > (png_ptr->transformations & PNG_EXPAND_tRNS))
  588. diff -r test/external/libpng/pngrutil.c test2/external/libpng/pngrutil.c
  589. 4,5c4,5
  590. < * Last changed in libpng 1.2.45 [July 7, 2011]
  591. < * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  592. ---
  593. > * Last changed in libpng 1.2.44 [June 26, 2010]
  594. > * Copyright (c) 1998-2010 Glenn Randers-Pehrson
  595. 1811,1818d1810
  596. < png_crc_finish(png_ptr, length);
  597. < return;
  598. < }
  599. <
  600. < /* Need unit type, width, \0, height: minimum 4 bytes */
  601. < else if (length < 4)
  602. < {
  603. < png_warning(png_ptr, "sCAL chunk too short");
  604. diff -r test/external/libpng/pngtest.c test2/external/libpng/pngtest.c
  605. 1705c1705
  606. < typedef version_1_2_46 your_png_h_is_not_version_1_2_46;
  607. ---
  608. > typedef version_1_2_44 your_png_h_is_not_version_1_2_44;
  609. diff -r test/external/libpng/pngwrite.c test2/external/libpng/pngwrite.c
  610. 4,5c4,5
  611. < * Last changed in libpng 1.2.45 [July 7, 2011]
  612. < * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  613. ---
  614. > * Last changed in libpng 1.2.42 [January 3, 2010]
  615. > * Copyright (c) 1998-2010 Glenn Randers-Pehrson
  616. 298d297
  617. < !(up->location & PNG_AFTER_IDAT) &&
  618. diff -r test/external/libpng/projects/wince.txt test2/external/libpng/projects/wince.txt
  619. 2c2
  620. < libpng-1.2.46-project-wince.zip from a libpng distribution
  621. ---
  622. > libpng-1.2.44-project-wince.zip from a libpng distribution
  623. 6c6
  624. < "unzip -a libpng-1.2.46-project-wince.zip"
  625. ---
  626. > "unzip -a libpng-1.2.44-project-wince.zip"
  627. diff -r test/external/libpng/projects/xcode/libpng.xcodeproj/project.pbxproj test2/external/libpng/projects/xcode/libpng.xcodeproj/project.pbxproj
  628. 225c225
  629. < FRAMEWORK_VERSION = 1.2.46;
  630. ---
  631. > FRAMEWORK_VERSION = 1.2.44;
  632. 243c243
  633. < FRAMEWORK_VERSION = 1.2.46;
  634. ---
  635. > FRAMEWORK_VERSION = 1.2.44;
  636. diff -r test/external/libpng/README test2/external/libpng/README
  637. 1c1
  638. < README for libpng version 1.2.46 - July 9, 2011 (shared library 12.0)
  639. ---
  640. > README for libpng version 1.2.44 - June 26, 2010 (shared library 12.0)
  641. 202c202
  642. < creates libpng12.so.0.1.2.46)
  643. ---
  644. > creates libpng12.so.0.1.2.44)
  645. 204c204
  646. < libpng12.so.0.1.2.46)
  647. ---
  648. > libpng12.so.0.1.2.44)
  649. 206c206
  650. < libpng12.so.0.1.2.46, previously
  651. ---
  652. > libpng12.so.0.1.2.44, previously
  653. 231c231
  654. < (gcc, creates libpng12.so.0.1.2.46)
  655. ---
  656. > (gcc, creates libpng12.so.0.1.2.44)
  657. 234c234
  658. < (gcc, creates libpng12.so.0.1.2.46)
  659. ---
  660. > (gcc, creates libpng12.so.0.1.2.44)
  661. 236c236
  662. < (gcc, creates libpng12.so.0.1.2.46)
  663. ---
  664. > (gcc, creates libpng12.so.0.1.2.44)
  665. diff -r test/external/libpng/scripts/libpng-config-head.in test2/external/libpng/scripts/libpng-config-head.in
  666. 14c14
  667. < version=1.2.46
  668. ---
  669. > version=1.2.44
  670. diff -r test/external/libpng/scripts/libpng.pc.in test2/external/libpng/scripts/libpng.pc.in
  671. 8c8
  672. < Version: 1.2.46
  673. ---
  674. > Version: 1.2.44
  675. diff -r test/external/libpng/scripts/makefile.32sunu test2/external/libpng/scripts/makefile.32sunu
  676. 14c14
  677. < PNGMIN = 1.2.46
  678. ---
  679. > PNGMIN = 1.2.44
  680. diff -r test/external/libpng/scripts/makefile.64sunu test2/external/libpng/scripts/makefile.64sunu
  681. 14c14
  682. < PNGMIN = 1.2.46
  683. ---
  684. > PNGMIN = 1.2.44
  685. diff -r test/external/libpng/scripts/makefile.aix test2/external/libpng/scripts/makefile.aix
  686. 26c26
  687. < PNGMIN = 1.2.46
  688. ---
  689. > PNGMIN = 1.2.44
  690. diff -r test/external/libpng/scripts/makefile.beos test2/external/libpng/scripts/makefile.beos
  691. 14c14
  692. < PNGMIN = 1.2.46
  693. ---
  694. > PNGMIN = 1.2.44
  695. diff -r test/external/libpng/scripts/makefile.cegcc test2/external/libpng/scripts/makefile.cegcc
  696. 26c26
  697. < VERMIC = 46
  698. ---
  699. > VERMIC = 44
  700. diff -r test/external/libpng/scripts/makefile.cygwin test2/external/libpng/scripts/makefile.cygwin
  701. 80c80
  702. < PNGMIN = 1.2.46
  703. ---
  704. > PNGMIN = 1.2.44
  705. diff -r test/external/libpng/scripts/makefile.darwin test2/external/libpng/scripts/makefile.darwin
  706. 25c25
  707. < PNGMIN = 1.2.46
  708. ---
  709. > PNGMIN = 1.2.44
  710. diff -r test/external/libpng/scripts/makefile.dec test2/external/libpng/scripts/makefile.dec
  711. 11c11
  712. < PNGMIN = 1.2.46
  713. ---
  714. > PNGMIN = 1.2.44
  715. diff -r test/external/libpng/scripts/makefile.elf test2/external/libpng/scripts/makefile.elf
  716. 19c19
  717. < PNGMIN = 1.2.46
  718. ---
  719. > PNGMIN = 1.2.44
  720. diff -r test/external/libpng/scripts/makefile.gcmmx test2/external/libpng/scripts/makefile.gcmmx
  721. 20c20
  722. < PNGMIN = 1.2.46
  723. ---
  724. > PNGMIN = 1.2.44
  725. diff -r test/external/libpng/scripts/makefile.hp64 test2/external/libpng/scripts/makefile.hp64
  726. 24c24
  727. < PNGMIN = 1.2.46
  728. ---
  729. > PNGMIN = 1.2.44
  730. diff -r test/external/libpng/scripts/makefile.hpgcc test2/external/libpng/scripts/makefile.hpgcc
  731. 14c14
  732. < PNGMIN = 1.2.46
  733. ---
  734. > PNGMIN = 1.2.44
  735. diff -r test/external/libpng/scripts/makefile.hpux test2/external/libpng/scripts/makefile.hpux
  736. 24c24
  737. < PNGMIN = 1.2.46
  738. ---
  739. > PNGMIN = 1.2.44
  740. diff -r test/external/libpng/scripts/makefile.linux test2/external/libpng/scripts/makefile.linux
  741. 13c13
  742. < PNGMIN = 1.2.46
  743. ---
  744. > PNGMIN = 1.2.44
  745. diff -r test/external/libpng/scripts/makefile.mingw test2/external/libpng/scripts/makefile.mingw
  746. 84c84
  747. < PNGMIN = 1.2.46
  748. ---
  749. > PNGMIN = 1.2.44
  750. diff -r test/external/libpng/scripts/makefile.ne12bsd test2/external/libpng/scripts/makefile.ne12bsd
  751. 20c20
  752. < SHLIB_MINOR= 1.2.46
  753. ---
  754. > SHLIB_MINOR= 1.2.44
  755. diff -r test/external/libpng/scripts/makefile.netbsd test2/external/libpng/scripts/makefile.netbsd
  756. 20c20
  757. < SHLIB_MINOR= 1.2.46
  758. ---
  759. > SHLIB_MINOR= 1.2.44
  760. diff -r test/external/libpng/scripts/makefile.nommx test2/external/libpng/scripts/makefile.nommx
  761. 13c13
  762. < PNGMIN = 1.2.46
  763. ---
  764. > PNGMIN = 1.2.44
  765. diff -r test/external/libpng/scripts/makefile.openbsd test2/external/libpng/scripts/makefile.openbsd
  766. 14c14
  767. < SHLIB_MINOR= 1.2.46
  768. ---
  769. > SHLIB_MINOR= 1.2.44
  770. diff -r test/external/libpng/scripts/makefile.sco test2/external/libpng/scripts/makefile.sco
  771. 15c15
  772. < PNGMIN = 1.2.46
  773. ---
  774. > PNGMIN = 1.2.44
  775. diff -r test/external/libpng/scripts/makefile.sggcc test2/external/libpng/scripts/makefile.sggcc
  776. 12c12
  777. < PNGMIN = 1.2.46
  778. ---
  779. > PNGMIN = 1.2.44
  780. diff -r test/external/libpng/scripts/makefile.sgi test2/external/libpng/scripts/makefile.sgi
  781. 12c12
  782. < PNGMIN = 1.2.46
  783. ---
  784. > PNGMIN = 1.2.44
  785. diff -r test/external/libpng/scripts/makefile.so9 test2/external/libpng/scripts/makefile.so9
  786. 14c14
  787. < PNGMIN = 1.2.46
  788. ---
  789. > PNGMIN = 1.2.44
  790. diff -r test/external/libpng/scripts/makefile.solaris test2/external/libpng/scripts/makefile.solaris
  791. 14c14
  792. < PNGMIN = 1.2.46
  793. ---
  794. > PNGMIN = 1.2.44
  795. diff -r test/external/libpng/scripts/makefile.solaris-x86 test2/external/libpng/scripts/makefile.solaris-x86
  796. 14c14
  797. < PNGMIN = 1.2.46
  798. ---
  799. > PNGMIN = 1.2.44
  800. diff -r test/external/libpng/scripts/png32ce.def test2/external/libpng/scripts/png32ce.def
  801. 8c8
  802. < ;Version 1.2.46
  803. ---
  804. > ;Version 1.2.44
  805. diff -r test/external/libpng/scripts/pngos2.def test2/external/libpng/scripts/pngos2.def
  806. 5c5
  807. < ; Version 1.2.46
  808. ---
  809. > ; Version 1.2.44
  810. diff -r test/external/libpng/scripts/pngw32.def test2/external/libpng/scripts/pngw32.def
  811. 8c8
  812. < ;Version 1.2.46
  813. ---
  814. > ;Version 1.2.44
  815. diff -r test/external/libpng/scripts/README.txt test2/external/libpng/scripts/README.txt
  816. 2c2
  817. < Makefiles for libpng version 1.2.46 - July 9, 2011
  818. ---
  819. > Makefiles for libpng version 1.2.44 - June 26, 2010
  820. 5c5
  821. < (gcc, creates libpng12.so.0.1.2.46)
  822. ---
  823. > (gcc, creates libpng12.so.0.1.2.44)
  824. 23c23
  825. < gcc, creates libpng12.so.0.1.2.46)
  826. ---
  827. > gcc, creates libpng12.so.0.1.2.44)
  828. 41c41
  829. < creates libpng12.so.0.1.2.46)
  830. ---
  831. > creates libpng12.so.0.1.2.44)
  832. 44c44
  833. < creates libpng12.so.0.1.2.46)
  834. ---
  835. > creates libpng12.so.0.1.2.44)
  836. 46c46
  837. < creates libpng12.so.0.1.2.46)
  838. ---
  839. > creates libpng12.so.0.1.2.44)
  840. 48c48
  841. < creates libpng12.so.0.1.2.46)
  842. ---
  843. > creates libpng12.so.0.1.2.44)
  844. diff -r test/external/libpng/Y2KINFO test2/external/libpng/Y2KINFO
  845. 4c4
  846. < July 9, 2011
  847. ---
  848. > June 26, 2010
  849. 10c10
  850. < upward through 1.2.46 are Y2K compliant. It is my belief that earlier
  851. ---
  852. > upward through 1.2.44 are Y2K compliant. It is my belief that earlier
  853. diff -r test/external/tremolo/Tremolo/bitwiseARM.s test2/external/tremolo/Tremolo/bitwiseARM.s
  854. 172c172
  855. < BX LR
  856. ---
  857. > MOV PC,R14
  858. 230c230
  859. < BX LR
  860. ---
  861. > MOV PC,R14
  862. diff -r test/packages/apps/Browser/src/com/android/browser/BrowserActivity.java test2/packages/apps/Browser/src/com/android/browser/BrowserActivity.java
  863. 464,469d463
  864. < if (!TextUtils.isEmpty(urlData.mUrl) &&
  865. < urlData.mUrl.startsWith("javascript:")) {
  866. < // Always open javascript: URIs in new tabs
  867. < openTabAndShow(urlData, true, appId);
  868. < return;
  869. < }
  870. 1721,1726c1715,1730
  871. < Tab currentTab = mTabControl.getCurrentTab();
  872. < if (!mTabControl.canCreateNewTab()) {
  873. < Tab closeTab = mTabControl.getTab(0);
  874. < closeTab(closeTab);
  875. < if (closeTab == currentTab) {
  876. < currentTab = null;
  877. ---
  878. > final Tab currentTab = mTabControl.getCurrentTab();
  879. > if (mTabControl.canCreateNewTab()) {
  880. > final Tab tab = mTabControl.createNewTab(closeOnExit, appId,
  881. > urlData.mUrl);
  882. > WebView webview = tab.getWebView();
  883. > // If the last tab was removed from the active tabs page, currentTab
  884. > // will be null.
  885. > if (currentTab != null) {
  886. > removeTabFromContentView(currentTab);
  887. > }
  888. > // We must set the new tab as the current tab to reflect the old
  889. > // animation behavior.
  890. > mTabControl.setCurrentTab(tab);
  891. > attachTabToContentView(tab);
  892. > if (!urlData.isEmpty()) {
  893. > loadUrlDataIn(tab, urlData);
  894. 1727a1732,1740
  895. > return tab;
  896. > } else {
  897. > // Get rid of the subwindow if it exists
  898. > dismissSubWindow(currentTab);
  899. > if (!urlData.isEmpty()) {
  900. > // Load the given url.
  901. > loadUrlDataIn(currentTab, urlData);
  902. > }
  903. > return currentTab;
  904. 1729,1744d1741
  905. < final Tab tab = mTabControl.createNewTab(closeOnExit, appId,
  906. < urlData.mUrl);
  907. < WebView webview = tab.getWebView();
  908. < // If the last tab was removed from the active tabs page, currentTab
  909. < // will be null.
  910. < if (currentTab != null) {
  911. < removeTabFromContentView(currentTab);
  912. < }
  913. < // We must set the new tab as the current tab to reflect the old
  914. < // animation behavior.
  915. < mTabControl.setCurrentTab(tab);
  916. < attachTabToContentView(tab);
  917. < if (!urlData.isEmpty()) {
  918. < loadUrlDataIn(tab, urlData);
  919. < }
  920. < return tab;
  921. 2592,2594c2589,2590
  922. < // be dispatched to other apps. Similarly, javascript: schemas are private
  923. < // to the page
  924. < if (url.startsWith("about:") || url.startsWith("javascript:")) {
  925. ---
  926. > // be dispatched to other apps.
  927. > if (url.startsWith("about:")) {
  928. diff -r test/system/core/libsysutils/src/NetlinkListener.cpp test2/system/core/libsysutils/src/NetlinkListener.cpp
  929. 20d19
  930. < #include <linux/netlink.h>
  931. 36,40c35
  932. < ssize_t count;
  933. < char cred_msg[CMSG_SPACE(sizeof(struct ucred))];
  934. < struct sockaddr_nl snl;
  935. < struct iovec iov = {mBuffer, sizeof(mBuffer)};
  936. < struct msghdr hdr = {&snl, sizeof(snl), &iov, 1, cred_msg, sizeof(cred_msg), 0};
  937. ---
  938. > int count;
  939. 42,61c37,38
  940. < if ((count = recvmsg(socket, &hdr, 0)) < 0) {
  941. < SLOGE("recvmsg failed (%s)", strerror(errno));
  942. < return false;
  943. < }
  944. <
  945. < if ((snl.nl_groups != 1) || (snl.nl_pid != 0)) {
  946. < SLOGE("ignoring non-kernel netlink multicast message");
  947. < return false;
  948. < }
  949. <
  950. < struct cmsghdr * cmsg = CMSG_FIRSTHDR(&hdr);
  951. <
  952. < if (cmsg == NULL || cmsg->cmsg_type != SCM_CREDENTIALS) {
  953. < SLOGE("ignoring message with no sender credentials");
  954. < return false;
  955. < }
  956. <
  957. < struct ucred * cred = (struct ucred *)CMSG_DATA(cmsg);
  958. < if (cred->uid != 0) {
  959. < SLOGE("ignoring message from non-root UID %d", cred->uid);
  960. ---
  961. > if ((count = recv(socket, mBuffer, sizeof(mBuffer), 0)) < 0) {
  962. > SLOGE("recv failed (%s)", strerror(errno));
  963. diff -r test/system/netd/NetlinkManager.cpp test2/system/netd/NetlinkManager.cpp
  964. 53d52
  965. < int on = 1;
  966. 67,72c66
  967. < LOGE("Unable to set uevent socket SO_RCVBUFFORCE option: %s", strerror(errno));
  968. < return -1;
  969. < }
  970. <
  971. < if (setsockopt(mSock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on)) < 0) {
  972. < SLOGE("Unable to set uevent socket SO_PASSCRED option: %s", strerror(errno));
  973. ---
  974. > LOGE("Unable to set uevent socket options: %s", strerror(errno));
  975. diff -r test/system/vold/NetlinkManager.cpp test2/system/vold/NetlinkManager.cpp
  976. 53d52
  977. < int on = 1;
  978. 67,72c66
  979. < SLOGE("Unable to set uevent socket SO_RECBUFFORCE option: %s", strerror(errno));
  980. < return -1;
  981. < }
  982. <
  983. < if (setsockopt(mSock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on)) < 0) {
  984. < SLOGE("Unable to set uevent socket SO_PASSCRED option: %s", strerror(errno));
  985. ---
  986. > SLOGE("Unable to set uevent socket options: %s", strerror(errno));
  987. diff -r test/system/wlan/ti/sta_dk_4_0_4_32/wpa_supplicant_lib/driver_ti.c test2/system/wlan/ti/sta_dk_4_0_4_32/wpa_supplicant_lib/driver_ti.c
  988. 1359c1359
  989. < inet_aton("127.0.0.1", &echoserver.sin_addr); /* bind to loopback ONLY */
  990. ---
  991. > echoserver.sin_addr.s_addr = htonl(INADDR_ANY); /* IP address */
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!