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
Narayan Kamath
86437ec433 Merge "Process: Fix communication with zygote." into klp-dev am: 6829cf28e2 am: 8fdee85e87 am: 4cf5241f47 
am: efab128e67

Change-Id: I7159b2996f35311a630cdb7b2646c0e94d159c1f
 2016-08-18 10:23:23 +00:00
Narayan Kamath
b9fae65605 Process: Fix communication with zygote. am: 8e69dd2284 am: b85e9e9108 am: b56f4f53e1 -s ours 
am: 2984748753

Change-Id: Id9f73afcbc747e3e341c5cfa665e4929747fdbac
 2016-08-18 10:23:20 +00:00
Narayan Kamath
480f4a932e Merge "Process: Fix communication with zygote." into nyc-dev 
am: cce8af824a

Change-Id: I728529bd6e54b7e1e220b62f6c84dc5e868d5ecc
 2016-08-18 10:20:01 +00:00
Narayan Kamath
6bc7670c67 Process: Fix communication with zygote. 
am: 448be0a622

Change-Id: Iabb68084827f798f25ebe870957074d152acaea4
 2016-08-18 10:19:58 +00:00
Narayan Kamath
efab128e67 Merge "Process: Fix communication with zygote." into klp-dev am: 6829cf28e2 am: 8fdee85e87 
am: 4cf5241f47

Change-Id: Ibd736c16c8af9397e774c5abb917a9a3d31681a0
 2016-08-18 10:19:28 +00:00
Narayan Kamath
2984748753 Process: Fix communication with zygote. am: 8e69dd2284 am: b85e9e9108 
am: b56f4f53e1  -s ours

Change-Id: I67e1ff67c88d8c70a9d6d0698c857be77f09f534
 2016-08-18 10:16:48 +00:00
Narayan Kamath
cce8af824a Merge "Process: Fix communication with zygote." into nyc-dev 2016-08-18 10:14:31 +00:00
Narayan Kamath
8788a2413c Process: Fix communication with zygote. am: e29c6493c0 
am: 1bd43c162f

Change-Id: Ic38c43db48584b3d899e120fd65a4058d806a39f
 2016-08-18 09:58:45 +00:00
Narayan Kamath
4cf5241f47 Merge "Process: Fix communication with zygote." into klp-dev am: 6829cf28e2 
am: 8fdee85e87

Change-Id: I654191bebb88a8005e9f46ad8b8b1f932214b3c9
 2016-08-18 09:56:29 +00:00
Narayan Kamath
b56f4f53e1 Process: Fix communication with zygote. am: 8e69dd2284 
am: b85e9e9108

Change-Id: Ie4874c088e05f4f5bc2073661010d413e60b3f7b
 2016-08-18 09:56:24 +00:00
Narayan Kamath
1bd43c162f Process: Fix communication with zygote. 
am: e29c6493c0

Change-Id: I86b073f7f69943911aa0bea782e29ae6d86609a2
 2016-08-18 09:53:12 +00:00
Narayan Kamath
8fdee85e87 Merge "Process: Fix communication with zygote." into klp-dev 
am: 6829cf28e2

Change-Id: I740364ba90a8d1f14a5b2d2aacfe44948a4583d2
 2016-08-18 09:50:56 +00:00
Narayan Kamath
b85e9e9108 Process: Fix communication with zygote. 
am: 8e69dd2284

Change-Id: I3860d3f66e256a6446df5d8ce20f752d1c002e0f
 2016-08-18 09:50:52 +00:00
Narayan Kamath
6829cf28e2 Merge "Process: Fix communication with zygote." into klp-dev 2016-08-18 09:46:18 +00:00
Dmitriy Filchenko
eb349448aa Merge "Remove unused includes." am: 35da832634 
am: 33e65232f3

Change-Id: I72e74566ed21f4aed4b2d6b4fa6e7ac1114a9f43
 2016-08-18 03:27:54 +00:00
Dmitriy Filchenko
33e65232f3 Merge "Remove unused includes." 
am: 35da832634

Change-Id: I5804c0ccf6c543471ddf3245a799d5fa651d6d18
 2016-08-18 03:22:39 +00:00
Treehugger Robot
35da832634 Merge "Remove unused includes." 2016-08-18 03:17:04 +00:00
Dmitriy Filchenko
7310cc4880 Remove unused includes. 
BUG: 29824203

Change-Id: I795f8abe31575f70da263921c6ec13b73b24dc7b
 2016-08-18 01:45:11 +00:00
Jim Miller
7329e02153 Fix vulnerability in LockSettings service am: 2d71384a13 am: 485fbda04c am: 229de7088e am: cb83f6188b 
am: e3457fc127

Change-Id: I9ec3cc802112160f463fcfb737c6fd5932d62332
 2016-08-17 23:31:06 +00:00
Dirk Dougherty
ac2c1dde2d Merge "dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links." into nyc-dev 
am: 96855c49a6

Change-Id: If3b5e4b033c0038bddaf873108406c9374979c06
 2016-08-17 23:25:42 +00:00
Dirk Dougherty
1d7e5a6998 dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links. 
am: b042ab1eb6

Change-Id: I1c8026a7ff09cfce9049383123a143b845dcede6
 2016-08-17 23:25:38 +00:00
smain@google.com
eee3518d11 add workaround for annotations dependency conflict with espresso 
Change-Id: Ia5f06e35b034d207f19d061b27ddbecd66012130
 2016-08-17 16:23:30 -07:00
Jim Miller
e3457fc127 Fix vulnerability in LockSettings service am: 2d71384a13 am: 485fbda04c am: 229de7088e 
am: cb83f6188b

Change-Id: I82302931ab714e25ec21721dc05480e1f2d447b0
 2016-08-17 23:22:33 +00:00
Jim Miller
cb83f6188b Fix vulnerability in LockSettings service am: 2d71384a13 am: 485fbda04c 
am: 229de7088e

Change-Id: I8e9d946f96933c1338261d8adf80156cb67d3ba1
 2016-08-17 23:15:43 +00:00
Jim Miller
229de7088e Fix vulnerability in LockSettings service am: 2d71384a13 
am: 485fbda04c

Change-Id: I07def32199ecdbbb32aa6ecaca20724cfc81265c
 2016-08-17 23:07:46 +00:00
Jim Miller
485fbda04c Fix vulnerability in LockSettings service 
am: 2d71384a13

Change-Id: I62ca5fb150022fe0971329294b1063957f397248
 2016-08-17 22:59:27 +00:00
Dirk Dougherty
96855c49a6 Merge "dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links." into nyc-dev 2016-08-17 22:53:24 +00:00
Glenn Kasten
f7b4fd24e3 resolve merge conflicts of c76a3ac to stage-aosp-master 
am: 67ffd5e617

Change-Id: Ib2d89672efe8757edff320d5ed800b7b0293323b
 2016-08-17 21:07:54 +00:00
Hemal Patel
65813dff14 Docs: Fixed the Bluetooth guide link 
Fixed the link that points to the Bluetooth guide.

Bug: 29268546
Change-Id: I51c48cebf45c78481f8853a93ff7bcd8483d69ba
 2016-08-17 13:55:09 -07:00
Glenn Kasten
67ffd5e617 resolve merge conflicts of c76a3ac to stage-aosp-master 
Change-Id: Ifff16bdc42e8326f3f60cf4b92688c445cb4db25
 2016-08-17 13:28:04 -07:00
Hemal Patel
fbced4bfc7 Merge "Docs: Renamed Google Now to Google Voice Actions" into nyc-docs am: c7902aa4bb 
am: 5e086dc3bb

Change-Id: I78fcea831565d461550df03544531756c465ef1e
 2016-08-17 19:45:03 +00:00
Hemal Patel
413e261d9b Docs: Renamed Google Now to Google Voice Actions am: 86bbfaabdd 
am: 00ff40145d

Change-Id: I5d289bec45dbb6a3c0c6fba7ff760fa111aa6622
 2016-08-17 19:44:56 +00:00
Hemal Patel
5e086dc3bb Merge "Docs: Renamed Google Now to Google Voice Actions" into nyc-docs 
am: c7902aa4bb

Change-Id: I45943e80b869adc9017b0e8de116f10e3b710764
 2016-08-17 19:37:17 +00:00
Hemal Patel
00ff40145d Docs: Renamed Google Now to Google Voice Actions 
am: 86bbfaabdd

Change-Id: If177e10f331ca5ade62005337956b0fa81a90f26
 2016-08-17 19:37:14 +00:00
Hemal Patel
c7902aa4bb Merge "Docs: Renamed Google Now to Google Voice Actions" into nyc-docs 2016-08-17 19:32:16 +00:00
Chih-hung Hsieh
f121917e51 Merge "Fix google-explicit-constructor warnings in common_time." am: 67d47e0ca6 
am: 9b36ce973e

Change-Id: I8a9e9d09a48da636a8256aec1c0000441d986d4e
 2016-08-17 18:18:22 +00:00
Eric Schmidt
2367fb1c56 docs: Fixed code snippet in notify-user/navigation.html am: 32cc6b7fb7 
am: 39cc61a4db

Change-Id: I68dd3b9ebc95fe57fe9e4553f87774c69bb10df1
 2016-08-17 18:06:55 +00:00
Chih-hung Hsieh
9b36ce973e Merge "Fix google-explicit-constructor warnings in common_time." 
am: 67d47e0ca6

Change-Id: I2548e50d2654d3dfacd175b4db118983848bf15c
 2016-08-17 18:06:22 +00:00
Glenn Kasten
c76a3ac224 Merge "Squashed commit of the following:" 2016-08-17 18:02:53 +00:00
Android Build Merger (Role)
8fa05abfab Merge "Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into stage-aosp-master am: 6f15eabd29" into nyc-dev-plus-aosp 2016-08-17 17:54:59 +00:00
Android Build Merger (Role)
d604595820 Merge "docs: Fixed code snippet in notify-user/navigation.html am: 32cc6b7fb7 am: c89c8c3e37" into nyc-dev-plus-aosp 2016-08-17 17:54:52 +00:00
Eric Schmidt
97b75e6ce9 docs: Fixed code snippet in notify-user/navigation.html am: 32cc6b7fb7 
am: c89c8c3e37

Change-Id: I0193239ada03ca2e5bc5ab856f778f69a691b325
 2016-08-17 17:54:21 +00:00
Tobias Thierer
150ab094ed Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into stage-aosp-master 
am: 6f15eabd29

Change-Id: Ic1c3c789ffdc7b9d1f59faea6292c8f3489e8ad4
 2016-08-17 17:54:12 +00:00
Tobias Thierer
900471ab11 Revert "Revert "Track libcore update of Map classes to jdk8u60"" 
am: 7f5095ddfe

Change-Id: I815b5c9b5620fb1fc9f18dd6b0bb0d185c114410
 2016-08-17 17:54:08 +00:00
Andrew Solovay
39cc61a4db docs: Docs for Support Library 24.2.0 release 
am: 085994c40d

Change-Id: I7e69bf585d342f1075856673e52ff15207be4a1c
 2016-08-17 17:48:47 +00:00
Chih-hung Hsieh
67d47e0ca6 Merge "Fix google-explicit-constructor warnings in common_time." 2016-08-17 17:42:52 +00:00
Tobias Thierer
6f15eabd29 Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into stage-aosp-master 2016-08-17 17:38:48 +00:00
Eric Schmidt
c89c8c3e37 docs: Fixed code snippet in notify-user/navigation.html 
am: 32cc6b7fb7

Change-Id: I43cf6d188bac5cc5b3d0894915ff431e13156cd5
 2016-08-17 17:14:11 +00:00
Tobias Thierer
7f5095ddfe 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 7783213611.

Change-Id: I16e1d94351ccf7cc1aeb8f9905410cd23514e8ff
 2016-08-17 17:11:01 +00:00
Phil Burk
4317410c40 Merge "UsbMidiDevice: fix MIDI flush()" am: c5b376ab66 
am: 86fbbfb6f0

Change-Id: I938d0365abffe9cb05a7c10d80562e3742290853
 2016-08-17 17:03:47 +00:00