Commit Graph

175143 Commits

Author SHA1 Message Date
Narayan Kamath
cdd0e0bd37 am a01d4696: Merge "ZipFileRO: Use precise widths for zip file types."
* commit 'a01d46963a292c6006a362974d1807a0cbb6af36':
  ZipFileRO: Use precise widths for zip file types.
2015-06-17 13:26:40 +00:00
Narayan Kamath
a01d46963a Merge "ZipFileRO: Use precise widths for zip file types." 2015-06-17 13:13:26 +00:00
Narayan Kamath
407753c456 ZipFileRO: Use precise widths for zip file types.
getEntryInfo crashes on 64-bit devices because "long" types
were being passed int pointers (that pointed to a stack frame)
that were reinterpret_cast'ed to long* (sigh.). To fix this issue
once and for all, use types with explicitly defined widths.

This change also removes some dead invariant checking from
Asset.cpp instead of cleaning it up.

Note that we've introduced a wart in NativeLibraryHelper, where
we need to deal with zlib's uLong type, which is "at least 32 bits
wide".

bug: 21622286

(cherry picked from commit 4600dd053d)

Change-Id: I7886cb37a229cc27c625699c80e6a6a6117d2203
2015-06-17 13:13:16 +00:00
Vladimir Marko
86fc9f4efa am dc22cfed: Merge "Don\'t prevent notification updates in DOS protection."
* commit 'dc22cfed5d3a65dcd3979113dbce468ad8ec2868':
  Don't prevent notification updates in DOS protection.
2015-06-17 09:48:58 +00:00
Vladimir Marko
dc22cfed5d Merge "Don't prevent notification updates in DOS protection." 2015-06-17 09:04:35 +00:00
Dan Albert
3a059d2d89 am f35f66a8: Merge "Use new sanitizer option."
* commit 'f35f66a86bfe7afd55ee3c8c9f624a55a1d6c2fe':
  Use new sanitizer option.
2015-06-16 21:22:51 +00:00
Dan Albert
f35f66a86b Merge "Use new sanitizer option." 2015-06-16 21:11:09 +00:00
Dan Albert
f98dae5675 Use new sanitizer option.
Change-Id: Iabc46da2820f252f6cd8cef8a447064890f3a76d
2015-06-16 14:06:49 -07:00
Mark Salyzyn
b17c58dd7f am 26a40606: Merge "jni: isLoggable calls __android_log_is_loggable"
* commit '26a406063732587a667d6c389cfd055a7ceab566':
  jni: isLoggable calls __android_log_is_loggable
2015-06-16 14:21:40 +00:00
Mark Salyzyn
26a4060637 Merge "jni: isLoggable calls __android_log_is_loggable" 2015-06-16 14:08:41 +00:00
Mark Salyzyn
8685a4569d jni: isLoggable calls __android_log_is_loggable
Will inherit additional functionality and cache improvements

Bug: 17760225
Change-Id: Iab1816d37cc74343d83629d851a5784d4865ebb4
2015-06-13 05:07:47 -07:00
Dmitriy Ivanov
e92281716a am 8da462de: Merge "Add path to native libraries inside apk"
* commit '8da462dea50dda16ea83b8cad83412a76f60f915':
  Add path to native libraries inside apk
2015-06-13 00:57:08 +00:00
Dmitriy Ivanov
8da462dea5 Merge "Add path to native libraries inside apk" 2015-06-13 00:44:01 +00:00
Chris Tate
386a5a2940 am 396b83b0: Merge "Fix overflow/underflow problem in comparison"
* commit '396b83b0c8a9c615ca416fa7a7d366a4e30971a1':
  Fix overflow/underflow problem in comparison
2015-06-12 20:07:47 +00:00
Chris Tate
396b83b0c8 Merge "Fix overflow/underflow problem in comparison" 2015-06-12 19:52:45 +00:00
Dmitriy Ivanov
88b85406d4 Add path to native libraries inside apk
If an application has native code (and primary abi)
include path to corresponding folder inside apk-file
to ldLibraryPath when constructing PathClassLoader

Bug: 21647354
Bug: 21667767
Bug: 21726698
Bug: 8076853
Change-Id: Ib0a2f01ee69019d3206a00c542bd7d0f58d0c481
(cherry picked from commit e56b3f63e8)
2015-06-11 10:48:22 -07:00
Andre Eisenbach
71afcb6906 am 7f0b5652: Merge "Bluetooth native dumpsys logging support (3/5)"
* commit '7f0b56527fa393cfc795d853edb809e224fc1376':
  Bluetooth native dumpsys logging support (3/5)
2015-06-10 20:30:44 +00:00
Andre Eisenbach
7f0b56527f Merge "Bluetooth native dumpsys logging support (3/5)" 2015-06-10 20:19:22 +00:00
Andre Eisenbach
945c52d5d7 Bluetooth native dumpsys logging support (3/5)
Bug: 18508263
Change-Id: I88f9c90dab8b0c825010c8617709449a3dd704b2
2015-06-10 19:34:41 +00:00
Tao Bao
86468ae72d am cfa9a98e: Merge "Improve the reboot-to-recovery dialogs"
* commit 'cfa9a98e99286e3cf1f89f80b37a5a9ff37c30c3':
  Improve the reboot-to-recovery dialogs
2015-06-10 00:55:30 +00:00
Tao Bao
7807cc259f am e215b464: Merge "Wait for uncrypt to finish before rebooting"
* commit 'e215b46482af78b6259c867815dc5cf2198908d5':
  Wait for uncrypt to finish before rebooting
2015-06-10 00:55:23 +00:00
Christopher Ferris
24b90915a1 am 6c4fc3a0: Merge "Change wtf errors from ASSERT to ERROR."
* commit '6c4fc3a08e9ca52a36f7fc83b783185da34abc12':
  Change wtf errors from ASSERT to ERROR.
2015-06-10 00:46:48 +00:00
Tao Bao
cfa9a98e99 Merge "Improve the reboot-to-recovery dialogs" 2015-06-10 00:43:58 +00:00
Tao Bao
e215b46482 Merge "Wait for uncrypt to finish before rebooting" 2015-06-10 00:43:47 +00:00
Christopher Ferris
6c4fc3a08e Merge "Change wtf errors from ASSERT to ERROR." 2015-06-10 00:32:25 +00:00
Christopher Ferris
70e23e0d14 Change wtf errors from ASSERT to ERROR.
Calling println_native with the value of ASSERT will set the abort
message. Unfortunately, there are numerous cases where one thread aborts,
but before that thread can communicate with debuggerd, another thread
calls wtf, which overwrites the abort message from the original
failing thread.

Fix this by changing this to an error level log message.

Bug: 21490722
(cherry picked from commit 2d073ba83c)

Change-Id: Ib9daedf114a2e0ecc424641e4929cc4d15b0c776
2015-06-09 17:31:37 -07:00
Tao Bao
f2a91ee148 Improve the reboot-to-recovery dialogs
To address the UX comments, this CL modifies the dialogs when the
device is rebooted to install an update or to perform factory data
reset.

Bug: 20949086
(cherry picked from commit 81dce66313)
Change-Id: I6d0cbbbaf184806366c6581c1c2e7dbcc5d89a17
2015-06-09 14:59:15 -07:00
Tao Bao
fa861429f7 Wait for uncrypt to finish before rebooting
/system/bin/uncrypt needs to be triggered to prepare the OTA package
before rebooting into the recovery. For larger packages, uncrypt may be
killed before it finishes the work after the timeout. Change to monitor
the uncrypt status and show the progress to user.

Needs matching changes in bootable/recovery/uncrypt, system/core and
external/sepolicy.

Also pick up the two NPE fixes in commits
9bb765448d and
da3f63ffb8.

Bug: 20012567
Bug: 20949086
(cherry picked from commit 90237f7beb)
Change-Id: Ibf2fc80032967e5f6cda3cd469005dd29665c87c
2015-06-09 14:58:13 -07:00
John Reck
ac26ea8a79 am c521b108: Merge "Fix a GL error leak issue"
* commit 'c521b10854ebdc227d6f32649c627a548caef2e4':
  Fix a GL error leak issue
2015-06-09 14:36:50 +00:00
John Reck
c521b10854 Merge "Fix a GL error leak issue" 2015-06-09 14:26:57 +00:00
ywen
f087c828cd Fix a GL error leak issue
glFinish() dequeues a native buffer, and it fails when
the bufeer has been abandoned, this is ok and will not
casue the app crash

GL_OUT_OF_MEMORY is generated in this case, and it is
not reset until glGetError called. This is happened in
build layer function, glGetError is called after glTexImg2d,
and get GL_OUT_OF_MEMORY, then this function return as OOM,
and app crash

Fix it by adding a glGetError after glFinish

Change-Id: I8803a726b6f609c4a2f8a6aa6bb7ff7064808932
2015-06-09 17:51:35 +05:30
Narayan Kamath
3277710c10 am a121d34c: Merge "ICU format support for pseudolocalizes."
* commit 'a121d34ceefc8d106bf48f8fdd400d67445fc573':
  ICU format support for pseudolocalizes.
2015-06-09 10:42:44 +00:00
Narayan Kamath
a121d34cee Merge "ICU format support for pseudolocalizes." 2015-06-09 10:29:04 +00:00
Igor Viarheichyk
cbb1e676b5 ICU format support for pseudolocalizes.
Custom parser can handle nested ICU messages even if they
are split into multiple fragments. Code reworked to encapsulate
all pseudolocalization logic in Pseudolocalizer and PseudoMethods
classes. To minimize a changelist size, some static functions
remained. Fake BiDi pseudolocalization method is reimplemented
to handle word boundaries correctly. Unit tests added.

Change-Id: I9fb4baf4e3123df5dd6d182cca02bb7b0489ca71
2015-06-09 11:28:20 +01:00
Yang Ni
8bcc22da6e am 1052ae00: Merge "Fixed ScriptGroup for outputs to globals"
* commit '1052ae00f1c23d9c8e6177cf0469236767de622f':
  Fixed ScriptGroup for outputs to globals
2015-06-08 23:18:49 +00:00
Yang Ni
1052ae00f1 Merge "Fixed ScriptGroup for outputs to globals" 2015-06-08 23:08:11 +00:00
Yang Ni
d9f5f0269d Fixed ScriptGroup for outputs to globals
b/21187932

Dependency from one kernel to another kernel -- where one reads the
other's output to a global allocation -- was not handled correctly.
This CL fixed that. Needed to make a new CTS test pass.

Change-Id: I500f9cac9d89bcaec7c186e942ba4a7d413daadb
(cherry picked from commit 85858718c0fc8f4f17ee18e5d62ec0614a8bc780)
2015-06-08 15:08:19 -07:00
Narayan Kamath
abf7f32340 am f5b7778e: Merge "Pass MUTF-8 paths to open(2) instead of UTF-8."
* commit 'f5b7778e5588af8077f079984dc69965da7102a6':
  Pass MUTF-8 paths to open(2) instead of UTF-8.
2015-06-08 15:23:34 +00:00
Narayan Kamath
f5b7778e55 Merge "Pass MUTF-8 paths to open(2) instead of UTF-8." 2015-06-08 15:14:32 +00:00
tao.pei
d415303c4d Pass MUTF-8 paths to open(2) instead of UTF-8.
Modified UTF-8 and UTF-8 differ with respect to how they handle
non-BMP characters. Modified UTF-8 uses 2 x 3 byte encodings, one
each for the high and low surrogate, whereas UTF-8 uses a single
4 byte sequence.

File systems don't specify and encoding and therefore the file name
encoding will vary depending on how it's created. All standard
Java APIs (java.io.File / FileOutputStream etc.) use Modified UTF-8
filenames, so we assume that's the status quo.

We will also audit code from the rest of the platform to make sure
that file names are encoded consistently.

bug: 21578056

Change-Id: I8e37af7f7cc442805a48899917f8e61c8f81fba6
2015-06-08 15:14:08 +00:00
Elliott Hughes
2f61e6ef97 am 3a5c054a: Merge "Fix debugging-log documentation errors."
* commit '3a5c054ac3a33753c3aeb2cb26e7b05d64291839':
  Fix debugging-log documentation errors.
2015-06-06 00:08:49 +00:00
Elliott Hughes
3a5c054ac3 Merge "Fix debugging-log documentation errors." 2015-06-05 23:55:16 +00:00
Elliott Hughes
771f2d5428 Fix debugging-log documentation errors.
ART has never supported log.redirect-stdio.

Don't imply that System.out and System.err go to /dev/null.

Bug: http://b/18092307
Bug: https://code.google.com/p/android/issues/detail?id=165602
Bug: https://code.google.com/p/android/issues/detail?id=62555
Change-Id: If5304a129e8941865211deb86766531925255796
2015-06-05 15:44:51 -07:00
Michael Wright
863b3cd1fa am 7d72fedd: Merge "Input command can fail (with exceptions) if the touchscreen id is not 0"
* commit '7d72fedd7e60070a26d5b5647fe93e2245c1903e':
  Input command can fail (with exceptions) if the touchscreen id is not 0
2015-06-05 12:29:32 +00:00
Michael Wright
7d72fedd7e Merge "Input command can fail (with exceptions) if the touchscreen id is not 0" 2015-06-05 12:17:10 +00:00
Chris Craik
5fd0e46d24 am 34a63ba4: Merge "Ensure RenderScript tracing is always balanced via try/finally"
* commit '34a63ba4d79567146f2724c47b06ffa4f21639da':
  Ensure RenderScript tracing is always balanced via try/finally
2015-06-04 17:39:32 +00:00
Chris Craik
34a63ba4d7 Merge "Ensure RenderScript tracing is always balanced via try/finally" 2015-06-04 17:24:16 +00:00
Chris Craik
7bf9a4208f am 1bdb3be9: Merge "Fix RenderScript copy tracing sections"
* commit '1bdb3be9cc284733f8c385b449b46221416c4018':
  Fix RenderScript copy tracing sections
2015-06-04 17:13:46 +00:00
Chris Craik
06d2984871 Ensure RenderScript tracing is always balanced via try/finally
bug:21560057

Change-Id: I6709b81636822135848c10adca8ba425f3c2212e
2015-06-04 10:02:18 -07:00
Chris Craik
1bdb3be9cc Merge "Fix RenderScript copy tracing sections" 2015-06-04 16:59:36 +00:00