OSDN Git Service
Narayan Kamath [Thu, 25 Jun 2015 08:33:49 +0000 (08:33 +0000)]
Merge "Fix filedescriptor leakage in MediaMetadataRetriever"
harvey_tsai [Thu, 11 Jun 2015 03:51:36 +0000 (11:51 +0800)]
Fix filedescriptor leakage in MediaMetadataRetriever
setDataSource(String) throws an IllegalArgumentException
when an IOException or FileNotFoundException occurs, but doesn't
close FileDescriptor accordingly.
Change-Id: Ib6e0f1418afeeb19e03abd4bedb4cc845a58b6b4
Narayan Kamath [Thu, 25 Jun 2015 08:27:47 +0000 (08:27 +0000)]
Merge "Fixed Javadoc typos"
Philipp Hasper [Tue, 12 May 2015 07:09:25 +0000 (09:09 +0200)]
Fixed Javadoc typos
Simple single character typos
Change-Id: I17660dbb3b7ee6597637e8d76770f434ebf202ea
Andreas Gampe [Thu, 25 Jun 2015 03:44:43 +0000 (03:44 +0000)]
Merge "Frameworks/base: Add tracing system properties"
Andreas Gampe [Tue, 23 Jun 2015 04:09:36 +0000 (21:09 -0700)]
Frameworks/base: Add tracing system properties
Add system properties to support zygote-started method tracing.
These are needed as the limit on system properties does not allow
the reuse of the runtime extra options system property.
Bug:
21760614
(cherry picked from commit
98f406f6f31660d0f5ee32113ffadc720b426dc6)
Change-Id: I3785cc5715acadbee81ef7b45081ed780f1351d3
Alan Viverette [Wed, 24 Jun 2015 22:47:01 +0000 (22:47 +0000)]
Merge "Duplicate description on AccessibilityEvent"
Mathieu Chartier [Wed, 24 Jun 2015 20:55:38 +0000 (20:55 +0000)]
Merge "Add an AM option to start with allocation tracking"
Man Cao [Fri, 12 Jun 2015 03:14:34 +0000 (20:14 -0700)]
Add an AM option to start with allocation tracking
The new option "--track-allocation" is to work with the new
allocation tracker in ART.
Bug:
20037135
Change-Id: Ic5f8945ab4c1f167c27b05ad0d11d04bac680c1f
Hiroshi Yamauchi [Wed, 24 Jun 2015 18:13:00 +0000 (18:13 +0000)]
Merge "Clarify art.gc.gc-count-rate-histogram runtime stat."
Hiroshi Yamauchi [Thu, 28 May 2015 22:28:16 +0000 (15:28 -0700)]
Clarify art.gc.gc-count-rate-histogram runtime stat.
(cherry pick commit
2d6327d0adaf6ca3d13e1e082f55680cfefcc449)
Bug:
21491908
Change-Id: I84d93aa73eebc327513c4663a6b606e2dad9a0b7
Wale Ogunwale [Tue, 23 Jun 2015 17:03:51 +0000 (17:03 +0000)]
Merge "Fix javadoc for Adapter.getViewTypeCount()"
Minhyeok Jeong [Sat, 20 Jun 2015 19:51:22 +0000 (04:51 +0900)]
Fix javadoc for Adapter.getViewTypeCount()
Remove duplicate words.
Change-Id: Iaeeb8f74313d2ca88c28e4b3672316367b16ca2d
Wale Ogunwale [Fri, 19 Jun 2015 20:34:47 +0000 (20:34 +0000)]
Merge "Apply the scale to surfaceinsets when computing crop region"
Nick Kralevich [Fri, 19 Jun 2015 19:34:28 +0000 (19:34 +0000)]
Merge "overlaytests: fix testrunner.py md5sum invocation"
Stephen Smalley [Fri, 19 Jun 2015 18:37:58 +0000 (14:37 -0400)]
overlaytests: fix testrunner.py md5sum invocation
The overlaytests testrunner.py script wants to invoke adb shell md5sum
to compute the md5 of a file, but wrongly invokes it as md5. Maybe
it used to have that name, but it doesn't exist under that name in master.
Fix it.
Change-Id: I3ec4be162fab0cd3915f010f9b1add37b5397973
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
seunghyun85.lee [Thu, 26 Feb 2015 02:24:08 +0000 (11:24 +0900)]
Apply the scale to surfaceinsets when computing crop region
While in computing surface crop region, magnification specs are
not applied to surface insets from LayoutParams.
So, in case magnification specs are set,
surface crop region should be calculated considering scale factor.
(For instance, using TouchZoom in Accessibility
at AppsPermissionActivity in market app)
Bug:
20863078
Change-Id: I9e7e21e502b29208f2856918d6fcda050f515595
Signed-off-by: Seunghyun Lee <seunghyun85.lee@lge.com>
Wale Ogunwale [Thu, 18 Jun 2015 14:38:20 +0000 (14:38 +0000)]
Merge "[ActivityManager] Fix index OOB when updating visible."
Narayan Kamath [Wed, 17 Jun 2015 13:15:03 +0000 (13:15 +0000)]
Merge "Delete android.speech.srec.*"
Narayan Kamath [Tue, 16 Jun 2015 18:39:18 +0000 (19:39 +0100)]
Delete android.speech.srec.*
This code had an undeclared dependency on libsrec_jni which
we no longer build.
bug:
21855957
(cherry picked from commit
b39dfe87b89e3773910202f2e94b9860236551d9)
Change-Id: I6c97f22916766714ae899cf51f1b56cde308af8e
Narayan Kamath [Wed, 17 Jun 2015 13:13:25 +0000 (13:13 +0000)]
Merge "ZipFileRO: Use precise widths for zip file types."
Narayan Kamath [Tue, 16 Jun 2015 11:02:57 +0000 (12:02 +0100)]
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
4600dd053dbdbd4b95f3b11057a1cc55b99f9c77)
Change-Id: I7886cb37a229cc27c625699c80e6a6a6117d2203
Vladimir Marko [Wed, 17 Jun 2015 09:04:33 +0000 (09:04 +0000)]
Merge "Don't prevent notification updates in DOS protection."
Dan Albert [Tue, 16 Jun 2015 21:11:09 +0000 (21:11 +0000)]
Merge "Use new sanitizer option."
Dan Albert [Tue, 16 Jun 2015 21:06:49 +0000 (14:06 -0700)]
Use new sanitizer option.
Change-Id: Iabc46da2820f252f6cd8cef8a447064890f3a76d
Mark Salyzyn [Tue, 16 Jun 2015 14:08:39 +0000 (14:08 +0000)]
Merge "jni: isLoggable calls __android_log_is_loggable"
Mark Salyzyn [Fri, 24 Apr 2015 22:55:40 +0000 (15:55 -0700)]
jni: isLoggable calls __android_log_is_loggable
Will inherit additional functionality and cache improvements
Bug:
17760225
Change-Id: Iab1816d37cc74343d83629d851a5784d4865ebb4
Dmitriy Ivanov [Sat, 13 Jun 2015 00:43:56 +0000 (00:43 +0000)]
Merge "Add path to native libraries inside apk"
Chris Tate [Fri, 12 Jun 2015 19:52:44 +0000 (19:52 +0000)]
Merge "Fix overflow/underflow problem in comparison"
Dmitriy Ivanov [Sat, 6 Jun 2015 05:00:13 +0000 (22:00 -0700)]
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)
Andre Eisenbach [Wed, 10 Jun 2015 20:19:20 +0000 (20:19 +0000)]
Merge "Bluetooth native dumpsys logging support (3/5)"
Andre Eisenbach [Fri, 5 Dec 2014 17:31:30 +0000 (09:31 -0800)]
Bluetooth native dumpsys logging support (3/5)
Bug:
18508263
Change-Id: I88f9c90dab8b0c825010c8617709449a3dd704b2
Tao Bao [Wed, 10 Jun 2015 00:43:58 +0000 (00:43 +0000)]
Merge "Improve the reboot-to-recovery dialogs"
Tao Bao [Wed, 10 Jun 2015 00:43:46 +0000 (00:43 +0000)]
Merge "Wait for uncrypt to finish before rebooting"
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
Tao Bao [Wed, 3 Jun 2015 18:42:31 +0000 (11:42 -0700)]
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
Tao Bao [Thu, 21 May 2015 23:25:19 +0000 (16:25 -0700)]
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
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: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: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: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 [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:17:09 +0000 (12:17 +0000)]
Merge "Input command can fail (with exceptions) if the touchscreen id is not 0"
riddle_hsu [Fri, 5 Jun 2015 08:38:38 +0000 (16:38 +0800)]
[ActivityManager] Fix index OOB when updating visible.
If there is an Activity Z of Task T needs be visible but
isn't running, and the process P of Z is existed, it will
just to schedule launch Z.
The problem will happen when P is died (e.g. kill itself)
right before scheduleLaunchActivity. Once RemoteException
is caught, startSpecificActivityLocked will try to restart
the process and run cleanup procedure because the process
record is existed (death recipient of P has not entered AMS
yet). And assume task T contains X, Y, Z. X and Y have
declared stateNotNeeded=true, so X and Y will be removed
from task T.
Now the size of task T changes from 3 to 1. And because
activityNdx=2 when updating Z, the next round (--activityNdx)
will have exception at activities.get(activityNdx):
IndexOutOfBoundsException: Invalid index 1, size is 1
The ActivityRecord in TaskRecord is removed by below flow:
ActivityStack.ensureActivitiesVisibleLocked
ActivityStackSupervisor.startSpecificActivityLocked
ActivityStackSupervisor.realStartActivityLocked
ApplicationThreadProxy.scheduleLaunchActivity -> IPC fail
ActivityManagerService.startProcessLocked
ActivityManagerService.handleAppDiedLocked
ActivityStackSupervisor.handleAppDiedLocked
ActivityStack.handleAppDiedLocked
ActivityStack.removeHistoryRecordsForAppLocked
ActivityStack.removeActivityFromHistoryLocked
task.removeActivity(r) -> mActivities.remove(r)
There is also similar patch to solve the same problem:
https://android-review.googlesource.com/143780/
Change-Id: Iac646bcb8ed3d3cfb2bda14e05e11abfcfe980d1
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 [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
Charles Tsai [Wed, 20 May 2015 10:16:48 +0000 (18:16 +0800)]
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
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:00:12 +0000 (15:00 +0000)]
Merge "Should reset mDismissKeyguard on keyguard secure change"
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:01:44 +0000 (12:01 +0000)]
Merge "Fix javadocs based on recent case consistency change"
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: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 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: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 [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:30:45 +0000 (09:30 +0000)]
Merge "Pass charset to XmlPullParser.setInput instead of null"
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: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: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
Vladimir Marko [Wed, 11 Sep 2013 10:13:55 +0000 (11:13 +0100)]
Don't prevent notification updates in DOS protection.
The NotificationManagerService limits the number of
notifications per package+user to 50. Once that limit is
reached, it will refuse new notifications. However, it was
also erroneously refusing updates to existing notifications.
Bug:
5821364
Change-Id: I3aa4be9ad4b288e4a22bf7a64f67521695dfb579
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."