drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
251,888 Commits 1 Branch 0 Tags
Commit Graph

251888 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chih-Hung Hsieh
ed935c32f4 resolve merge conflicts of 76ce8e5 to stage-aosp-master 
Change-Id: I4b4ca9906373a95776d2da8ba2fa39a4a78e2a30
 2016-08-11 16:48:46 -07:00
Treehugger Robot
76ce8e5242 Merge "Fix clang-tidy warnings in libs/hwui." 2016-08-11 23:20:47 +00:00
Jakub Pawlowski
5aa4ba3776 resolve merge conflicts of 5671277 to stage-aosp-master 
Change-Id: I71e3bd497dbdc0b3f297ad311620aa77bf7225ac
 2016-08-11 15:53:06 -07:00
Jakub Pawlowski
5671277d2a Merge "Add LE Secure Connection data parsing (1/4)" 2016-08-11 22:32:23 +00:00
Jakub Pawlowski
747711ce9b Add LE Secure Connection data parsing (1/4) 
Bug: 30460956
Change-Id: I8d6e721b3b04f5ca9e3e02f7f2b90487482e1b37
 2016-08-11 22:18:19 +00:00
Hans Boehm
c97c9dbd96 Merge "Do not stack allocate RefBase object in AaptAssets::filter" 
am: d0197ac340

Change-Id: I077f9c190025d688af17d1a840b841cbdc4e003d
 2016-08-11 17:28:07 +00:00
Hans Boehm
d0197ac340 Merge "Do not stack allocate RefBase object in AaptAssets::filter" 2016-08-11 17:18:22 +00:00
Hans Boehm
25dfa75ee3 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
 2016-08-10 19:56:50 -07:00
Chih-Hung Hsieh
f35c939cd7 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
 2016-08-10 23:26:59 +00:00
Robert Greenwalt
bda5769701 Merge "[NetworkPolicy]: Fixes the crash issues caused by null pointer." 
am: 2438a33e54

Change-Id: I5e8e5048718edf82008b58964d90b3cc10115c71
 2016-08-10 21:20:39 +00:00
Robert Greenwalt
2438a33e54 Merge "[NetworkPolicy]: Fixes the crash issues caused by null pointer." 2016-08-10 21:07:26 +00:00
zhangshuxiao
bad369d63e [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>
 2016-08-10 03:49:54 +00:00
Chad Brubaker
6e1f860c6a Merge "Add stub isCTVerificationRequired methods" 
am: 5b63231a31

Change-Id: Ica40dc0da1821aa47825e615f0f3b629e0358568
 2016-08-09 19:43:50 +00:00
Chad Brubaker
5b63231a31 Merge "Add stub isCTVerificationRequired methods" 2016-08-09 19:13:01 +00:00
Yi Kong
2ae4d32ca3 Merge "Track libcore change ee24b6322448ac919231a668e308ebd719aa52d7" 
am: 67aaa079ee

Change-Id: I8b0bb02aca968de0baa7864cf4e123e4dd60b594
 2016-08-09 18:07:12 +00:00
Yi Kong
67aaa079ee Merge "Track libcore change ee24b6322448ac919231a668e308ebd719aa52d7" 2016-08-09 17:59:07 +00:00
Yi Kong
19df48b93b Track libcore change ee24b6322448ac919231a668e308ebd719aa52d7 
Change-Id: I73dd6af604304ea4eb8e01990454f491af659602
(cherry picked from commit f646aa14cdbf34e8784c0411d0baca26e364c1dc)
 2016-08-09 18:57:16 +01:00
Yi Kong
f646aa14cd Track libcore change ee24b6322448ac919231a668e308ebd719aa52d7 
Change-Id: I73dd6af604304ea4eb8e01990454f491af659602
 2016-08-09 16:43:32 +00:00
Neil Fuller
d0dc901341 Merge "Tidy up MockWebServer usage" 
am: 294ab080f4

Change-Id: Ia22ce1e949ba3b611c0f2be60b3dbbafef7e4bb6
 2016-08-09 16:16:54 +00:00
Neil Fuller
294ab080f4 Merge "Tidy up MockWebServer usage" 2016-08-09 16:05:38 +00:00
Neil Fuller
2ffb7ebae2 Merge "Add a finalize() method to StrictJarFile" 
am: d0c0c8dcab

Change-Id: Iccab49c98b105aff6105e21274fbc099d10ecb55
 2016-08-09 10:49:58 +00:00
Neil Fuller
d0c0c8dcab Merge "Add a finalize() method to StrictJarFile" 2016-08-09 10:43:18 +00:00
Tobias Thierer
8431c55fb8 Merge "Ensure apps cannot prevent uncaught exceptions being logged." 
am: f61a449ee9

Change-Id: I826c175547a73123cd438ebe6991efee39a433d0
 2016-08-09 09:02:27 +00:00
Tobias Thierer
f61a449ee9 Merge "Ensure apps cannot prevent uncaught exceptions being logged." 2016-08-09 08:55:35 +00:00
joonyoung.cho
cbd4ad1f7e Merge "fix safeMode status in AppWidgetService" 
am: 78a72f0698

Change-Id: I21559690f6371102cf48132d8930343923d60011
 2016-08-08 21:53:34 +00:00
Treehugger Robot
78a72f0698 Merge "fix safeMode status in AppWidgetService" 2016-08-08 21:36:46 +00:00
Tobias Thierer
addbf9015a 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
 2016-08-08 17:59:28 +01:00
TreeHugger Robot
cc6fd4549b Merge "select_logpersist_title char limit" into stage-aosp-master 2016-08-05 19:22:41 +00:00
Keith Mok
9aaf189103 Merge "Fix random crash in libhwui" 
am: 3f67a1855e

Change-Id: I8dfcad3d00b2cca955457142b963934143ec2cbd
 2016-08-05 18:37:14 +00:00
Treehugger Robot
3f67a1855e Merge "Fix random crash in libhwui" 2016-08-05 18:23:14 +00:00
Mark Salyzyn
41f85953c2 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
 2016-08-05 10:26:29 -07:00
Tobias Thierer
c548ff23bd Merge "APIs for ProcessBuilder.Redirect" 
am: e49469aed1

Change-Id: I6c479a84044cfd8df084a3c9707f7aaaf09546fa
 2016-08-05 12:44:48 +00:00
Tobias Thierer
6af44aeea0 Update api/test-current.txt for ProcessBuilder API 
Test: make update-api docs

Bug: 27464570
Change-Id: Iee1fec0efb241ba091494467ab3632675c1d07d4
 2016-08-05 12:37:21 +00:00
Tobias Thierer
e49469aed1 Merge "APIs for ProcessBuilder.Redirect" 2016-08-05 12:36:35 +00:00
Przemyslaw Szczepaniak
e2e65a4708 Merge "Track libcore change 4e73fd2bc22e704fe71465782b83be0471ac5e82" into stage-aosp-master 2016-08-05 10:25:24 +00:00
Przemyslaw Szczepaniak
622e170338 Merge "Track libcore change 0e393b4d628541e84e31210342f4103315c07e23" 
am: 50f3429d14

Change-Id: I2fdd89afd9cfc0cc36be2664dee559e7b0977c6d
 2016-08-05 09:44:55 +00:00
Przemyslaw Szczepaniak
50f3429d14 Merge "Track libcore change 0e393b4d628541e84e31210342f4103315c07e23" 2016-08-05 09:36:41 +00:00
Przemyslaw Szczepaniak
49929ccf46 Track libcore change 4e73fd2bc22e704fe71465782b83be0471ac5e82 
Version with test-current.txt

Bug: 28666126
Change-Id: I3677508ff00c381c88fe9c767ec7037493b574f8
 2016-08-05 09:33:51 +00:00
Hans Boehm
c73e080eea Merge "Update SMP documentation." 
am: 497ac5eccb

Change-Id: I06d06e205a8bf7646500fa6c8d86eb7cfa49e6ce
 2016-08-05 02:05:57 +00:00
Hans Boehm
497ac5eccb Merge "Update SMP documentation." 2016-08-05 01:59:38 +00:00
Hans Boehm
9e629adc4a 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
 2016-08-04 14:21:48 -07:00
Jakub Pawlowski
83272db445 Merge "Fix bad index usage" 
am: 5cfe8a8315

Change-Id: I36807979de4f0f74f9dd3ef6f3b2a60e83346b0f
 2016-08-04 20:46:32 +00:00
Andre Eisenbach
5cfe8a8315 Merge "Fix bad index usage" 2016-08-04 20:20:02 +00:00
Jakub Pawlowski
d167db19a9 Fix bad index usage 
Bug: 27999121
Change-Id: Ie2ba6f71bbf6f789a3c1016ba2f0051b809ac87e
 2016-08-04 20:19:52 +00:00
Chih-Hung Hsieh
9650521ed1 Merge "Enable clang for arm64." 
am: a11a8e5086

Change-Id: If6069ad099ec5068b9b77f1ea84b85ff4a20438d
 2016-08-04 17:19:10 +00:00
Chih-hung Hsieh
a11a8e5086 Merge "Enable clang for arm64." 2016-08-04 17:13:53 +00:00
Chih-Hung Hsieh
248bed0334 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)
 2016-08-04 17:09:55 +00:00
Przemyslaw Szczepaniak
82957239fe Missing test-current.txt for libcore change ea47d5d712edcaef726a3e12065729be21699afe 
Change-Id: I691a53f92bc1cfe0a9c6d5ad9d7d3d259ce0aabb
Test: make -j 32 update-api
Bug: 30402085
 2016-08-04 11:56:09 +00:00
Tobias Thierer
97b24c2f6a Merge "Add API for setsockoptInt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, value)" 
am: f1d119ccd3

Change-Id: I90e74c457475f16edd20369bb8c024896c9e241c
 2016-08-04 11:00:03 +00:00
Tobias Thierer
f1d119ccd3 Merge "Add API for setsockoptInt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, value)" 2016-08-04 10:51:14 +00:00