OSDN Git Service
Elliott Hughes [Sat, 11 Jul 2015 00:40:47 +0000 (00:40 +0000)]
Merge "frameworks/base: libexpat now exports its headers."
Elliott Hughes [Fri, 10 Jul 2015 18:12:22 +0000 (11:12 -0700)]
frameworks/base: libexpat now exports its headers.
Change-Id: Iaba3d57db18ebdd89e4a993436e9bf844722ff87
Narayan Kamath [Thu, 9 Jul 2015 17:22:13 +0000 (17:22 +0000)]
Merge "Remove @ToBeFixed from knowntags."
Narayan Kamath [Thu, 9 Jul 2015 16:54:45 +0000 (17:54 +0100)]
Remove @ToBeFixed from knowntags.
It's used nowhere and will be deleted shortly.
Change-Id: Ie87f16cd060445c0e0ccac4e9a192ca266c92851
Neil Fuller [Thu, 9 Jul 2015 11:11:08 +0000 (11:11 +0000)]
Merge "Switch LocalSocketImpl.accept() over to using Os.accept()"
Neil Fuller [Wed, 8 Jul 2015 10:33:54 +0000 (11:33 +0100)]
Switch LocalSocketImpl.accept() over to using Os.accept()
Bug:
3106438
Change-Id: I3b4a07cc2283c3cfdbaf3d2460f37264f67690e3
Neil Fuller [Thu, 9 Jul 2015 09:44:27 +0000 (09:44 +0000)]
Merge "Switch from InetUnixAddress to UnixSocketAddress"
Elliott Hughes [Wed, 8 Jul 2015 18:12:21 +0000 (18:12 +0000)]
Merge "Android always has <malloc.h>."
Neil Fuller [Wed, 8 Jul 2015 10:18:13 +0000 (10:18 +0000)]
Merge "Move listen() over to using android.system.Os"
Elliott Hughes [Wed, 8 Jul 2015 02:19:34 +0000 (19:19 -0700)]
Android always has <malloc.h>.
Change-Id: I9e18daeec26380c439f823e6a55ee61773c1b680
Neil Fuller [Tue, 7 Jul 2015 16:11:47 +0000 (16:11 +0000)]
Merge "Reimplement LocalSocket methods using android.system.Os"
Neil Fuller [Tue, 7 Jul 2015 15:58:00 +0000 (16:58 +0100)]
Switch from InetUnixAddress to UnixSocketAddress
UnixSocketAddress is replacing InetUnixAddress.
Bug:
3106438
Change-Id: I7c03fa357adfb3221908294fd254c8faae91fd1b
Elliott Hughes [Tue, 7 Jul 2015 06:00:55 +0000 (06:00 +0000)]
Merge "Fix "Bluetooh" logging typo."
Elliott Hughes [Tue, 7 Jul 2015 05:10:36 +0000 (22:10 -0700)]
Fix "Bluetooh" logging typo.
Change-Id: I2b9aea64f1b53e100ead6e71835bf5935b410eb9
Mike Lockwood [Mon, 6 Jul 2015 17:10:31 +0000 (17:10 +0000)]
Merge "Miss USB device Interface from UsbManager.getDeviceList()."
wang.zhenyu [Sat, 4 Jul 2015 09:00:16 +0000 (17:00 +0800)]
Miss USB device Interface from UsbManager.getDeviceList().
In the scenario that you connect more than one device to android phone with an usb hub,
when you attach the second device,mNewConfigurationis is still corresponded to the first
device unless another mNewConfiguration is created by a new operation.
However,before another mNewConfiguration is created,setInterfaces() in addUsbConfiguration()
has already been executed. Problem is that mNewInterfaces has already been cleared when
it finished endUsbDeviceAdded for the first device. As a result,the UsbInterface descriptor
in the first device's Configuration descriptor is set to null.
Change-Id: I0ba4f07c809d07ebebed633e43c3ee8e2e4c5060
Neil Fuller [Fri, 3 Jul 2015 16:58:00 +0000 (17:58 +0100)]
Move listen() over to using android.system.Os
Bug:
3106438
Change-Id: I9b4d1d58d84a28828555ae863e86530995191f2c
Neil Fuller [Fri, 3 Jul 2015 14:06:23 +0000 (15:06 +0100)]
Reimplement LocalSocket methods using android.system.Os
InputStream.available()
OutputStream.flush()
Bug:
3106438
Change-Id: I3a9425c323229e27bb72f6232dd13f7579586840
Neil Fuller [Fri, 3 Jul 2015 14:07:33 +0000 (14:07 +0000)]
Merge "Switch to using android.system.Os for more calls"
Neil Fuller [Fri, 3 Jul 2015 09:59:17 +0000 (10:59 +0100)]
Switch to using android.system.Os for more calls
The methods being switched here should involve no important
semantic changes. socket.getSoTimeout() is now implemented:
previously it would have returned 0 in all cases.
Some tidy up of unimplemented / commented code.
Switching other calls to use Os would carry more risk and
will be handled separately they can be switched safely.
Bug:
3106438
Change-Id: I5526249395565fee6e43f159a2b5975b0d41d058
Narayan Kamath [Thu, 2 Jul 2015 11:18:18 +0000 (11:18 +0000)]
Merge "Delete unused testing scripts and WithFramework."
Narayan Kamath [Thu, 25 Jun 2015 13:22:00 +0000 (14:22 +0100)]
Delete unused testing scripts and WithFramework.
These scripts haven't worked in a long time now. run_core_test
uses VM options that aren't supported and WithFramework (which is
unmaintained) and run_junit.sh refers to an APK that doesn't
exist anymore.
If anyone wishes to run these tests individually, they can just
use vogar instead :
$ make vogar vogar.jar
$ vogar --mode=activity frameworks/base/tests/CoreTests/android/core/Sha1Test.java
This also allows us to delete the WithFramework class, which was
only referenced by these obsolete scripts.
bug:
22078684
Change-Id: I481f6721d51d50456421a1526c370b93aec9b351
Narayan Kamath [Wed, 1 Jul 2015 13:32:04 +0000 (13:32 +0000)]
Merge "Remove memory leak in PersistentDataBlockService jni"
Henrik Baard [Tue, 23 Jun 2015 07:36:36 +0000 (09:36 +0200)]
Remove memory leak in PersistentDataBlockService jni
When calling the methods
com_android_server_PersistentDataBlockService_getBlockDeviceSize()
com_android_server_PersistentDataBlockService_wipe()
memory is leaked because string created by
GetStringUTFChars() is not released.
Use ScopedUtfChars instead to ensure that memory is released.
Change-Id: I880a6d66a4824778b411b858774b8ffa009c1e17
Miao Wang [Wed, 1 Jul 2015 05:53:41 +0000 (05:53 +0000)]
Merge "[RenderScript] update the type of offsets for BLAS.BNNM"
Miao Wang [Tue, 30 Jun 2015 00:43:03 +0000 (17:43 -0700)]
[RenderScript] update the type of offsets for BLAS.BNNM
bug:
22184114
Change-Id: I7e7132aa3563f32de32640567b381f8f5bddf491
(cherry picked from commit
6099ee6e081904e73e0fad331e326b0607b6b1dc)
John Hoford [Tue, 30 Jun 2015 22:34:43 +0000 (22:34 +0000)]
Merge "add comment about xor not being porter/duff Bug:
21934855"
John Hoford [Tue, 30 Jun 2015 01:15:22 +0000 (18:15 -0700)]
add comment about xor not being porter/duff
Bug:
21934855
Change-Id: I99394bd8a7a40a220c05118564b532f2533da38a
Stephen Hines [Tue, 30 Jun 2015 01:11:14 +0000 (01:11 +0000)]
Merge "Replace parentheses with curly braces to fix vector doc bug."
Stephen Hines [Tue, 30 Jun 2015 01:04:37 +0000 (18:04 -0700)]
Replace parentheses with curly braces to fix vector doc bug.
https://code.google.com/p/android/issues/detail?id=178299
Change-Id: I3ae31d48a39e8db9976fdedde560e870b23e2c83
Yang Ni [Mon, 29 Jun 2015 22:39:49 +0000 (22:39 +0000)]
Merge "Add Java doc comments on script group name reuse"
Yang Ni [Thu, 25 Jun 2015 00:06:10 +0000 (17:06 -0700)]
Add Java doc comments on script group name reuse
b/
21999787
Change-Id: Id9a7bad4ce91f3afdd82a1288cf94430f3aef9bb
(cherry picked from commit
dbb6fd58a4b113f8761ce825ad5b91e50c170971)
Yusuke Sato [Mon, 29 Jun 2015 17:49:28 +0000 (17:49 +0000)]
Merge "Rename ZipEntryName to ZipString"
Wale Ogunwale [Mon, 29 Jun 2015 15:09:29 +0000 (15:09 +0000)]
Merge "Use the correct lock to protect members in PolicyControl"
tiger_huang [Mon, 29 Jun 2015 09:17:30 +0000 (17:17 +0800)]
Use the correct lock to protect members in PolicyControl
Members in PolicyControl can be accessed by multiple threads via the
public functions called by PhoneWindowManager. Most of the functions
are called with the window-manager-lock held, but reloadFromSetting()
is an exception.
In this patch, we acquire the window-manager-lock before calling
reloadFromSetting() to ensure accessing the members with the same
lock held.
Change-Id: I54ac5cab2a2d74c568fa96145f7a6741c6d99e36
Yusuke Sato [Thu, 25 Jun 2015 21:58:16 +0000 (14:58 -0700)]
Rename ZipEntryName to ZipString
Also add a 4th parameter to StartIteration(). This is for
https://android-review.googlesource.com/#/c/156771/.
Bug:
21957428
Change-Id: Ifbf9aec2f04b214b57e99c306282d7c0d39675a9
Tenghui Zhu [Thu, 25 Jun 2015 21:07:12 +0000 (21:07 +0000)]
Merge "Limit dotProduct value to 1.0f, so acosf would not return NaN."
Lazar Trsic [Tue, 23 Jun 2015 09:46:49 +0000 (11:46 +0200)]
Limit dotProduct value to 1.0f, so acosf would not return NaN.
Due to precision loss of float math, we sometimes get 1.
000001f for
dotProduct. This causes NaN result from acosf() and floor() funcs.
At the moment, this does not cause any problems on ARM, as casting
NaN to int results in 0. On mips however (possibly on x86), such cast
gives INT_MAX, so crash occurs when trying to use the resulting value.
Change-Id: I8e0285a0306a65b8469d9f4885c19665066fc4c8
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