OSDN Git Service
Phil Weaver [Fri, 12 Aug 2016 21:05:00 +0000 (21:05 +0000)]
Limit capabilities of a11y gesture dispatch.
am:
157f416a35
Change-Id: Ib6c15ab515cf7d2b4bd55453b195bf82d225f272
Elliott Hughes [Fri, 12 Aug 2016 20:09:56 +0000 (20:09 +0000)]
Merge "recvfrom takes a non-const pointer." am:
96660b37a1
am:
2f4c6e3d0d
Change-Id: I84f726f12c27f66c668026f913708bb8d2a7cfff
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 19:30:02 +0000 (19:30 +0000)]
resolve merge conflicts of
17bd236 to stage-aosp-master
am:
b3d46b44a3
Change-Id: I5123493e165c4d2ab74cf045e5fb8181886dce62
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 [Fri, 12 Aug 2016 00:31:29 +0000 (00:31 +0000)]
resolve merge conflicts of
76ce8e5 to stage-aosp-master
am:
ed935c32f4
Change-Id: Ibb7415686469d7b15e8dbe0cd04226c4e0cd7d76
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 23:05:49 +0000 (23:05 +0000)]
resolve merge conflicts of
5671277 to stage-aosp-master
am:
5aa4ba3776
Change-Id: Id0926a640dd15d33d6df9582009d587d7bed1872
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
Phil Weaver [Fri, 5 Aug 2016 18:23:50 +0000 (11:23 -0700)]
Limit capabilities of a11y gesture dispatch.
Changing the service side to accept descriptions of
motion events, not motion events themselves, so we can
control their creation.
Bug:
30647115
Change-Id: Ia6772a1fc05df91818e3f88959d1e2b4a35fe0cc
(cherry picked from commit
a8918f23c712e97fa1dc4911f64827d64fc906e5)
Hans Boehm [Thu, 11 Aug 2016 17:32:34 +0000 (17:32 +0000)]
Merge "Do not stack allocate RefBase object in AaptAssets::filter" am:
d0197ac340
am:
c97c9dbd96
Change-Id: I9ceb9f35c22e84a57e2c38f9e6fd562827ae7e0d
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"
smain@google.com [Thu, 11 Aug 2016 16:42:50 +0000 (16:42 +0000)]
add info about how to return default values from android.jar bug:
30757670
am:
abfa7e2c65
Change-Id: I45cdaec2d7e1b3c4bfb7b283a8ac581e2c87df95
smain@google.com [Wed, 10 Aug 2016 19:59:24 +0000 (12:59 -0700)]
add info about how to return default values from android.jar
bug:
30757670
Change-Id: I84e1624cbe7ae8d5e4e2886d4e8f61d621729464
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:29:31 +0000 (21:29 +0000)]
Merge "[NetworkPolicy]: Fixes the crash issues caused by null pointer." am:
2438a33e54
am:
bda5769701
Change-Id: I921e50e48b0c93e31fa3d172c850629312f322e6
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."
Chris Tate [Wed, 10 Aug 2016 18:04:07 +0000 (18:04 +0000)]
Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev am:
72933c623c am:
a8e21860af am:
1d64d33ba8 -s ours
am:
924b57b42c
Change-Id: Icb2821341904697bb348220bb18c668cdc8dfddb
Christopher Tate [Wed, 10 Aug 2016 18:04:00 +0000 (18:04 +0000)]
DO NOT MERGE: Backport N backup/restore stability work to M am:
d6f3a11107 am:
aac7d0442c am:
6ea7b630c2 -s ours
am:
5eac1c2544
Change-Id: I2e18c58c476c63535962c294c6a63716e536310b
Chris Tate [Wed, 10 Aug 2016 17:55:56 +0000 (17:55 +0000)]
Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev am:
72933c623c am:
a8e21860af
am:
1d64d33ba8 -s ours
Change-Id: I68bc1793b55e6e2bf660ea6c41611e819b3f5e9a
Christopher Tate [Wed, 10 Aug 2016 17:55:47 +0000 (17:55 +0000)]
DO NOT MERGE: Backport N backup/restore stability work to M am:
d6f3a11107 am:
aac7d0442c
am:
6ea7b630c2 -s ours
Change-Id: Iefb7a9ad5f00b0f6e24c45fe5cf1d17cb0c97414
Chris Tate [Wed, 10 Aug 2016 17:44:52 +0000 (17:44 +0000)]
Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev am:
72933c623c
am:
a8e21860af
Change-Id: I20921b9aa611838bc88fcabe1dc619de0bd9f6c1
Christopher Tate [Wed, 10 Aug 2016 17:44:50 +0000 (17:44 +0000)]
DO NOT MERGE: Backport N backup/restore stability work to M am:
d6f3a11107
am:
aac7d0442c
Change-Id: Ida93e1782221df18b2e7abcaa9da319e5ed28325
Chris Tate [Wed, 10 Aug 2016 17:28:30 +0000 (17:28 +0000)]
Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev
am:
72933c623c
Change-Id: I2efd8b43c279c4cbd92130a08df6e3eafcb20b2c
Christopher Tate [Wed, 10 Aug 2016 17:28:28 +0000 (17:28 +0000)]
DO NOT MERGE: Backport N backup/restore stability work to M
am:
d6f3a11107
Change-Id: Ibd6e1be57f129d9ea89c8a44332da830944cf2b1
Chris Tate [Wed, 10 Aug 2016 17:15:26 +0000 (17:15 +0000)]
Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev
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>
Hemal Patel [Tue, 9 Aug 2016 21:10:37 +0000 (21:10 +0000)]
Merge "Docs: Fixed the link that loads Fragments guide" into nyc-docs am:
5ca44906c6
am:
b6962dee09
Change-Id: Ifa4bcea1c47cfdfe00a36d8ad11c5aeaeeb71175
Hemal Patel [Tue, 9 Aug 2016 21:10:34 +0000 (21:10 +0000)]
Docs: Fixed the link that loads Fragments guide am:
a8e1c75bf6
am:
dabee01e9b
Change-Id: I6e3156f2990ddfd73b34015be8a09c972729d26e
Hemal Patel [Tue, 9 Aug 2016 21:10:28 +0000 (21:10 +0000)]
Merge "Docs: Changed custom_toast to toast_layout" into nyc-docs am:
a70c722c77
am:
3c49a4b761
Change-Id: I81d45c0ddc35a34da756808ccfb89017b286f261
Hemal Patel [Tue, 9 Aug 2016 21:10:24 +0000 (21:10 +0000)]
Docs: Changed custom_toast to toast_layout am:
3b7309d753
am:
ca17f5b8e3
Change-Id: Ic306fd462773e6b6b457a0f8c1ee4a5bd931be22
Hemal Patel [Tue, 9 Aug 2016 21:03:19 +0000 (21:03 +0000)]
Merge "Docs: Fixed the link that loads Fragments guide" into nyc-docs
am:
5ca44906c6
Change-Id: I4286b4a8e0766f7c3ca2d7e5ebd5c9f2b296fbb9
Hemal Patel [Tue, 9 Aug 2016 21:03:13 +0000 (21:03 +0000)]
Docs: Fixed the link that loads Fragments guide
am:
a8e1c75bf6
Change-Id: I26ea32ff32067d86fb5390103eec737b293ac031
Hemal Patel [Tue, 9 Aug 2016 21:03:06 +0000 (21:03 +0000)]
Merge "Docs: Changed custom_toast to toast_layout" into nyc-docs
am:
a70c722c77
Change-Id: I6e1d0d70d5d4b89b083cb74272f064bebf6a273a
Hemal Patel [Tue, 9 Aug 2016 21:03:00 +0000 (21:03 +0000)]
Docs: Changed custom_toast to toast_layout
am:
3b7309d753
Change-Id: I3d85fb321e27643227c568127870c7ad07650c41
Hemal Patel [Tue, 9 Aug 2016 20:55:34 +0000 (20:55 +0000)]
Merge "Docs: Fixed the link that loads Fragments guide" into nyc-docs
Hemal Patel [Tue, 9 Aug 2016 20:53:11 +0000 (20:53 +0000)]
Merge "Docs: Changed custom_toast to toast_layout" into nyc-docs
Chad Brubaker [Tue, 9 Aug 2016 19:50:35 +0000 (19:50 +0000)]
Merge "Add stub isCTVerificationRequired methods" am:
5b63231a31
am:
6e1f860c6a
Change-Id: I5c1f4d9785e56777e37da614ed6515113ae277c1
Chad Brubaker [Tue, 9 Aug 2016 19:43:50 +0000 (19:43 +0000)]
Merge "Add stub isCTVerificationRequired methods"
am:
5b63231a31
Change-Id: Ica40dc0da1821aa47825e615f0f3b629e0358568
Shawn Willden [Tue, 9 Aug 2016 19:38:25 +0000 (19:38 +0000)]
Merge "Fix @link tags in keystore doc" into nyc-docs am:
3188f77658
am:
7218af3f9a
Change-Id: I8f350a045c1eb301418a91edfd975a388298507b
Shawn Willden [Tue, 9 Aug 2016 19:38:20 +0000 (19:38 +0000)]
Fix @link tags in keystore doc am:
3f0526ea09
am:
9e8b4ad9c9
Change-Id: Ic680cc75dbe80b57876dae701551cacfe2022086
Chad Brubaker [Tue, 9 Aug 2016 19:13:00 +0000 (19:13 +0000)]
Merge "Add stub isCTVerificationRequired methods"
Shawn Willden [Tue, 9 Aug 2016 19:01:04 +0000 (19:01 +0000)]
Merge "Fix @link tags in keystore doc" into nyc-docs
am:
3188f77658
Change-Id: I4d30c3ad9f1d2d9d949e5f1ebc680f65c6925b99
Shawn Willden [Tue, 9 Aug 2016 19:01:00 +0000 (19:01 +0000)]
Fix @link tags in keystore doc
am:
3f0526ea09
Change-Id: I3162cbf57341ab231b84544c04e02d2062dbd304
TreeHugger Robot [Tue, 9 Aug 2016 18:35:07 +0000 (18:35 +0000)]
Merge "Fix @link tags in keystore doc" into nyc-docs
Yi Kong [Tue, 9 Aug 2016 18:15:56 +0000 (18:15 +0000)]
Merge "Track libcore change
ee24b6322448ac919231a668e308ebd719aa52d7" am:
67aaa079ee
am:
2ae4d32ca3
Change-Id: I279138f6f7d585b2358537f129561d04c531dd00
Yi Kong [Tue, 9 Aug 2016 18:07:29 +0000 (18:07 +0000)]
Track libcore change
ee24b6322448ac919231a668e308ebd719aa52d7
am:
19df48b93b
Change-Id: I7fba48c95191b4a53acff70e89d59e30d3eb8e90
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:26:46 +0000 (16:26 +0000)]
Merge "Tidy up MockWebServer usage" am:
294ab080f4
am:
d0dc901341
Change-Id: I611d9e21a8e70e2e99de078e5218e34961cf7ee7
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:54:32 +0000 (10:54 +0000)]
Merge "Add a finalize() method to StrictJarFile" am:
d0c0c8dcab
am:
2ffb7ebae2
Change-Id: Ie947e8447ecd8e9a61b6d1115174180e41d74311
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:07:43 +0000 (09:07 +0000)]
Merge "Ensure apps cannot prevent uncaught exceptions being logged." am:
f61a449ee9
am:
8431c55fb8
Change-Id: I9b75016ac643c5bab03589ec82a4946fc2d9720e
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."
Kevin Hufnagle [Mon, 8 Aug 2016 23:48:16 +0000 (23:48 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev
am:
87c2ed97b8
Change-Id: If031e6c264ecaf23b32b62ac8d0e1036959d242d
Kevin Hufnagle [Mon, 8 Aug 2016 23:48:12 +0000 (23:48 +0000)]
docs: Revised "Optimizing Content for the Assistant" page.
am:
d4197234bb
Change-Id: Iee3f043360bfd8df55265481843e165d1ffc832c
Hemal Patel [Mon, 8 Aug 2016 23:19:46 +0000 (16:19 -0700)]
Docs: Fixed the link that loads Fragments guide
In the class description, fixed the reference link that points to the
Fragments guide.
Bug:
29007808
Change-Id: I3399e5f10c461eb6666a04f8829c6cde774948e0
Kevin Hufnagle [Mon, 8 Aug 2016 23:35:25 +0000 (23:35 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev
Mark Lu [Mon, 8 Aug 2016 22:49:14 +0000 (22:49 +0000)]
docs: fixed generics in data binding code samples am:
b1b5efd3be
am:
7f703bde72
Change-Id: Ibdc351bc38832d8e0f02332be8aa1802e6c3ae65
Mark Lu [Mon, 8 Aug 2016 22:37:19 +0000 (22:37 +0000)]
docs: fixed generics in data binding code samples
am:
b1b5efd3be
Change-Id: Iecafea06866a4579824435467c5dd31859c0dbd4
Mark Lu [Mon, 8 Aug 2016 22:36:19 +0000 (22:36 +0000)]
Merge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev
am:
a6ee9c1848
Change-Id: Id2540d8e557f2793d3e00a667c26b4efef49a3fc
Mark Lu [Mon, 8 Aug 2016 22:36:09 +0000 (22:36 +0000)]
docs: add info to SharedPreferences.Editor.putString
am:
fb48521f41
Change-Id: Icf8a1a92e8f18bcc63b52842ea75b00610feac9d
Mark Lu [Mon, 8 Aug 2016 22:26:34 +0000 (22:26 +0000)]
Merge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev
joonyoung.cho [Mon, 8 Aug 2016 22:01:29 +0000 (22:01 +0000)]
Merge "fix safeMode status in AppWidgetService" am:
78a72f0698
am:
cbd4ad1f7e
Change-Id: I879ba624b3d3693472e6623e084660d4cadf6b95
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"
Christopher Tate [Fri, 29 Jul 2016 23:01:31 +0000 (16:01 -0700)]
DO NOT MERGE: Backport N backup/restore stability work to M
This is a squashed rollup of backup/restore infrastructural work in
the N release. It intentionally omits semantic/API changes such
as the introduction of the onQuotaExceeded() callback.
This patchset should not be merged beyond M maintenance releases.
Bug
29617908
Bug
29848715
Change-Id: I1eb25ad07f3bbf1132198d8a233722c41f1ac4cc
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
Mark Salyzyn [Fri, 5 Aug 2016 19:28:05 +0000 (19:28 +0000)]
Merge "select_logpersist_title char limit" into stage-aosp-master
am:
cc6fd4549b
Change-Id: I393d9ea62334cac5fc6f07e53d2882323591716f
Mark Salyzyn [Fri, 5 Aug 2016 19:28:03 +0000 (19:28 +0000)]
select_logpersist_title char limit
am:
41f85953c2
Change-Id: I8852b239862c1bcff1ecfc24e4554f36fd5711df
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:41:07 +0000 (18:41 +0000)]
Merge "Fix random crash in libhwui" am:
3f67a1855e
am:
9aaf189103
Change-Id: I87d1c7b03bbf231fa059df53b667687ec68589ef
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
Mark Lu [Thu, 4 Aug 2016 21:45:42 +0000 (14:45 -0700)]
docs: fixed generics in data binding code samples
Generic types, such as List<String>, must be escaped when they are
used in XML. For example, List<String>. This commit adds
escape characters to the XML samples in the data binding page.
Bug:
30691285
Change-Id: If55ed55d13fb11038e2495884c79698e67219108
Tobias Thierer [Fri, 5 Aug 2016 12:51:50 +0000 (12:51 +0000)]
Merge "APIs for ProcessBuilder.Redirect" am:
e49469aed1
am:
c548ff23bd
Change-Id: I97d741f344ee59e8f493f0ac8d0b41a63adc9c14
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 [Fri, 5 Aug 2016 12:44:35 +0000 (12:44 +0000)]
Update api/test-current.txt for ProcessBuilder API
am:
6af44aeea0
Change-Id: I0009f3d758af696aca14851f53459c6a332beb47
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:32:44 +0000 (10:32 +0000)]
Merge "Track libcore change
4e73fd2bc22e704fe71465782b83be0471ac5e82" into stage-aosp-master
am:
e2e65a4708
Change-Id: If3fe3c4e5d242dc768789b093ddef2bbc08f4c78
Przemyslaw Szczepaniak [Fri, 5 Aug 2016 10:32:39 +0000 (10:32 +0000)]
Track libcore change
4e73fd2bc22e704fe71465782b83be0471ac5e82
am:
49929ccf46
Change-Id: Ie9d2d41124395588fa58dc0f97447a9e77094609
Przemyslaw Szczepaniak [Fri, 5 Aug 2016 10:25:23 +0000 (10:25 +0000)]
Merge "Track libcore change
4e73fd2bc22e704fe71465782b83be0471ac5e82" into stage-aosp-master