175103 Commits

Author SHA1 Message Date
Dan Albert
f98dae5675 Use new sanitizer option.
Change-Id: Iabc46da2820f252f6cd8cef8a447064890f3a76d
2015-06-16 14:06:49 -07: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
8da462dea5 Merge "Add path to native libraries inside apk" 2015-06-13 00:44:01 +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 e56b3f63e8235ab45e081fc9d3476a3e5248ddde)
2015-06-11 10:48:22 -07: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
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 2d073ba83c570466a7f77d1cd9193ab4a60eaee4)

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 81dce6631396012e8b722bbed6d003f584800ae1)
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
9bb765448df43d41e0a3edb7de1d1641c9251c35 and
da3f63ffb87397943546a7c5c893ce98f2489df2.

Bug: 20012567
Bug: 20949086
(cherry picked from commit 90237f7beb55dae79cdcba5271f96be778573737)
Change-Id: Ibf2fc80032967e5f6cda3cd469005dd29665c87c
2015-06-09 14:58:13 -07: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
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
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
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
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
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
34a63ba4d7 Merge "Ensure RenderScript tracing is always balanced via try/finally" 2015-06-04 17:24:16 +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
Chris Craik
f77facd0b9 Fix RenderScript copy tracing sections
bug:21560057

Change-Id: I3b44d04bd908d9549ef7ada5f48f5d94e239d186
2015-06-04 09:50:15 -07:00
Charles Tsai
cdaaeeec0d Fix overflow/underflow problem in comparison
Here's overflow/underflow problem in comparators.
"when1 - when2" may suffer in overflow/underflow condition.
Comparing them directly can avoid this problem.

Change-Id: Id46af3db2adac90654210182d26ade1986ee0661
2015-06-04 17:14:03 +08:00
Christopher Desjardins
30fefa4d5d Input command can fail (with exceptions) if the touchscreen id is not 0
We had a device where the touchscreen was reconfigured during system
init, and as a result was assigned a device id that was not 0.
The following message from InputReader.cpp was logged when this occured:
I/InputReader(  762): Device reconfigured: id=4, name='himax-touchscreen', size 1024x600, orientation 1, mode 1, display id 0

Attempting to use the input command for the touchscreen in this state
will fail due to the hardcoded touchscreen device id.

Change-Id: I4e8fad864e7b83cce00c680b254bad06e1200f15
2015-06-04 09:12:49 +02:00
Olawale Ogunwale
bf17375e5e Merge "Should reset mDismissKeyguard on keyguard secure change" 2015-06-01 15:00:12 +00:00
Olawale Ogunwale
ad2be762f2 Merge "Fix null pointer dereference when security exception occurs" 2015-06-01 14:45:28 +00:00
Olawale Ogunwale
5ef5378374 Merge "WindowManagerService not propagating X and Y steps" 2015-06-01 14:42:37 +00:00
Neil Fuller
e761938c39 Merge "Fix javadocs based on recent case consistency change" 2015-06-01 12:01:44 +00:00
Chad Brubaker
dd78330140 Merge "Add optional additional entropy to finish" 2015-05-29 21:17:55 +00:00
Chad Brubaker
9ce30624a4 Add optional additional entropy to finish
If provided the extra entropy will be added to the device before calling
finish. If entropy is provided and the device does not support supplying
additional entropy then finish will fail with KM_ERROR_UNIMPLEMENTED.

Change-Id: If26be118bf382604f6f8e96e833b76e6f9e94d58
2015-05-29 12:32:56 -07:00
Narayan Kamath
4993da924c Merge "Patches for IKeyguardStateCallback" 2015-05-29 09:26:17 +00:00
dooyoung.hwang
516dad0625 Patches for IKeyguardStateCallback
1. Also notify input is restricted or not when IKeyguardStateCallback callback is added.
When first Keyguard is showing after boot, the mInputRestricted is not updated. So,
inKeyguardRestrictedInputMode still returns false, although device is locked.

2. If mShowing remains false during setup time of KeyguardViewMediator, mInputRestricted
is not updated. This is because updateInputRestrictedLocked is called only if showing
value is changed during setup time.
For this reason, when device is not provisioned, inKeyguardRestrictedInputMode returns
false, and device does not restrict key.

3. If one of callbacks causes RemoteException, the other callbacks are not called.
This is because catching RemoteException breaks for-loop.

Change-Id: I0281405127bcc75285b908d01485da3ac9b40b52
Signed-off-by: Dooyoung Hwang <dooyoung.hwang@lge.com>
2015-05-29 09:26:04 +00:00
Narayan Kamath
90cfc1923a Merge "Close race condition in binderDied()" 2015-05-29 08:34:02 +00:00
Christopher Tate
140f2b41af Close race condition in binderDied()
It was possible for a binderDied() call to occur while the death
recipient list containing the object was being iterated, in which
case we could invalidate an object reference out from under the
iteration, causing a VM abort.  We now interlock the binderDied()
deref operation with the list's locking semantics to prevent this.

Bug 15831054

(cherry picked from commit 090c08ff2a7525c830b4edfd1a79aa8ee3893c60)

Change-Id: If0027d3ac4da1153284a425dd9b2819a203481ab
2015-05-29 08:33:52 +00:00
David Srbecky
3976a56904 Merge "Replace --include-cfi with --generate-debug-info." 2015-05-28 18:37:37 +00:00
Evgenii Stepanov
495ebb119b Merge "Update asan/app_process." 2015-05-28 18:31:07 +00:00
Neil Fuller
0e1c0e11e4 Fix javadocs based on recent case consistency change
Commit a40d2447b6f516116135ee7f126579771ba98a2c made the
case consistently "as for the beginning of a sentence".
This updates the docs to reflect that. Previously the
result depended on the string returned (e.g. "Tomorrow"
was capitalized in English) and the casing varied
within and between locales.

Bug: 20247811
Change-Id: If4c6b3a13f61bd0cb64c82fc4c96d053130ae4c8
2015-05-28 18:21:29 +01:00
David Srbecky
f39477b592 Replace --include-cfi with --generate-debug-info.
This follows a change in dex2oat.

Change-Id: I46b61298ca00bee2e83080456b180d63efd95b8f
2015-05-28 17:16:09 +01:00
Chris Tate
d2b63ff8b2 Merge "Fix bug regarding the comparator sorts Alarms into increasing time order." 2015-05-27 23:53:33 +00:00
jinho.park
df7f900cf4 Fix bug regarding the comparator sorts Alarms into increasing time order.
The comparator used variable "when" in IncreasingTimeOrder class.
variable "when" means "elapsed time" or "real time"(RTC) and these types have different unit of time.
so, I recommend that you use a "whenElapsed" which has the equal unit of time as its default value.

Change-Id: I248863ef8a5c49cc7114cb2965f3d6b78f4faa59
Signed-off-by: Jinho Park <jinho.park@lge.com>
2015-05-27 14:44:18 +09:00
Narayan Kamath
3f453164ec Merge "Pass charset to XmlPullParser.setInput instead of null" 2015-05-22 09:30:46 +00:00
Wojciech Staszkiewicz
4f11754f72 Pass charset to XmlPullParser.setInput instead of null
Passing null to XmlPullParser.setInput forces it to do additional
work, which can be easily avoided if we know the charset beforehand.

bug: b/20849543

(cherry picked from commit 9e9e2e73c6ec7bece20268196dc89ad0c8bafad4)

Change-Id: Iaff97be9df2d0f99d7af8f19f65934439c9658e2
2015-05-22 10:26:31 +01:00
Narayan Kamath
d3916c885b Merge "Fix application moves." 2015-05-22 08:30:10 +00:00