OSDN Git Service
Tobias Thierer [Wed, 17 Aug 2016 17:38:46 +0000 (17:38 +0000)]
Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into stage-aosp-master
Tobias Thierer [Wed, 17 Aug 2016 17:11:01 +0000 (17:11 +0000)]
Revert "Revert "Track libcore update of Map classes to jdk8u60""
Automerger issues have been resolved. This change needs
to be rolled forward once Automerger merges
http://r.android.com/255655 from mirror-aosp-master into
stage-aosp-master.
This reverts commit
778321361132672ea1174e4ca3f5397477c32690.
Change-Id: I16e1d94351ccf7cc1aeb8f9905410cd23514e8ff
Phil Burk [Wed, 17 Aug 2016 16:59:06 +0000 (16:59 +0000)]
Merge "UsbMidiDevice: fix MIDI flush()"
am:
c5b376ab66
Change-Id: I20fcf969489fda53e60ad3642f955ae346ec9868
Tobias Thierer [Wed, 17 Aug 2016 16:54:30 +0000 (16:54 +0000)]
Merge "Track libcore update of Map classes to jdk8u60."
am:
ec6a323da2
Change-Id: I6af9d2929d07cc60be8485de344d335c1bf5cf33
Tobias Thierer [Wed, 17 Aug 2016 14:50:59 +0000 (14:50 +0000)]
Revert "Track libcore update of Map classes to jdk8u60"
May have broken stage-aosp-master since the CL from aosp-master was for
some reason only merged to mirror-aosp-master but no further.
Bug:
30911913
This reverts commit
fb2ade3dcab0962f18acab720875c75622f412ed.
Change-Id: I696d2b0636708fc6c73a53cd3cae36fa5bd0f173
Treehugger Robot [Wed, 17 Aug 2016 13:57:33 +0000 (13:57 +0000)]
Merge "UsbMidiDevice: fix MIDI flush()"
Tobias Thierer [Thu, 11 Aug 2016 18:47:02 +0000 (19:47 +0100)]
Track libcore update of Map classes to jdk8u60
This adds the api/test-current.txt changes corresponding to
http://r.android.com/238640
This CL requires base CLs, which will get merged from aosp-master,
in order to build.
Change-Id: I0aa2e9c4c7b3b6af79c9885e7e0fdde8880e71c8
Tobias Thierer [Wed, 17 Aug 2016 10:03:52 +0000 (10:03 +0000)]
Merge "Track libcore update of Map classes to jdk8u60."
Phil Burk [Tue, 5 Apr 2016 18:25:36 +0000 (11:25 -0700)]
UsbMidiDevice: fix MIDI flush()
The proxy MidiReceiver in the USB device was not forwarding the flush
command to the event scheduler.
Bug:
25511696
Change-Id: I6a4759b71bc8f9ae3e20aed1238f62a2ed405e24
Signed-off-by: Phil Burk <philburk@google.com>
Tobias Thierer [Fri, 5 Aug 2016 18:58:02 +0000 (19:58 +0100)]
Track libcore update of Map classes to jdk8u60.
Note that these additions are simply artifacts of the API generation
processes. These map methods were previously implemented by superclasses.
Test: make update-api
Change-Id: Ib03ca6afb438f2d7597abd0794cdebed2083bc17
Chih-Hung Hsieh [Tue, 16 Aug 2016 02:23:48 +0000 (02:23 +0000)]
Merge "Fix google-explicit-constructor warnings."
am:
ea537bf5b3
Change-Id: I38d1f635b7bf2c46648c852bf0caa421e67218f4
Treehugger Robot [Tue, 16 Aug 2016 02:12:38 +0000 (02:12 +0000)]
Merge "Fix google-explicit-constructor warnings."
Chih-Hung Hsieh [Mon, 15 Aug 2016 21:45:02 +0000 (14:45 -0700)]
Fix google-explicit-constructor warnings.
* Add explicit keyword to conversion constructors.
Bug:
28341362
Test: build with WITH_TIDY=1
Change-Id: I7422d703de17c4266d2a022990d0e1df40f48226
Elliott Hughes [Fri, 12 Aug 2016 19:58:55 +0000 (19:58 +0000)]
Merge "recvfrom takes a non-const pointer."
am:
96660b37a1
Change-Id: Ief2e969ec0498ac2c9264fa34a3de36773bc43fa
Treehugger Robot [Fri, 12 Aug 2016 19:48:38 +0000 (19:48 +0000)]
Merge "recvfrom takes a non-const pointer."
Chih-Hung Hsieh [Fri, 12 Aug 2016 18:35:17 +0000 (11:35 -0700)]
resolve merge conflicts of
17bd236 to stage-aosp-master
Change-Id: I08d4500aaa378b08d41e8d046c62101e08dbfba8
Chih-hung Hsieh [Fri, 12 Aug 2016 18:05:32 +0000 (18:05 +0000)]
Merge "Fix clang-tidy warnings in aapt and aapt2."
Elliott Hughes [Fri, 12 Aug 2016 17:53:48 +0000 (10:53 -0700)]
recvfrom takes a non-const pointer.
Change-Id: Ib2c8f2710cb333904106f849f492c83697fdd937
Chih-Hung Hsieh [Thu, 11 Aug 2016 23:48:46 +0000 (16:48 -0700)]
resolve merge conflicts of
76ce8e5 to stage-aosp-master
Change-Id: I4b4ca9906373a95776d2da8ba2fa39a4a78e2a30
Treehugger Robot [Thu, 11 Aug 2016 23:20:47 +0000 (23:20 +0000)]
Merge "Fix clang-tidy warnings in libs/hwui."
Jakub Pawlowski [Thu, 11 Aug 2016 22:53:06 +0000 (15:53 -0700)]
resolve merge conflicts of
5671277 to stage-aosp-master
Change-Id: I71e3bd497dbdc0b3f297ad311620aa77bf7225ac
Jakub Pawlowski [Thu, 11 Aug 2016 22:32:22 +0000 (22:32 +0000)]
Merge "Add LE Secure Connection data parsing (1/4)"
Chih-Hung Hsieh [Wed, 10 Aug 2016 21:15:30 +0000 (14:15 -0700)]
Fix clang-tidy warnings in aapt and aapt2.
* Add explicit keyword to conversion constructors.
* Add NOLINT(implicit) comments for implicit conversion constructors.
Bug:
28341362
* Use const reference type for read-only parameters.
Bug:
30407689
* Use const reference type to avoid unnecessary copy.
Bug:
30413862
Test: build with WITH_TIDY=1
Change-Id: Id6d21961f313a1ad92b15a37fdaa5be9e8ab48e1
Merged-In: Id6d21961f313a1ad92b15a37fdaa5be9e8ab48e1
Jakub Pawlowski [Thu, 28 Jul 2016 12:21:36 +0000 (05:21 -0700)]
Add LE Secure Connection data parsing (1/4)
Bug:
30460956
Change-Id: I8d6e721b3b04f5ca9e3e02f7f2b90487482e1b37
Hans Boehm [Thu, 11 Aug 2016 17:28:07 +0000 (17:28 +0000)]
Merge "Do not stack allocate RefBase object in AaptAssets::filter"
am:
d0197ac340
Change-Id: I077f9c190025d688af17d1a840b841cbdc4e003d
Hans Boehm [Thu, 11 Aug 2016 17:18:21 +0000 (17:18 +0000)]
Merge "Do not stack allocate RefBase object in AaptAssets::filter"
Hans Boehm [Thu, 11 Aug 2016 02:56:50 +0000 (19:56 -0700)]
Do not stack allocate RefBase object in AaptAssets::filter
Doing so is likely to trigger log messages in the future, and will
hinder diagnosis of other problems.
Bug:
30292538
Change-Id: I2cb8c507e43d06d4afa7e35b564416c1474c81d1
Chih-Hung Hsieh [Wed, 10 Aug 2016 21:08:35 +0000 (14:08 -0700)]
Fix clang-tidy warnings in libs/hwui.
* Add explicit keyword to conversion constructors.
Bug:
28341362
* Use const reference type for read-only parameters.
Bug:
30407689
Test: build with WITH_TIDY=1
Change-Id: Iab3e6636f60a70cb124f29dc19f20f842fa8dfda
Merged-In: Iab3e6636f60a70cb124f29dc19f20f842fa8dfda
Robert Greenwalt [Wed, 10 Aug 2016 21:20:39 +0000 (21:20 +0000)]
Merge "[NetworkPolicy]: Fixes the crash issues caused by null pointer."
am:
2438a33e54
Change-Id: I5e8e5048718edf82008b58964d90b3cc10115c71
Robert Greenwalt [Wed, 10 Aug 2016 21:07:25 +0000 (21:07 +0000)]
Merge "[NetworkPolicy]: Fixes the crash issues caused by null pointer."
zhangshuxiao [Tue, 9 Aug 2016 10:48:04 +0000 (18:48 +0800)]
[NetworkPolicy]: Fixes the crash issues caused by null pointer.
When handleRegisterNetworkAgent in ConnectivityService,
the networkinfo of NetworkAgentInfo will be set to null.
So we need to handle the null pointer of state.networkInfo.
Change-Id: I2a278f1f1b2455057fd2ed323ff4df340c3cbca9
Signed-off-by: zhangshuxiao <zhangshuxiao@xiaomi.com>
Chad Brubaker [Tue, 9 Aug 2016 19:43:50 +0000 (19:43 +0000)]
Merge "Add stub isCTVerificationRequired methods"
am:
5b63231a31
Change-Id: Ica40dc0da1821aa47825e615f0f3b629e0358568
Chad Brubaker [Tue, 9 Aug 2016 19:13:00 +0000 (19:13 +0000)]
Merge "Add stub isCTVerificationRequired methods"
Yi Kong [Tue, 9 Aug 2016 18:07:12 +0000 (18:07 +0000)]
Merge "Track libcore change
ee24b6322448ac919231a668e308ebd719aa52d7"
am:
67aaa079ee
Change-Id: I8b0bb02aca968de0baa7864cf4e123e4dd60b594
Yi Kong [Tue, 9 Aug 2016 17:59:07 +0000 (17:59 +0000)]
Yi Kong [Tue, 9 Aug 2016 13:58:57 +0000 (14:58 +0100)]
Track libcore change
ee24b6322448ac919231a668e308ebd719aa52d7
Change-Id: I73dd6af604304ea4eb8e01990454f491af659602
(cherry picked from commit
f646aa14cdbf34e8784c0411d0baca26e364c1dc)
Yi Kong [Tue, 9 Aug 2016 13:58:57 +0000 (14:58 +0100)]
Track libcore change
ee24b6322448ac919231a668e308ebd719aa52d7
Change-Id: I73dd6af604304ea4eb8e01990454f491af659602
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
Chad Brubaker [Mon, 1 Aug 2016 17:48:27 +0000 (10:48 -0700)]
Add stub isCTVerificationRequired methods
Bug:
28746284
Change-Id: Iebeecba7356ac57fedb06d71de63aa9900f2ccd8
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