Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
255,075 Commits 3 Branches 0 Tags
bcbed91c2fd96fbe96c8d2633c0c6ecb4e2df481
Commit Graph

255075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tobias Thierer
bad5969a77 Merge "remove x attribute of java file" am: 554284edf3 
am: 52fdb4750a

Change-Id: I09db9140427da70ea3e946a383367533afc81110
 2016-08-03 10:09:19 +00:00
songjinshi
ca7a43b5da Merge "Fixes the system server crash issue caused by uncatched exception." 
am: b68106cf2a

Change-Id: Ia28f7bdad020dbb3695934cae1f193037de41fcb
 2016-08-03 10:03:59 +00:00
Ganesh Mahendran
52fdb4750a Merge "remove x attribute of java file" 
am: 554284edf3

Change-Id: I05553fd2ecc175858e0923e68e62305149e8dd3e
 2016-08-03 10:03:53 +00:00
Tobias Thierer
b68106cf2a Merge "Fixes the system server crash issue caused by uncatched exception." 2016-08-03 09:54:53 +00:00
Tobias Thierer
554284edf3 Merge "remove x attribute of java file" 2016-08-03 09:54:24 +00:00
Kevin Hufnagle
97a3d3c3a6 docs: Added page on DAC describing ARC manifest file considerations. 
Bug: 30114799
Change-Id: I9b8d67d09e4627f22a9fc58421dd52aa3650c235
 2016-08-02 22:11:02 -07:00
Joe Fernandez
a117b34777 docs: Add ARC documentation TOC file 
Bug: 30114799
Change-Id: Ib4e3c5b255c9e1e9c2894b3703deb1d38f252fba
 2016-08-02 17:50:58 -07:00
John Stultz
55b3a9ceb3 Merge "Zygote: Add CAP_WAKE_ALARM to system_server to properly support timerfd alarms" am: 1085be0ce3 
am: 5e23ab394a

Change-Id: If1d303010a604bf6c1c745ea9e2d920eea20f5aa
 2016-08-03 00:17:56 +00:00
John Stultz
5e23ab394a Merge "Zygote: Add CAP_WAKE_ALARM to system_server to properly support timerfd alarms" 
am: 1085be0ce3

Change-Id: I23d7c2af33db8621b0c3b3415669543e0e3b740f
 2016-08-03 00:12:32 +00:00
Treehugger Robot
1085be0ce3 Merge "Zygote: Add CAP_WAKE_ALARM to system_server to properly support timerfd alarms" 2016-08-03 00:04:19 +00:00
Andrew Solovay
2068960d68 cherry-pick from nyc-dev: docs: SafeBrowsing API am: 741757f27f 
am: 328a6a12eb

Change-Id: I442d5474cef4b92917f7604e3127dfad0fd6d74f
 2016-08-02 21:47:40 +00:00
Hemal Patel
3b7309d753 Docs: Changed custom_toast to toast_layout 
Bug: 18909456
Change-Id: Ib3f79436421e5bdbd6ebd18563da081a751ea0e0
 2016-08-02 14:47:19 -07:00
Joe Fernandez
553191dd26 Resolve merge conflicts of ffb4eb1 to nyc-dev 
am: a5abfee3a5

Change-Id: I01aae4c96bba37ef8e2466821fdce39881d3e022
 2016-08-02 21:40:19 +00:00
Joe Fernandez
328a6a12eb cherry-pick from nyc-dev: docs: SafeBrowsing API 
am: 741757f27f

Change-Id: Ice1968509af665160646025e708d3802b39ef4c4
 2016-08-02 21:36:02 +00:00
Bert McMeen
f27ab3c126 Docs: Fixed typo in API Overview 
Bug: 30436707
Change-Id: I99a2b103d0643158da00ee0b5547b52bf6ebc040
 2016-08-02 14:15:07 -07:00
Andrew Solovay
741757f27f docs: Fixing download redirects 
URLS of the form https://developer.android.com/downloads/… weren't
properly redirecting to
https://commondatastorage.googleapis.com/androiddevelopers/…

bug: 30594087
Change-Id: I18e026c236d081b6bb510900e5928107105b93cd
 2016-08-02 14:14:08 -07:00
Jakub Pawlowski
d75f512aa2 GATT Server refactoring (2/4) 
Bug: 27999121
Change-Id: Ia5f91298a4b01b62adebc8adc30f27f757259588
 2016-08-02 20:45:06 +00:00
Ganesh Mahendran
7f7df65475 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>
 2016-08-02 19:33:26 +00:00
Mark Lu
fb48521f41 docs: add info to SharedPreferences.Editor.putString 
The information explains what happens when null is passed
as value parameter

Bug: 24696308
Change-Id: I362c2b1885e882312d1b4b2ff829f8f9f3546301
 2016-08-02 12:10:48 -07:00
Kevin Hufnagle
a5abfee3a5 Resolve merge conflicts of ffb4eb1 to nyc-dev 
Change-Id: I2f096fc31de12fb4e4715343854a5f09049e4221
 2016-08-02 11:11:22 -07:00
Shawn Willden
3f0526ea09 Fix @link tags in keystore doc 
Bug: 30258412
Change-Id: I370a53ebad29ff0471e4b7776cd76b2530efe760
(cherry picked from commit 9739d48a21)
 2016-08-02 16:45:06 +00:00
Joe Fernandez
ffb4eb1ef5 cherry-pick from nyc-dev: docs: SafeBrowsing API 
b/27438791

Change-Id: Ib7f93a7e95068c1909a3b104b83681e2d2f35ee6
Original-Change-Id: I14a34bbec51dc33dd4d730d59268690c9bee3992
 2016-08-02 09:40:39 -07:00
Tobias Thierer
8ad86a3d1a 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 4c79fea9ef)
Bug: 26291225
Change-Id: I35f352e5f28eafe4702da9eae587c3b65c360b3a
 2016-08-02 17:32:39 +01:00
Chad Brubaker
bd62098a54 Add stub isCTVerificationRequired methods 
Bug: 28746284
Change-Id: Iebeecba7356ac57fedb06d71de63aa9900f2ccd8
 2016-08-02 07:57:16 -07:00
Przemyslaw Szczepaniak
bc7820ec76 Track libcore change 0e393b4d628541e84e31210342f4103315c07e23 
Bug: 28666126
Change-Id: Ib63e14c5c72fd3a13f09a90358cb137e318a3653
 2016-08-02 12:01:07 +00:00
songjinshi
c5e249b9e0 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>
 2016-08-02 09:47:09 +08:00
Joe Fernandez
c7684332ae Merge "docs: Add ARC documentation TOC file" into nyc-dev 
am: 2b318b3a4e

Change-Id: I31072557343554054f7ce2163c2d0485bd36611c
 2016-08-02 00:38:51 +00:00
Joe Fernandez
65521ae7f7 docs: Add ARC documentation TOC file 
am: 129012530f

Change-Id: Ibd9b721fc87de52f81400936b6fbb8ad1f167fee
 2016-08-02 00:38:29 +00:00
Joe Fernandez
2b318b3a4e Merge "docs: Add ARC documentation TOC file" into nyc-dev 2016-08-02 00:25:18 +00:00
Kevin Hufnagle
e4fb88604b docs: Updated layout and timestamps of developer stories. am: 997ccdc071 
am: 4bb55d7103

Change-Id: Ia09d64994190df697fe25112e010d986937b267f
 2016-08-02 00:10:25 +00:00
Kevin Hufnagle
4bb55d7103 docs: Updated layout and timestamps of developer stories. 
am: 997ccdc071

Change-Id: I252e78ef43a7aaae469e014f4079a29d15978e9f
 2016-08-02 00:03:21 +00:00
Joe Fernandez
129012530f docs: Add ARC documentation TOC file 
b/30114799

Change-Id: I397f4712c82628f1b7aa4565fb5ab40381f9f5e2
 2016-08-01 17:00:11 -07:00
Kevin Hufnagle
ec9a6dfeb7 Merge "docs: Updated layout and timestamps of developer stories." into nyc-dev 
am: 7ba0b437cf

Change-Id: If6f86b8ffd2c614424822e33ec5f099b28881126
 2016-08-01 23:51:22 +00:00
Kevin Hufnagle
3b70cfa44e docs: Updated layout and timestamps of developer stories. 
am: f44fbe2b4e

Change-Id: I690a972dfac0d5b5d75489bbc9ce5d1c6341d45b
 2016-08-01 23:51:16 +00:00
Kevin Hufnagle
7ba0b437cf Merge "docs: Updated layout and timestamps of developer stories." into nyc-dev 2016-08-01 23:44:16 +00:00
Dan Willemsen
13990db24a Merge "Rename libprotobuf-cpp-lite_static to libprotobuf-cpp-lite" into stage-aosp-master 
am: da9d54c685

Change-Id: I3cdc3018c435112a768d1fa7d822154607eee90b
 2016-08-01 23:39:40 +00:00
Dan Willemsen
4ee22dd083 Rename libprotobuf-cpp-lite_static to libprotobuf-cpp-lite 
am: 2005edf642

Change-Id: I48dfa98a54a8680d091cbc403feb30bba35f2efd
 2016-08-01 23:39:34 +00:00
Dan Willemsen
da9d54c685 Merge "Rename libprotobuf-cpp-lite_static to libprotobuf-cpp-lite" into stage-aosp-master 2016-08-01 23:34:31 +00:00
Android Build Merger (Role)
1e35cb6025 Merge "Merge "libsigchain: intercept bsd_signal on lp32" am: 6eb30f2060 am: 4e3a78a5ff" into nyc-dev-plus-aosp 2016-08-01 22:59:22 +00:00
Dimitry Ivanov
c58ea7d777 Merge "libsigchain: intercept bsd_signal on lp32" am: 6eb30f2060 
am: 4e3a78a5ff

Change-Id: I4bbcc38612d49b9dbf81633a75b7f8054e0d7ffb
 2016-08-01 22:58:33 +00:00
Joe Fernandez
85b3c19fd3 Merge "cherry-pick from mnc-mr-docs: docs: SafeBrowsing API" into nyc-dev 
am: 30583c32e2

Change-Id: I67620241a6ad496436af3055bcbb88ec1c946894
 2016-08-01 22:57:43 +00:00
Joe Fernandez
e07150aff2 cherry-pick from mnc-mr-docs: docs: SafeBrowsing API 
am: 843f022c47

Change-Id: I2da29f13d230efef97218198e0efb3719d5d67c3
 2016-08-01 22:57:39 +00:00
Kevin Hufnagle
30583c32e2 Merge "cherry-pick from mnc-mr-docs: docs: SafeBrowsing API" into nyc-dev 2016-08-01 22:49:58 +00:00
Dimitry Ivanov
4e3a78a5ff Merge "libsigchain: intercept bsd_signal on lp32" 
am: 6eb30f2060

Change-Id: Iee2b7a8db495dd76bb6468a03e6cffd29a998cdf
 2016-08-01 22:46:55 +00:00
Treehugger Robot
6eb30f2060 Merge "libsigchain: intercept bsd_signal on lp32" 2016-08-01 22:39:16 +00:00
Dimitry Ivanov
4c5281862f 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
 2016-08-01 14:19:26 -07:00
Daniel Yu
d22cf801f8 Merge \"docs: Fixing incorrect div tags in l10n N docs\" into nyc-dev 
am: d70113bbd0

Change-Id: I88c4d8c78e53e0b3e3bbc82e873b200ac71604d7
 2016-08-01 19:51:49 +00:00
Daniel Yu
5af0def898 docs: Fixing incorrect div tags in l10n N docs 
am: 3629bc8854

Change-Id: Idd644fdd814351366bc29ae96d7b1079e87ea078
 2016-08-01 19:51:46 +00:00
Dan Yu
d70113bbd0 Merge "docs: Fixing incorrect div tags in l10n N docs" into nyc-dev 2016-08-01 19:44:33 +00:00
Joe Fernandez
843f022c47 cherry-pick from mnc-mr-docs: docs: SafeBrowsing API 
b/27438791

Change-Id: I14a34bbec51dc33dd4d730d59268690c9bee3992
Original-Change-Id: I00f4a374353dfb62cee44713ac5faadc0a9268d5
 2016-08-01 12:39:24 -07:00