OSDN Git Service
Christopher Ferris [Wed, 10 Jun 2015 00:46:48 +0000 (00:46 +0000)]
am
6c4fc3a0: Merge "Change wtf errors from ASSERT to ERROR."
* commit '
6c4fc3a08e9ca52a36f7fc83b783185da34abc12':
Change wtf errors from ASSERT to ERROR.
Christopher Ferris [Wed, 10 Jun 2015 00:32:24 +0000 (00:32 +0000)]
Merge "Change wtf errors from ASSERT to ERROR."
Christopher Ferris [Tue, 9 Jun 2015 17:51:43 +0000 (10:51 -0700)]
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
John Reck [Tue, 9 Jun 2015 14:36:50 +0000 (14:36 +0000)]
am
c521b108: Merge "Fix a GL error leak issue"
* commit '
c521b10854ebdc227d6f32649c627a548caef2e4':
Fix a GL error leak issue
John Reck [Tue, 9 Jun 2015 14:26:56 +0000 (14:26 +0000)]
Merge "Fix a GL error leak issue"
ywen [Thu, 28 May 2015 06:10:53 +0000 (14:10 +0800)]
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
Narayan Kamath [Tue, 9 Jun 2015 10:42:44 +0000 (10:42 +0000)]
am
a121d34c: Merge "ICU format support for pseudolocalizes."
* commit '
a121d34ceefc8d106bf48f8fdd400d67445fc573':
ICU format support for pseudolocalizes.
Narayan Kamath [Tue, 9 Jun 2015 10:29:03 +0000 (10:29 +0000)]
Merge "ICU format support for pseudolocalizes."
Igor Viarheichyk [Fri, 15 May 2015 01:47:00 +0000 (18:47 -0700)]
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
Yang Ni [Mon, 8 Jun 2015 23:18:49 +0000 (23:18 +0000)]
am
1052ae00: Merge "Fixed ScriptGroup for outputs to globals"
* commit '
1052ae00f1c23d9c8e6177cf0469236767de622f':
Fixed ScriptGroup for outputs to globals
Yang Ni [Mon, 8 Jun 2015 23:08:10 +0000 (23:08 +0000)]
Merge "Fixed ScriptGroup for outputs to globals"
Yang Ni [Mon, 18 May 2015 17:56:47 +0000 (10:56 -0700)]
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)
Narayan Kamath [Mon, 8 Jun 2015 15:23:34 +0000 (15:23 +0000)]
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.
Narayan Kamath [Mon, 8 Jun 2015 15:14:31 +0000 (15:14 +0000)]
Merge "Pass MUTF-8 paths to open(2) instead of UTF-8."
tao.pei [Tue, 2 Jun 2015 02:06:20 +0000 (10:06 +0800)]
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
Elliott Hughes [Sat, 6 Jun 2015 00:08:49 +0000 (00:08 +0000)]
am
3a5c054a: Merge "Fix debugging-log documentation errors."
* commit '
3a5c054ac3a33753c3aeb2cb26e7b05d64291839':
Fix debugging-log documentation errors.
Elliott Hughes [Fri, 5 Jun 2015 23:55:15 +0000 (23:55 +0000)]
Merge "Fix debugging-log documentation errors."
Elliott Hughes [Fri, 5 Jun 2015 22:42:09 +0000 (15:42 -0700)]
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
Michael Wright [Fri, 5 Jun 2015 12:29:32 +0000 (12:29 +0000)]
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
Michael Wright [Fri, 5 Jun 2015 12:17:09 +0000 (12:17 +0000)]
Merge "Input command can fail (with exceptions) if the touchscreen id is not 0"
Chris Craik [Thu, 4 Jun 2015 17:39:32 +0000 (17:39 +0000)]
am
34a63ba4: Merge "Ensure RenderScript tracing is always balanced via try/finally"
* commit '
34a63ba4d79567146f2724c47b06ffa4f21639da':
Ensure RenderScript tracing is always balanced via try/finally
Chris Craik [Thu, 4 Jun 2015 17:24:12 +0000 (17:24 +0000)]
Merge "Ensure RenderScript tracing is always balanced via try/finally"
Chris Craik [Thu, 4 Jun 2015 17:13:46 +0000 (17:13 +0000)]
am
1bdb3be9: Merge "Fix RenderScript copy tracing sections"
* commit '
1bdb3be9cc284733f8c385b449b46221416c4018':
Fix RenderScript copy tracing sections
Chris Craik [Wed, 3 Jun 2015 00:19:24 +0000 (17:19 -0700)]
Ensure RenderScript tracing is always balanced via try/finally
bug:
21560057
Change-Id: I6709b81636822135848c10adca8ba425f3c2212e
Chris Craik [Thu, 4 Jun 2015 16:59:35 +0000 (16:59 +0000)]
Merge "Fix RenderScript copy tracing sections"
Chris Craik [Mon, 1 Jun 2015 17:39:36 +0000 (10:39 -0700)]
Fix RenderScript copy tracing sections
bug:
21560057
Change-Id: I3b44d04bd908d9549ef7ada5f48f5d94e239d186
Christopher Desjardins [Mon, 1 Jun 2015 15:42:40 +0000 (15:42 +0000)]
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
Olawale Ogunwale [Mon, 1 Jun 2015 15:34:52 +0000 (15:34 +0000)]
am
bf17375e: Merge "Should reset mDismissKeyguard on keyguard secure change"
* commit '
bf17375e5e6195122ee24295cf05f012822711ec':
Should reset mDismissKeyguard on keyguard secure change
Olawale Ogunwale [Mon, 1 Jun 2015 15:00:12 +0000 (15:00 +0000)]
Merge "Should reset mDismissKeyguard on keyguard secure change"
Olawale Ogunwale [Mon, 1 Jun 2015 14:59:15 +0000 (14:59 +0000)]
am
ad2be762: Merge "Fix null pointer dereference when security exception occurs"
* commit '
ad2be762f2f0ff9f3c01e729e307920cef6e2904':
Fix null pointer dereference when security exception occurs
Olawale Ogunwale [Mon, 1 Jun 2015 14:59:08 +0000 (14:59 +0000)]
am
5ef53783: Merge "WindowManagerService not propagating X and Y steps"
* commit '
5ef53783743c7a7fb2339274ddb0886b0eb789ec':
WindowManagerService not propagating X and Y steps
Olawale Ogunwale [Mon, 1 Jun 2015 14:45:27 +0000 (14:45 +0000)]
Merge "Fix null pointer dereference when security exception occurs"
Olawale Ogunwale [Mon, 1 Jun 2015 14:42:36 +0000 (14:42 +0000)]
Merge "WindowManagerService not propagating X and Y steps"
Neil Fuller [Mon, 1 Jun 2015 12:14:47 +0000 (12:14 +0000)]
am
e761938c: Merge "Fix javadocs based on recent case consistency change"
* commit '
e761938c39c1cafa80d0c474e107041316a49cbd':
Fix javadocs based on recent case consistency change
Neil Fuller [Mon, 1 Jun 2015 12:01:44 +0000 (12:01 +0000)]
Merge "Fix javadocs based on recent case consistency change"
Chad Brubaker [Fri, 29 May 2015 21:31:52 +0000 (21:31 +0000)]
am
dd783301: Merge "Add optional additional entropy to finish"
* commit '
dd78330140ad0e02fc693fc1f5bf041adcf64a1f':
Add optional additional entropy to finish
Chad Brubaker [Fri, 29 May 2015 21:17:54 +0000 (21:17 +0000)]
Merge "Add optional additional entropy to finish"
Chad Brubaker [Fri, 29 May 2015 19:32:51 +0000 (12:32 -0700)]
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
Narayan Kamath [Fri, 29 May 2015 09:39:43 +0000 (09:39 +0000)]
am
4993da92: Merge "Patches for IKeyguardStateCallback"
* commit '
4993da924c6f25194aded71e70eefd07208eee81':
Patches for IKeyguardStateCallback
Narayan Kamath [Fri, 29 May 2015 09:26:16 +0000 (09:26 +0000)]
Merge "Patches for IKeyguardStateCallback"
dooyoung.hwang [Thu, 21 May 2015 07:09:43 +0000 (16:09 +0900)]
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>
Narayan Kamath [Fri, 29 May 2015 09:25:16 +0000 (09:25 +0000)]
am
90cfc192: Merge "Close race condition in binderDied()"
* commit '
90cfc1923ae0a9fe98b97d123b2250f01e8bc3f2':
Close race condition in binderDied()
Narayan Kamath [Fri, 29 May 2015 08:34:02 +0000 (08:34 +0000)]
Merge "Close race condition in binderDied()"
Christopher Tate [Wed, 20 May 2015 01:16:58 +0000 (18:16 -0700)]
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
David Srbecky [Thu, 28 May 2015 18:45:36 +0000 (18:45 +0000)]
am
3976a569: Merge "Replace --include-cfi with --generate-debug-info."
* commit '
3976a56904e359eb975395725e908122d7d6e466':
Replace --include-cfi with --generate-debug-info.
Evgenii Stepanov [Thu, 28 May 2015 18:45:30 +0000 (18:45 +0000)]
am
495ebb11: Merge "Update asan/app_process."
* commit '
495ebb119bd1cea64f985367ba3bb87594e4fa81':
Update asan/app_process.
David Srbecky [Thu, 28 May 2015 18:37:35 +0000 (18:37 +0000)]
Merge "Replace --include-cfi with --generate-debug-info."
Evgenii Stepanov [Thu, 28 May 2015 18:31:07 +0000 (18:31 +0000)]
Merge "Update asan/app_process."
Neil Fuller [Thu, 28 May 2015 17:19:02 +0000 (18:19 +0100)]
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
David Srbecky [Thu, 28 May 2015 16:16:09 +0000 (17:16 +0100)]
Replace --include-cfi with --generate-debug-info.
This follows a change in dex2oat.
Change-Id: I46b61298ca00bee2e83080456b180d63efd95b8f
Chris Tate [Thu, 28 May 2015 00:08:54 +0000 (00:08 +0000)]
am
d2b63ff8: Merge "Fix bug regarding the comparator sorts Alarms into increasing time order."
* commit '
d2b63ff8b2706e54bae2678d42db2681db812113':
Fix bug regarding the comparator sorts Alarms into increasing time order.
Chris Tate [Wed, 27 May 2015 23:53:32 +0000 (23:53 +0000)]
Merge "Fix bug regarding the comparator sorts Alarms into increasing time order."
jinho.park [Wed, 27 May 2015 05:44:18 +0000 (14:44 +0900)]
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>
Narayan Kamath [Fri, 22 May 2015 09:39:25 +0000 (09:39 +0000)]
am
3f453164: Merge "Pass charset to XmlPullParser.setInput instead of null"
* commit '
3f453164ec884d26a556477027b430cb22a9b7e3':
Pass charset to XmlPullParser.setInput instead of null
Narayan Kamath [Fri, 22 May 2015 09:30:45 +0000 (09:30 +0000)]
Merge "Pass charset to XmlPullParser.setInput instead of null"
Narayan Kamath [Fri, 22 May 2015 09:27:31 +0000 (09:27 +0000)]
am
d3916c88: Merge "Fix application moves."
* commit '
d3916c885ba382d78b6c64bc0773dd38638a6c3f':
Fix application moves.
Narayan Kamath [Fri, 22 May 2015 09:27:25 +0000 (09:27 +0000)]
am
8f9339d0: Merge "Throw a checked exception on inconsistent installs."
* commit '
8f9339d0d76bf92f7a55b4eaf569e4cfb6e3212c':
Throw a checked exception on inconsistent installs.
Narayan Kamath [Fri, 22 May 2015 09:27:19 +0000 (09:27 +0000)]
am
3178e9f6: Merge "Scan package to derive ABIs before optimizing."
* commit '
3178e9f6e823b01d1af382149ecafec741ecd2d0':
Scan package to derive ABIs before optimizing.
Narayan Kamath [Fri, 22 May 2015 09:27:13 +0000 (09:27 +0000)]
am
2e06258c: Merge "Do not create oat directory for an app in ASEC container"
* commit '
2e06258c4588b5c381277ad0269c00f7d05d1016':
Do not create oat directory for an app in ASEC container
Wojciech Staszkiewicz [Fri, 8 May 2015 13:58:46 +0000 (14:58 +0100)]
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
Narayan Kamath [Fri, 22 May 2015 08:30:07 +0000 (08:30 +0000)]
Merge "Fix application moves."
Narayan Kamath [Thu, 21 May 2015 09:50:35 +0000 (10:50 +0100)]
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
Narayan Kamath [Fri, 22 May 2015 08:29:45 +0000 (08:29 +0000)]
Merge "Throw a checked exception on inconsistent installs."
Narayan Kamath [Wed, 20 May 2015 10:11:55 +0000 (11:11 +0100)]
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
Narayan Kamath [Fri, 22 May 2015 08:29:20 +0000 (08:29 +0000)]
Merge "Scan package to derive ABIs before optimizing."
Narayan Kamath [Mon, 18 May 2015 09:18:35 +0000 (10:18 +0100)]
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
Narayan Kamath [Fri, 22 May 2015 08:28:50 +0000 (08:28 +0000)]
Merge "Do not create oat directory for an app in ASEC container"
Fyodor Kupolov [Wed, 22 Apr 2015 23:03:48 +0000 (16:03 -0700)]
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
Stephen Hines [Thu, 21 May 2015 16:35:53 +0000 (16:35 +0000)]
am
3385b616: Merge "Added in flag to ask context to wait for debugger attach."
* commit '
3385b6169f47fd663d893fc787173c2d57a0a05f':
Added in flag to ask context to wait for debugger attach.
Stephen Hines [Thu, 21 May 2015 16:23:36 +0000 (16:23 +0000)]
Merge "Added in flag to ask context to wait for debugger attach."
Yohann Roussel [Thu, 21 May 2015 09:53:38 +0000 (09:53 +0000)]
am
2db531ee: (-s ours) Merge "[DO NOT MERGE] Allow compilation with Jack."
* commit '
2db531ee1b3a980ea9ee6c7e72ad6d11983500e2':
[DO NOT MERGE] Allow compilation with Jack.
Yohann Roussel [Thu, 21 May 2015 09:23:38 +0000 (09:23 +0000)]
Merge "[DO NOT MERGE] Allow compilation with Jack."
Christopher Desjardins [Tue, 19 May 2015 11:25:40 +0000 (11:25 +0000)]
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
Jean-Luc Brouillet [Wed, 20 May 2015 18:24:58 +0000 (18:24 +0000)]
Merge "Clean RenderScript warnings"
Jean-Luc Brouillet [Tue, 19 May 2015 21:59:42 +0000 (14:59 -0700)]
Clean RenderScript warnings
Change-Id: Ia7a98c1c977c839c74ae8081e70b5deb4b60c25d
Fyodor Kupolov [Tue, 19 May 2015 17:47:02 +0000 (17:47 +0000)]
Merge "Allow creating a managed profile if there is only one user."
Miao Wang [Tue, 19 May 2015 16:45:07 +0000 (16:45 +0000)]
Merge "[RenderScript] fix Allocation.copyToFieldPacker"
Yohann Roussel [Mon, 8 Sep 2014 12:53:12 +0000 (14:53 +0200)]
[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
Alex Klyubin [Mon, 18 May 2015 19:08:32 +0000 (19:08 +0000)]
Merge "Switch from getSpi to getCurrentSpi."
Nicolas Prevot [Wed, 13 May 2015 19:15:03 +0000 (12:15 -0700)]
Allow creating a managed profile if there is only one user.
BUG:
21119929
Change-ID: Ice1cf25f8ae8199228f828d22118c94b9e11b567
Alex Klyubin [Mon, 18 May 2015 16:52:29 +0000 (09:52 -0700)]
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
tingna_sung [Tue, 12 May 2015 05:23:15 +0000 (13:23 +0800)]
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>
Richard MacGregor [Fri, 17 Apr 2015 16:26:36 +0000 (09:26 -0700)]
WindowManagerService not propagating X and Y steps
WindowManagerService received X and Y offset steps but failed to pass
them off to the relavent wallpaperservice.
Live wallpapers expect a valid value for xOffsetStep and yOffsetStep
when the WallpaperService.Engine::onOffsetsChanged function is called
As specified here:
https://developer.android.com/reference/android/service/wallpaper/WallpaperService.Engine.html
onOffsetsChanged(float,float, float, float, int, int)
See bug report:
https://code.google.com/p/android/issues/detail?id=173607
Change-Id: I532dedf2db055e27d6eca813e30346e37f52dc65
(cherry picked from commit
e03ea68d0a7f7d7c60663feae587225cca3a3a5b)
Chad Brubaker [Fri, 15 May 2015 19:54:32 +0000 (19:54 +0000)]
Merge "Cleanup Keystore API"
Olawale Ogunwale [Fri, 15 May 2015 17:23:07 +0000 (17:23 +0000)]
Merge "Use the correct parent size to initialize animations"
Olawale Ogunwale [Fri, 15 May 2015 17:11:27 +0000 (17:11 +0000)]
Merge "Fix lost singleton provider after force-stopping user or package."
Olawale Ogunwale [Fri, 15 May 2015 16:19:46 +0000 (16:19 +0000)]
Merge "Also restart provider if there is external handle."
riddle_hsu [Fri, 15 May 2015 03:33:03 +0000 (11:33 +0800)]
Fix lost singleton provider after force-stopping user or package.
Case 1 (name == null):
Switch user from guest to owner. All processes of guest
will be killed, it will not include processes which singleton
components live in, but singleton provider records are still
collected and removed.
When the user switch is complete and the process of removed
singleton provider is still alive, there is someone access
the provider, it will create a new ContentProviderRecord and
wait but no one will notify it because the provider process
is alive with different ContentProviderRecord.
Then the access cannot get response unless the process of target
provider is died and restarted.
Case 2 (name != null):
Switch to another non-guest user, launch an application which
contains singleton provider. Go to Settings to force-stop the
package then switch back to owner user. Launch an application
which will access the singleton provider. It will also cannot
get response that similar as case 1.
Solution:
Only collect singleton provider if target user is all or owner.
Change-Id: Ic6828da66645172d1378cfb1f66d092df5966516
Chad Brubaker [Tue, 12 May 2015 22:19:52 +0000 (15:19 -0700)]
Cleanup Keystore API
Rename confusingly named methods, add userID arguments to all methods
that operate on user state and delete methods that have been replaced by
the onUser* methods.
Some of the old methods have been kept in KeyStore.java in order to ease
the transition of various system packages to the new methods.
Change-Id: Ic271689d62c36d255c5adee26c7abc2e7ed24df5
Stephen McGroarty [Fri, 8 May 2015 14:56:58 +0000 (15:56 +0100)]
Added in flag to ask context to wait for debugger attach.
Adds in flag CREATE_FLAG_WAIT_FOR_ATTACH with value 0x0008 to the RenderScript API
to be passed down to the C++ implementation to tell it to wait for a debugger to be
attached before executing the kernel.
Change-Id: Ibc4e903efbed1b1fb14cf378d1a8517d5c8d1f26
Signed-off-by: Stephen McGroarty <stephen@codeplay.com>
Chris Tate [Thu, 14 May 2015 01:20:52 +0000 (01:20 +0000)]
Merge "AlarmClockInfo: fix redundant word in doc comment"
Shuhrat Dehkanov [Wed, 13 May 2015 08:16:29 +0000 (17:16 +0900)]
AlarmClockInfo: fix redundant word in doc comment
Removed one of unintentional double "intent"s.
Change-Id: I0ce4224964afae0587ce55b6b4775370eff89d26
Signed-off-by: Shuhrat Dehkanov <k@efir.uz>
Jason Sams [Thu, 14 May 2015 00:53:16 +0000 (00:53 +0000)]
Merge "Fix issues found during CTS testing of FP16"
Jason Sams [Wed, 13 May 2015 20:21:30 +0000 (13:21 -0700)]
Fix issues found during CTS testing of FP16
bug
20822382
This corrects a copy&paste error placing F16 into F32.
Fixes an error disallowing vectors of fp16 types.
Change-Id: I34be1aa9a323d61a7121581ab9599d2c2d32dd42
Hiroshi Yamauchi [Wed, 13 May 2015 22:47:59 +0000 (22:47 +0000)]
Merge "Replace JNI primitive array critical calls with non-critical ones."
Hiroshi Yamauchi [Wed, 13 May 2015 20:10:33 +0000 (13:10 -0700)]
Replace JNI primitive array critical calls with non-critical ones.
The files generated by glgen + manually edited util.cpp.
(cherry pick commit
5b406cb7b548443b589f0acb235c8a7465ffb82b)
Bug:
19235243
Change-Id: I9ab79c36e4ac6e123296b06ee8e4c04c4f583104
riddle_hsu [Wed, 13 May 2015 10:59:03 +0000 (18:59 +0800)]
Also restart provider if there is external handle.
e.g. ContentResolver.getType will call
ActivityManagerService.getProviderMimeType
that will not have connection but increase
externalProcessNoHandleCount.
Change-Id: I649c0b2390a749c77c6be5e7dfadc1acb689ec4c
Chad Brubaker [Tue, 12 May 2015 23:26:34 +0000 (23:26 +0000)]
Merge "Add keystore onUserAdded/Removed methods"
Chad Brubaker [Tue, 12 May 2015 20:00:02 +0000 (13:00 -0700)]
Add keystore onUserAdded/Removed methods
Change-Id: I73fe9344ec5660e58425d5c85d14381820533d57
Olawale Ogunwale [Tue, 12 May 2015 16:48:27 +0000 (16:48 +0000)]
Merge "Don't apply animation clip to dialog activities"