OSDN Git Service
Neil Fuller [Tue, 9 Aug 2016 16:16:54 +0000 (16:16 +0000)]
Merge "Tidy up MockWebServer usage"
am:
294ab080f4
Change-Id: Ia22ce1e949ba3b611c0f2be60b3dbbafef7e4bb6
Neil Fuller [Tue, 9 Aug 2016 16:05:38 +0000 (16:05 +0000)]
Merge "Tidy up MockWebServer usage"
Neil Fuller [Tue, 9 Aug 2016 10:49:58 +0000 (10:49 +0000)]
Merge "Add a finalize() method to StrictJarFile"
am:
d0c0c8dcab
Change-Id: Iccab49c98b105aff6105e21274fbc099d10ecb55
Neil Fuller [Tue, 9 Aug 2016 10:43:18 +0000 (10:43 +0000)]
Merge "Add a finalize() method to StrictJarFile"
Tobias Thierer [Tue, 9 Aug 2016 09:02:27 +0000 (09:02 +0000)]
Merge "Ensure apps cannot prevent uncaught exceptions being logged."
am:
f61a449ee9
Change-Id: I826c175547a73123cd438ebe6991efee39a433d0
Tobias Thierer [Tue, 9 Aug 2016 08:55:34 +0000 (08:55 +0000)]
Merge "Ensure apps cannot prevent uncaught exceptions being logged."
joonyoung.cho [Mon, 8 Aug 2016 21:53:34 +0000 (21:53 +0000)]
Merge "fix safeMode status in AppWidgetService"
am:
78a72f0698
Change-Id: I21559690f6371102cf48132d8930343923d60011
Treehugger Robot [Mon, 8 Aug 2016 21:36:45 +0000 (21:36 +0000)]
Merge "fix safeMode status in AppWidgetService"
Tobias Thierer [Thu, 21 Jul 2016 14:05:19 +0000 (15:05 +0100)]
Ensure apps cannot prevent uncaught exceptions being logged.
Let RuntimeInit use an UncaughtExceptionPreHandler to log an exception
rather than relying on UncaughtHandler, which apps can replace. This
makes it easier to diagnose application death, especially during app
compatibility testing for a new version of Android.
Test: Verified manually, with the help of a small sample app (not
checked in), that stacktraces for RuntimeExceptions thrown on main
or background threads are logged even when the app set a default
UncaughtExceptionHandler that swallows the exception with no action.
Note that such an inappropriate UncaughtExceptionHandler will still
cause threads to die without the app being killed, which it should be.
In an exception then happens on the main thread, the app will freeze
until the ANR dialog kicks in after a few seconds. I have manually
verified that this behavior is unchanged from before this CL.
No new integration tests are included because the default system
behavior has not changed.
Bug:
29624607
Change-Id: Ie87377b0bcadc3ba4083a8ab1bedb8f3dd95a4bd
TreeHugger Robot [Fri, 5 Aug 2016 19:22:40 +0000 (19:22 +0000)]
Merge "select_logpersist_title char limit" into stage-aosp-master
Keith Mok [Fri, 5 Aug 2016 18:37:14 +0000 (18:37 +0000)]
Merge "Fix random crash in libhwui"
am:
3f67a1855e
Change-Id: I8dfcad3d00b2cca955457142b963934143ec2cbd
Treehugger Robot [Fri, 5 Aug 2016 18:23:14 +0000 (18:23 +0000)]
Merge "Fix random crash in libhwui"
Mark Salyzyn [Fri, 5 Aug 2016 16:28:21 +0000 (09:28 -0700)]
select_logpersist_title char limit
(cherry pick from commit
0e86d328d67658d49cb3153356e92092c873927f)
increase select_logpersist_title character limit to 60
increase select_logpersist_titles character limit to 26
Bug:
29313564
Change-Id: I15f000bf155f33a7d4a1cc6c5434552f43803f58
Tobias Thierer [Fri, 5 Aug 2016 12:44:48 +0000 (12:44 +0000)]
Merge "APIs for ProcessBuilder.Redirect"
am:
e49469aed1
Change-Id: I6c479a84044cfd8df084a3c9707f7aaaf09546fa
Tobias Thierer [Thu, 4 Aug 2016 18:04:46 +0000 (19:04 +0100)]
Update api/test-current.txt for ProcessBuilder API
Test: make update-api docs
Bug:
27464570
Change-Id: Iee1fec0efb241ba091494467ab3632675c1d07d4
Tobias Thierer [Fri, 5 Aug 2016 12:36:35 +0000 (12:36 +0000)]
Merge "APIs for ProcessBuilder.Redirect"
Przemyslaw Szczepaniak [Fri, 5 Aug 2016 10:25:23 +0000 (10:25 +0000)]
Merge "Track libcore change
4e73fd2bc22e704fe71465782b83be0471ac5e82" into stage-aosp-master
Przemyslaw Szczepaniak [Fri, 5 Aug 2016 09:44:55 +0000 (09:44 +0000)]
Merge "Track libcore change
0e393b4d628541e84e31210342f4103315c07e23"
am:
50f3429d14
Change-Id: I2fdd89afd9cfc0cc36be2664dee559e7b0977c6d
Przemyslaw Szczepaniak [Fri, 5 Aug 2016 09:36:41 +0000 (09:36 +0000)]
Przemyslaw Szczepaniak [Thu, 4 Aug 2016 15:49:27 +0000 (16:49 +0100)]
Track libcore change
4e73fd2bc22e704fe71465782b83be0471ac5e82
Version with test-current.txt
Bug:
28666126
Change-Id: I3677508ff00c381c88fe9c767ec7037493b574f8
Hans Boehm [Fri, 5 Aug 2016 02:05:57 +0000 (02:05 +0000)]
Merge "Update SMP documentation."
am:
497ac5eccb
Change-Id: I06d06e205a8bf7646500fa6c8d86eb7cfa49e6ce
Hans Boehm [Fri, 5 Aug 2016 01:59:38 +0000 (01:59 +0000)]
Merge "Update SMP documentation."
Hans Boehm [Mon, 14 Sep 2015 20:50:00 +0000 (13:50 -0700)]
Update SMP documentation.
The old version was seriously obsolete, primarily in that it ignored
C11 and C++11 atomics and the programming model underlying them. As
a result it paid way too much attention to hardware characteristics,
which 0.001% of application programmers should really be aware of.
And some of those hardware descriptions were also obsolete.
This is a fairly complete rewrite.
Bug:
18523857
Change-Id: Icc14a390f74486193486c2ba07a86b05611e7d3c
Jakub Pawlowski [Thu, 4 Aug 2016 20:46:32 +0000 (20:46 +0000)]
Merge "Fix bad index usage"
am:
5cfe8a8315
Change-Id: I36807979de4f0f74f9dd3ef6f3b2a60e83346b0f
Andre Eisenbach [Thu, 4 Aug 2016 20:20:02 +0000 (20:20 +0000)]
Merge "Fix bad index usage"
Jakub Pawlowski [Thu, 4 Aug 2016 20:16:32 +0000 (13:16 -0700)]
Fix bad index usage
Bug:
27999121
Change-Id: Ie2ba6f71bbf6f789a3c1016ba2f0051b809ac87e
Chih-Hung Hsieh [Thu, 4 Aug 2016 17:19:10 +0000 (17:19 +0000)]
Merge "Enable clang for arm64."
am:
a11a8e5086
Change-Id: If6069ad099ec5068b9b77f1ea84b85ff4a20438d
Chih-hung Hsieh [Thu, 4 Aug 2016 17:13:53 +0000 (17:13 +0000)]
Merge "Enable clang for arm64."
Chih-Hung Hsieh [Wed, 3 Aug 2016 17:56:33 +0000 (10:56 -0700)]
Enable clang for arm64.
emutls should work now with latest prebuilt clang/llvm.
BUG:
25642296
Test: build and boot up on arm64 emulator.
Change-Id: I5c8dd36a1575436e5fd56e91f7c285f2b3e6546f
(cherry picked from commit
8ffb6b76f7a72e14882e09f882494e5f7d5fc45d)
Przemyslaw Szczepaniak [Thu, 4 Aug 2016 11:54:39 +0000 (12:54 +0100)]
Missing test-current.txt for libcore change
ea47d5d712edcaef726a3e12065729be21699afe
Change-Id: I691a53f92bc1cfe0a9c6d5ad9d7d3d259ce0aabb
Test: make -j 32 update-api
Bug:
30402085
Tobias Thierer [Thu, 4 Aug 2016 11:00:03 +0000 (11:00 +0000)]
Merge "Add API for setsockoptInt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, value)"
am:
f1d119ccd3
Change-Id: I90e74c457475f16edd20369bb8c024896c9e241c
Tobias Thierer [Thu, 4 Aug 2016 10:51:13 +0000 (10:51 +0000)]
Merge "Add API for setsockoptInt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, value)"
Mudumba Ananth [Thu, 4 Aug 2016 01:32:41 +0000 (01:32 +0000)]
Merge "HFP 1.7 profile update (3/4)"
am:
f28f6bb2b0
Change-Id: I0211cecf91f324d24b7b5524344812f7d6b6602a
Andre Eisenbach [Thu, 4 Aug 2016 01:06:46 +0000 (01:06 +0000)]
Merge "HFP 1.7 profile update (3/4)"
Mudumba Ananth [Mon, 29 Feb 2016 10:14:36 +0000 (02:14 -0800)]
HFP 1.7 profile update (3/4)
-> Android Framework changes to add support for
an API to send indicator change in AG.
-> Added a system intent for broadcasting assigned number(ID)
of the supported HF indicators and their values (if received)
Bug:
19983867
Change-Id: If26a7ae5da5686da72ebca9ec3decfe086e2ffb6
(cherry picked from commit
0d98ebf997b24e96d0328b4195a22832f9ae2664)
Jakub Pawlowski [Thu, 4 Aug 2016 00:01:25 +0000 (00:01 +0000)]
Merge "Remove write type from GATT descriptor writes (1/4)"
am:
b7eb1d7eaf
Change-Id: Ibe16bab7ec21d19d6f3cfd5cb65768b06a5ca829
Treehugger Robot [Wed, 3 Aug 2016 23:54:35 +0000 (23:54 +0000)]
Merge "Remove write type from GATT descriptor writes (1/4)"
Jakub Pawlowski [Thu, 31 Mar 2016 05:58:17 +0000 (22:58 -0700)]
Remove write type from GATT descriptor writes (1/4)
According to the Bluetooth Core specification v4.2, Vol 3, Part G,
section 4.12.3: "The Attribute Protocol WRITE REQUEST is used
for this sub-procedure".
Change-Id: I141dd24ed5911d5d485b52a1b661835b9960921a
Tobias Thierer [Wed, 3 Aug 2016 16:19:27 +0000 (17:19 +0100)]
Add API for setsockoptInt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, value)
Test: "make" succeeds.
Bug:
30402085
Change-Id: I4bc4b5dcfab04ac756578c2fae7a337e74587b66
Tobias Thierer [Wed, 3 Aug 2016 13:01:05 +0000 (13:01 +0000)]
Merge "Stop profiling on uncaught exception."
am:
258a554f62
Change-Id: Ia62b8fea4337eb2742b315f1682d5830d068fc77
Jakub Pawlowski [Wed, 3 Aug 2016 12:59:24 +0000 (12:59 +0000)]
Merge "GATT Server refactoring (2/4)"
am:
d13954e8c6
Change-Id: I10383d95f79409282d96ae60b294c72754df5641
Tobias Thierer [Wed, 3 Aug 2016 10:42:37 +0000 (10:42 +0000)]
Merge "Stop profiling on uncaught exception."
Jakub Pawlowski [Wed, 3 Aug 2016 10:21:43 +0000 (10:21 +0000)]
Merge "GATT Server refactoring (2/4)"
songjinshi [Wed, 3 Aug 2016 10:03:59 +0000 (10:03 +0000)]
Merge "Fixes the system server crash issue caused by uncatched exception."
am:
b68106cf2a
Change-Id: Ia28f7bdad020dbb3695934cae1f193037de41fcb
Ganesh Mahendran [Wed, 3 Aug 2016 10:03:53 +0000 (10:03 +0000)]
Merge "remove x attribute of java file"
am:
554284edf3
Change-Id: I05553fd2ecc175858e0923e68e62305149e8dd3e
Tobias Thierer [Wed, 3 Aug 2016 09:54:53 +0000 (09:54 +0000)]
Merge "Fixes the system server crash issue caused by uncatched exception."
Tobias Thierer [Wed, 3 Aug 2016 09:54:23 +0000 (09:54 +0000)]
Merge "remove x attribute of java file"
John Stultz [Wed, 3 Aug 2016 00:12:32 +0000 (00:12 +0000)]
Merge "Zygote: Add CAP_WAKE_ALARM to system_server to properly support timerfd alarms"
am:
1085be0ce3
Change-Id: I23d7c2af33db8621b0c3b3415669543e0e3b740f
Treehugger Robot [Wed, 3 Aug 2016 00:04:19 +0000 (00:04 +0000)]
Merge "Zygote: Add CAP_WAKE_ALARM to system_server to properly support timerfd alarms"
Jakub Pawlowski [Fri, 1 Apr 2016 14:51:45 +0000 (07:51 -0700)]
GATT Server refactoring (2/4)
Bug:
27999121
Change-Id: Ia5f91298a4b01b62adebc8adc30f27f757259588
Ganesh Mahendran [Tue, 28 Jun 2016 07:59:45 +0000 (15:59 +0800)]
remove x attribute of java file
java file do not need x attribute, so this patch
removes it.
Change-Id: I807722ac3f40688f032228294d61a4266d0e9e60
Signed-off-by: Ganesh Mahendran <opensource.ganesh@gmail.com>
Tobias Thierer [Tue, 2 Aug 2016 16:32:26 +0000 (17:32 +0100)]
Stop profiling on uncaught exception.
When "handling" an uncaught exception, make an attempt to stop
profiling. In case profiling was active, this will avoid losing
the profiling buffer.
This change is required as a base in order for
https://android-review.googlesource.com/#/c/249721/
to merge cleanly.
(Cherry picked from commit
4c79fea9efea7cfa739cf5b5f525ddadb28e52a6)
Bug:
26291225
Change-Id: I35f352e5f28eafe4702da9eae587c3b65c360b3a
Przemyslaw Szczepaniak [Tue, 12 Jul 2016 09:54:46 +0000 (10:54 +0100)]
Track libcore change
0e393b4d628541e84e31210342f4103315c07e23
Bug:
28666126
Change-Id: Ib63e14c5c72fd3a13f09a90358cb137e318a3653
songjinshi [Wed, 27 Jul 2016 12:36:46 +0000 (20:36 +0800)]
Fixes the system server crash issue caused by uncatched exception.
The restat method of the StatFs may throw an IllegalArgumentException,
so we must to catch it and throw an IOException for the caller
of the trimToFit(),this fix can improve system stability.
https://code.google.com/p/android/issues/detail?id=218359
Change-Id: I54a2f569eea67d3ab628944e3586ca918ec70283
Signed-off-by: songjinshi <songjinshi@xiaomi.com>
Dan Willemsen [Mon, 1 Aug 2016 23:34:29 +0000 (23:34 +0000)]
Merge "Rename libprotobuf-cpp-lite_static to libprotobuf-cpp-lite" into stage-aosp-master
Dimitry Ivanov [Mon, 1 Aug 2016 22:46:55 +0000 (22:46 +0000)]
Merge "libsigchain: intercept bsd_signal on lp32"
am:
6eb30f2060
Change-Id: Iee2b7a8db495dd76bb6468a03e6cffd29a998cdf
Treehugger Robot [Mon, 1 Aug 2016 22:39:15 +0000 (22:39 +0000)]
Merge "libsigchain: intercept bsd_signal on lp32"
Dimitry Ivanov [Mon, 1 Aug 2016 21:12:38 +0000 (14:12 -0700)]
libsigchain: intercept bsd_signal on lp32
bsd_signal is a deprecated synonym for the signal. Nevertheless
there are apps and libraries calling this function.
libsigchain needs to intercept these calls and handle them the same
way it handles signal() call.
Bug: http://b/
30562229
Test: readelf --dyn-sym app_process32 and check that bsd_signal is exported
readelf --dyn-sym app_process64 and check that bsd_signal is not exported
Change-Id: Iec584070b42bc7fa43b114c0f884aff2db5a6858
Hidehiko Tsuchiya [Mon, 1 Aug 2016 17:43:30 +0000 (17:43 +0000)]
Merge \"Fix the API compatibility of \"UriMatcher#addURI\"\"
am:
3e151273a3
Change-Id: Ic06ade3ce6dd795e7d12cfba150286933512433d
Fyodor Kupolov [Mon, 1 Aug 2016 17:34:32 +0000 (17:34 +0000)]
Merge "Fix the API compatibility of "UriMatcher#addURI""
Dan Willemsen [Mon, 1 Aug 2016 05:48:28 +0000 (22:48 -0700)]
Rename libprotobuf-cpp-lite_static to libprotobuf-cpp-lite
Use the same name for the static and shared libraries so that the module
definitions can be shared.
Change-Id: I1578ee7044689194ae1baea4d71f1b0e8737505f
Hidehiko Tsuchiya [Tue, 25 Mar 2014 09:27:27 +0000 (18:27 +0900)]
Fix the API compatibility of "UriMatcher#addURI"
The previous patch (
ef23bf19 Allow leading slash in path...) made
a single slash path unmatchable.
To solve it, this patch stops removing a slash character if the path
only has a slash character.
Now, a single slash is a matchable path for a URI without path string.
Bug:
29524484
Change-Id: I90b357aa48be1a3e0cf36e75ed2a9d6532908972
Neil Fuller [Thu, 3 Dec 2015 17:31:18 +0000 (17:31 +0000)]
Add a finalize() method to StrictJarFile
Bug:
25896372
Test: Booted device, installed CTS apps
Test: run cts --class android.util.cts.StrictJarFileTest
Change-Id: I35e238dadd48d2c4ca53ac37a4c5aacdd471a93a
John Stultz [Thu, 28 Jul 2016 19:35:31 +0000 (12:35 -0700)]
Zygote: Add CAP_WAKE_ALARM to system_server to properly support timerfd alarms
The when the timerfd alarm logic was added to the kernel, an oversight was made
and the interface does not check for the CAP_WAKE_ALARM permissions as required
via other kernel methods to trigger an alarm timer.
In v4.8-rc kernels, the change
2895a5e5b3a ("timerfd: Reject ALARM timerfds
without CAP_WAKE_ALARM") was added by Eric Caruso <ejcaruso@google.com>.
After this change (which may be backported to -stable), the AlarmManager will
fail on the first timerfd_create call, and will not be able to set the time
or handle other necessary functions.
The solution here is to add CAP_WAKE_ALARM to the system_server process.
Change-Id: Ifdb16f3ef42711e553f727165de3922d484b5be4
Signed-off-by: John Stultz <john.stultz@linaro.org>
Sergio Giro [Tue, 26 Jul 2016 19:05:22 +0000 (20:05 +0100)]
api: destroy() and isDestroyed() methods are now default in Destroyable
Change-Id: Ia5afcec8b627794bba7c69ca6245330b60aef5e9
Test: make droid docs and check-ojluni-files
Bug:
29631070
Sergio Giro [Wed, 27 Jul 2016 11:39:10 +0000 (11:39 +0000)]
Merge \"api: destroy() and isDestroyed() methods are now default in Destroyable\"
am:
877d6e75e6
Change-Id: I6ff9e93c43d5f9464ab29604b3aa5f93132ed74b
Sergio Giro [Wed, 27 Jul 2016 11:30:55 +0000 (11:30 +0000)]
Merge "api: destroy() and isDestroyed() methods are now default in Destroyable"
xiaoli.xb.zuo [Tue, 26 Jul 2016 15:43:55 +0000 (15:43 +0000)]
Merge \"Fix memory leak in MediaScannerConnection\"
am:
e40ab18590
Change-Id: I894584a5d193624acc78c20a6207b54b20b61563
Marco Nelissen [Tue, 26 Jul 2016 15:37:32 +0000 (15:37 +0000)]
Merge "Fix memory leak in MediaScannerConnection"
Tobias Thierer [Tue, 26 Jul 2016 14:28:12 +0000 (15:28 +0100)]
APIs for ProcessBuilder.Redirect
This CL is required for the following libcore change:
Revert "Hide ProcessBuilder.Redirect and associated APIs."
Test: Checked that 'make' succeeds.
Bug:
27464570
Change-Id: I7719ab495863d3fc8cdd00fbe19ac40a37b5a6f2
Sai Kiran Korwar [Mon, 25 Jul 2016 03:46:44 +0000 (03:46 +0000)]
Merge \"bootanimation: Call eglReleaseThread in threadLoop\"
am:
189bbd9f6d
Change-Id: Iaa5b3e60548ee2cce19cb4c31a6274d0ad877189
Jesse Hall [Mon, 25 Jul 2016 03:36:57 +0000 (03:36 +0000)]
Merge "bootanimation: Call eglReleaseThread in threadLoop"
Chih-Hung Hsieh [Fri, 22 Jul 2016 01:13:31 +0000 (18:13 -0700)]
resolve merge conflicts of
5152fd9 to stage-aosp-master
Change-Id: I2066125eb4076dbc9e8996bb1fa87735aa6040d3
Chih-hung Hsieh [Fri, 22 Jul 2016 00:55:18 +0000 (00:55 +0000)]
Merge "Fix google-explicit-constructor warnings in frameworks/base"
Chih-Hung Hsieh [Thu, 21 Jul 2016 18:23:06 +0000 (11:23 -0700)]
Fix google-explicit-constructor warnings in frameworks/base
* Add explicit keyword to conversion constructors.
* Add NOLINT to implicit conversion constructors.
Bug:
28341362
Test: build with clang-tidy
Change-Id: Ie4d37072ab57d1662d18db4de1c8577247f43337
David Gross [Thu, 21 Jul 2016 18:43:15 +0000 (11:43 -0700)]
resolve merge conflicts of
ed6625d to stage-aosp-master
Change-Id: Icae5872d5e220ac18a35e338f10b194c286855a8
David Gross [Thu, 21 Jul 2016 16:15:37 +0000 (16:15 +0000)]
Merge "Update RenderScript docs: reduction, other API 23/24 changes, cleanup."
xiaoli.xb.zuo [Wed, 13 Jul 2016 05:37:58 +0000 (14:37 +0900)]
Fix memory leak in MediaScannerConnection
This patch adds releasing of MediaScannerConnection in ClientProxy
after disconnecting and releasing of ClientProxy and
IMediaScannerService in disconnection sequence in
MediaScannerConnection.
Bug:
30150344
Change-Id: I1e162e4c9a0b7a741ace20480bcf06f3151a93bf
David Gross [Wed, 20 Jul 2016 23:04:35 +0000 (16:04 -0700)]
Update RenderScript docs: reduction, other API 23/24 changes, cleanup.
Substantive changes:
- Add discussion of reduction kernels.
- Use RS_KERNEL in place of __attribute__((kernel)).
- Discuss "context" special argument.
- Special arguments x, y, z may be of type int.
- Discuss multiple inputs for mapping kernels.
- Mention that script-side global writes are not visible in Java.
- Rewrite part of discussion regarding when to use support library.
- Change minimum device version for support library from Android 2.2 (API level 8)
to Android 2.3 (API level 9).
Stylistic changes (better conformance with style guide):
- Proper use of <i> (italic) versus <em> (emphasis).
- Proper case for headings.
- Proper pattern for Android version numbers.
- Do not use e.g. or i.e.
- Prefer active rather than passive voice.
- Prefer present rather than future tense.
Miscellaneous minor editorial changes.
Bug:
27299393
Bug:
30000147
Change-Id: Ie0a26152714cf8f619d4914218f7262d675bb25f
Christopher Ferris [Wed, 20 Jul 2016 18:10:47 +0000 (18:10 +0000)]
Merge \"Remove dependency on android_alarm.h.\"
am:
c95e7a3014
Change-Id: I19908fa29772c89b8112e371702da6197b20465d
Christopher Ferris [Wed, 20 Jul 2016 18:03:47 +0000 (18:03 +0000)]
Merge "Remove dependency on android_alarm.h."
Pirama Arumuga Nainar [Tue, 19 Jul 2016 23:41:20 +0000 (23:41 +0000)]
Merge \"Disable warning triggered in Clang r271374\"
am:
bba87840d3
Change-Id: I03686c2e9c341d927b295c150aea8eea37f69338
Stephen Hines [Tue, 19 Jul 2016 22:02:31 +0000 (22:02 +0000)]
Merge "Disable warning triggered in Clang r271374"
Pirama Arumuga Nainar [Wed, 29 Jun 2016 05:09:50 +0000 (22:09 -0700)]
Disable warning triggered in Clang r271374
http://b/
28149048
http://b/
29823425
Disable -Wconstant-conversion that gets triggered in
native/imageproc/to_rgba.c.
Test: Tested build, boot and common usage for Arm, Arm64, x86, x86_64,
Mips images in AOSP and internal branch.
Change-Id: Ia8dbe49a1a8577599244642cbd2e3bb17ec1f83c
Christopher Ferris [Mon, 18 Jul 2016 23:58:52 +0000 (16:58 -0700)]
Remove dependency on android_alarm.h.
android_alarm.h no longer exists in upstream android kernels. Since it's
only used by the AlarmManagerService, copy in the parts of the file that
are needed into that one file.
Bug:
30072483
Change-Id: I5c994dfa2ad261da48a67e5c35dc4b6618b82aa1
Dmitriy Filchenko [Tue, 19 Jul 2016 00:19:15 +0000 (00:19 +0000)]
Merge \"Handle long process names correctly.\"
am:
e2994438d2
Change-Id: I4edb617030ed2cedb394729f9ce94af080d3e358
Treehugger Robot [Tue, 19 Jul 2016 00:09:24 +0000 (00:09 +0000)]
Merge "Handle long process names correctly."
Dmitriy Filchenko [Mon, 18 Jul 2016 23:00:35 +0000 (16:00 -0700)]
Handle long process names correctly.
pthread_setname_np() expects 16 or fewer characters for the name argument. When the process name is longer, we should trim it.
Change-Id: I40be3a4212bdaab900c8eb30fa27aeeb7ed1b0d1
Keith Mok [Wed, 13 Jul 2016 21:45:16 +0000 (14:45 -0700)]
Fix random crash in libhwui
On some cases (noticed from log) that there is a crash in
libhwui.so, future debug log shows that the light center position
values are nan, causing an out of bound access in hull function
in SpotShadow.cpp for parameter retPoly which assume to be of
maximum length of pointsLength only but not the case when all
points are nan.
More log shows that a Snapshot was created (new) without
mRelativeLightCenter begin set, and Layer.cpp trying to
use it by calling updateLightPosFromRenderer. Those values
are random values in stack which causing math calc based on
that value returning nan also.
Initialize mRelativeLightCenter to 0 in Snapshot.cpp to avoid the
problem.
Change-Id: I9e24f6f1f856d053d09db1b1aae100f219f2a6de
Dmitriy Filchenko [Wed, 13 Jul 2016 19:57:52 +0000 (19:57 +0000)]
Merge \"Remove calls to set_process_name.\"
am:
8ee58b3b4e
Change-Id: Ia0157f7b7fa1b048ca98b55f5525089046e6cccd
Treehugger Robot [Wed, 13 Jul 2016 19:50:52 +0000 (19:50 +0000)]
Merge "Remove calls to set_process_name."
Dmitriy Filchenko [Tue, 12 Jul 2016 22:40:54 +0000 (15:40 -0700)]
Remove calls to set_process_name.
BUG:
29824203
Change-Id: I67a1eb350cf9ea28c554166986df8fc251b666eb
Hugo Benichi [Tue, 12 Jul 2016 13:15:41 +0000 (13:15 +0000)]
Merge \"Fix unsafe concurrent access in LegacyTypeTracker\"
am:
ee4c8fb9eb
Change-Id: I928b2c6ef8e20e197425c214242287185a9daa06
Treehugger Robot [Tue, 12 Jul 2016 13:08:20 +0000 (13:08 +0000)]
Merge "Fix unsafe concurrent access in LegacyTypeTracker"
Hugo Benichi [Tue, 21 Jun 2016 00:48:07 +0000 (09:48 +0900)]
Fix unsafe concurrent access in LegacyTypeTracker
This patch adds synchronization inside LegacyTypeTracker so that
getNetworkForType() can safely run concurrently with remove().
Without synchronization if remove() removes the last network for a
given type while getNetworkForType() runs for the same type, it is
possible that getNetworkForType tries to access the head of an empty
list, resulting in a runtime exception.
This issue was found by zoran.jovanovic@sonymobile.com who proposed a
fix in AOSP (Change-Id: Ia963662edb9d643790e8d9439e4dbdcac4c2187b).
This patch differs from the fix proposed by the bug reporter and tries
instead to do the minimum amount of locking to make getNetworkForType
safe.
Bug:
29030387
(cherry picked from commit
78caa25870391f676e1edbd448b5ff3e12a99a1e)
Change-Id: I915aac527fc8828b32bf35fee870add2dfb11d8d
Tetsutoki Shiozawa [Mon, 11 Jul 2016 14:42:57 +0000 (14:42 +0000)]
Merge \"Solve the infinite loop on clearExternalStorageDataSync\"
am:
9a3fbe1162
Change-Id: I5cfb3374a162863adc305f041eaca08d6efa2d3e
Todd Kennedy [Mon, 11 Jul 2016 14:32:02 +0000 (14:32 +0000)]
Merge "Solve the infinite loop on clearExternalStorageDataSync"
Shubham Ajmera [Mon, 11 Jul 2016 10:16:34 +0000 (10:16 +0000)]
Merge \"Track libcore change
dd5097d93d2f2c211fc79cde4d5f09db48e8808a\"
am:
18941cb53f
Change-Id: I40ce35ca5e8901f3e8b1e06258c7a5649084d51e
Shubham Ajmera [Mon, 11 Jul 2016 10:08:40 +0000 (10:08 +0000)]
Shubham Ajmera [Mon, 11 Jul 2016 09:59:12 +0000 (10:59 +0100)]
Track libcore change
dd5097d93d2f2c211fc79cde4d5f09db48e8808a
(cherry-picked from commit
30cbe3b264c23fd2dcf3a7bb8bb926a46578b35c)
Change-Id: I1264733705d58243e0ff4d001f3802ad48de0b09