175084 Commits

Author SHA1 Message Date
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
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
Narayan Kamath
561e13d687 Fix application moves.
We don't dex2oat during application moves, so we must scan
the package again scanPackageDirtyLI to deduce its ABI.

This is unnecessary (since a move cannot change ABIs), but we
need some additional refactoring to avoid a second scan.

bug: 21337469

(cherry picked from commit cd251fa382e887f59c278d4d7cd0a858812c6114)

Change-Id: Id1ed3bdfabb41e05e6a2f7efbd05d2103a67c663
2015-05-22 08:29:54 +00:00
Narayan Kamath
8f9339d0d7 Merge "Throw a checked exception on inconsistent installs." 2015-05-22 08:29:45 +00:00
Narayan Kamath
a96ecf7821 Throw a checked exception on inconsistent installs.
Allows us to proceed without crashing the system process. Also,
complete an incomplete error message. Follow up comments from
change b904863476991d8540d37d5.

bug: 21144503

(cherry picked from commit c52ae28006605fb2da38b305b60b9bb419aa2f80)

Change-Id: I47b8762449714162fcd5c16eba6fcc146b93120b
2015-05-22 08:29:32 +00:00
Narayan Kamath
3178e9f6e8 Merge "Scan package to derive ABIs before optimizing." 2015-05-22 08:29:20 +00:00
Narayan Kamath
2b6d792ad5 Scan package to derive ABIs before optimizing.
This requires a minor refactor to extract the ABI detection logic
out of scanPackageDirtyLI.

Note that there's a minor regression here : we ignore the
cpuAbiOverride from the package settings when calculating the
CPU ABI. This is OK (and possibly better behaviour) because this
is only a debug only option (for adb install) AND because the instructions
require users to specify the abi override on every adb install
invocation. Furthermore, the behaviour when an ADB installed app
(with an override) is auto-updated is more consistent.

bug: 21144503

(cherry picked from commit b904863476991d8540d37d542c0a49b78deab680)

Change-Id: I1eb88b808fd2e90e14c32322131659220aafdb7a
2015-05-22 08:29:07 +00:00
Narayan Kamath
2e06258c45 Merge "Do not create oat directory for an app in ASEC container" 2015-05-22 08:28:52 +00:00
Fyodor Kupolov
589f2b53f2 Do not create oat directory for an app in ASEC container
Currently installation fails, if an app is located on SD card (inside ASEC).
If an app is located inside ASEC, dexopt output should go to
/data/dalvik-cache. dexopt also needs to be performed at a later stage,
because the name of the oat file contains the absolute path to the dex file.

Bug: 20452651
Bug: 21360107

(cherry picked from commit 94056d1cb8183bde3e942336735b289b9654deb1)

Change-Id: Id1ced7159e5af9c05be0b637437b3b260e859c1d
2015-05-21 19:42:34 +01:00
Stephen Hines
3385b6169f Merge "Added in flag to ask context to wait for debugger attach." 2015-05-21 16:23:37 +00:00
Yohann Roussel
2db531ee1b Merge "[DO NOT MERGE] Allow compilation with Jack." 2015-05-21 09:23:48 +00:00
Christopher Desjardins
a64cd48594 Fix null pointer dereference when security exception occurs
Just above the SecurityException is a check for r.record == null,
thus dereferencing r.record will cause a null pointer exception.

Found in Android 4.3 with the following steps:

1) Start the music app.
2) Switch to the restricted user.
3) Navigate to Settings->Apps->Running->Music.
4) Tap the stop button.

The security exception should be thrown which results in
a nice message to the user, but instead a null pointer
exception is thrown which results in the settings app
crashing.

Change-Id: I4a306c38650c9d366896e592767dde70adb71c57
2015-05-21 09:20:46 +02:00
Jean-Luc Brouillet
d76727637e Merge "Clean RenderScript warnings" 2015-05-20 18:24:58 +00:00
Jean-Luc Brouillet
8b1e95b0e5 Clean RenderScript warnings
Change-Id: Ia7a98c1c977c839c74ae8081e70b5deb4b60c25d
2015-05-19 17:45:30 -07:00
Fyodor Kupolov
5053258e20 Merge "Allow creating a managed profile if there is only one user." 2015-05-19 17:47:03 +00:00
Miao Wang
7787760961 Merge "[RenderScript] fix Allocation.copyToFieldPacker" 2015-05-19 16:45:13 +00:00
Yohann Roussel
7bcaf9a997 [DO NOT MERGE] Allow compilation with Jack.
Adapt to Jack compilation specifics.

Fix bad import in VideoDumpActivity.
The extra semicolumn is ignored by javac because of
https://bugs.openjdk.java.net/browse/JDK-8027682 but is not
permitted by ecj or Jack.

This includes cherry-picks of the following changes:
248ef6f9c414db26fd1bc7ec3d4ee4f3b87d54cf
705555dc468e46560d02db102dfcedc1e5c70d9e
f50a51fb4c8d5ca973ce910a21bddf9f8466cb51
bf5ad8d9943c0e1b0b3f1b4524c277f369065d08

Change-Id: Ifbe063e3822a7d63b1681921b9788cfca898ba64
2015-05-19 18:17:39 +02:00
Alex Klyubin
838a7e50eb Merge "Switch from getSpi to getCurrentSpi." 2015-05-18 19:08:33 +00:00
Nicolas Prevot
12678a99f1 Allow creating a managed profile if there is only one user.
BUG:21119929

Change-ID: Ice1cf25f8ae8199228f828d22118c94b9e11b567
2015-05-18 10:48:16 -07:00
Alex Klyubin
bdc1382ac5 Switch from getSpi to getCurrentSpi.
Crypto primitives' getSpi has a side-effect which modifies the state
of the primitive: it selects an SPI implementation if it hasn't been
selected yet (e.g., Cipher.getInstance("AES") doesn't select an SPI
implementation until Cipher.init). The new method getCurrentSpi has
no side-effects: it simply returns null if no SPI implementation is
selected. The switch to getCurrentSpi lets us avoid side-effects and
throw a more pertinent exception when no SPI is yet selected.

Bug: 18088752
Change-Id: I6d62eb67f904a15782673d16bcdae240cdc8f979
2015-05-18 09:54:54 -07:00
tingna_sung
38cd664c68 Should reset mDismissKeyguard on keyguard secure change
If user sets a non-secure lock screen, launch an activity which
appends window flag FLAG_DISMISS_KEYGUARD, then insert a PIN lock
SIM card, activity window will become black screen.

This is because mDismissKeyguard keeps on DISMISS_KEYGUARD_CONTINUE
when keyguard secure changes from non-secure to secure like in the
insert PIN lock SIM card case. If mDismissKeyguard is
DISMISS_KEYGUARD_CONTINUE and keyguard is secure, there is no chance
to launch keyguard unlock window anymore.

This patch handles the use case that to reset mDismissKeyguard to a
new cycle from DISMISS_KEYGUARD_START to DISMISS_KEYGUARD_CONTINUE
again once keyguard secure state change suddenly to let keyguard
window has chance to be launched.

https://code.google.com/p/android/issues/detail?id=78806

Change-Id: I0d4fd0b9bdf7d0a39f35427bfd4e1b928d9bca6b
Signed-off-by: tingna_sung <tingna_sung@htc.com>
2015-05-18 13:56:34 +08:00