Commit graph

24997 commits

Author SHA1 Message Date
Damien Bargiacchi
789d4c65b4 Merge "Update to new minui text API" into cw-f-dev
am: d69818c53c

Change-Id: Iaba2b147e6a41745b771d57fda1b507bbd0a93bb
2016-08-24 20:45:21 +00:00
Damien Bargiacchi
ada99f91b0 Update to new minui text API
am: 0ee524de68

Change-Id: I19341d2639b6efeb13eddaae1083252eeafc77fc
2016-08-24 20:45:17 +00:00
Damien Bargiacchi
d69818c53c Merge "Update to new minui text API" into cw-f-dev 2016-08-24 20:36:36 +00:00
Mark Salyzyn
e5bda4d0ec Merge "liblog: add __android_log_close()" am: 812d1c7ea2 am: 6322efe522
am: ed421af68d

Change-Id: Ifacd3de810c30a9b79cb262ab4c2432d8b1c0791
2016-08-24 16:10:09 +00:00
Mark Salyzyn
af3623281f Merge "logger: validate hdr_size field in logger entry" am: fcf7ab8b1b am: 2d562c9dce
am: 098b5887c6

Change-Id: I4d067039a766e7079a91eb56d2ffb8d68aba58b5
2016-08-24 16:10:08 +00:00
Mark Salyzyn
ed421af68d Merge "liblog: add __android_log_close()" am: 812d1c7ea2
am: 6322efe522

Change-Id: Ib61d4ec5102fcfb12c48250c019fcdf019c2ffc5
2016-08-24 16:07:39 +00:00
Mark Salyzyn
098b5887c6 Merge "logger: validate hdr_size field in logger entry" am: fcf7ab8b1b
am: 2d562c9dce

Change-Id: I5721e8614079a04c2dc364304d0ffed10d74be90
2016-08-24 16:07:38 +00:00
Mark Salyzyn
6322efe522 Merge "liblog: add __android_log_close()"
am: 812d1c7ea2

Change-Id: I2ba5ed22e78564a864bab6b550b6d2bd2609a629
2016-08-24 16:05:05 +00:00
Mark Salyzyn
2d562c9dce Merge "logger: validate hdr_size field in logger entry"
am: fcf7ab8b1b

Change-Id: Ic88fe616256ab4949040771d3bed1dfb823ab981
2016-08-24 16:05:04 +00:00
Treehugger Robot
812d1c7ea2 Merge "liblog: add __android_log_close()" 2016-08-24 15:58:48 +00:00
Treehugger Robot
fcf7ab8b1b Merge "logger: validate hdr_size field in logger entry" 2016-08-24 15:56:23 +00:00
Mark Salyzyn
8e5cb037c4 Merge "libcutils: Add ashmem_valid() function" am: d00c7470ea am: 8b1f7b595c
am: da07f7880c

Change-Id: I3a4cf9a2cd848aae04ec3e88ae1e50a51774cd5f
2016-08-24 15:54:08 +00:00
Mark Salyzyn
da07f7880c Merge "libcutils: Add ashmem_valid() function" am: d00c7470ea
am: 8b1f7b595c

Change-Id: I1be0fc5d74c609ec42578c29c7af9d897708f8c6
2016-08-24 15:51:08 +00:00
Mark Salyzyn
8b1f7b595c Merge "libcutils: Add ashmem_valid() function"
am: d00c7470ea

Change-Id: Ib09d3ee7bb131c30f59ea273f357c045394206fb
2016-08-24 15:48:55 +00:00
Treehugger Robot
d00c7470ea Merge "libcutils: Add ashmem_valid() function" 2016-08-24 15:39:06 +00:00
Elliott Hughes
0426ecaf82 Merge "Most accept/accept4 calls in system/core don't actually want the remote address." am: 299d64144b am: 8615d79d85
am: 66e5e2432a

Change-Id: I5d7b98fa3e9c2d8c16a1aa73e3d5a197dc150c2b
2016-08-23 23:14:44 +00:00
Elliott Hughes
66e5e2432a Merge "Most accept/accept4 calls in system/core don't actually want the remote address." am: 299d64144b
am: 8615d79d85

Change-Id: I89aeabf6efa8217c9acd3f8a766bbd18f7e994fa
2016-08-23 23:05:59 +00:00
Elliott Hughes
8615d79d85 Merge "Most accept/accept4 calls in system/core don't actually want the remote address."
am: 299d64144b

Change-Id: I3fb9678dfed08f0b1d6e90e547ecae6cdcabc9a1
2016-08-23 23:03:20 +00:00
Treehugger Robot
299d64144b Merge "Most accept/accept4 calls in system/core don't actually want the remote address." 2016-08-23 22:48:24 +00:00
Mark Salyzyn
ee431112ff libcutils: Add ashmem_valid() function
Bug: 30310689
Change-Id: I14c52c5d52745a725799652b87c86281ac214899
2016-08-23 15:29:28 -07:00
Mark Salyzyn
df7a4c6bae liblog: add __android_log_close()
Bug: 30963384
Change-Id: I901e6ac2cc3c601bbecc2d64e00a98e2ab448210
2016-08-23 15:25:03 -07:00
Mark Salyzyn
305374cf0f logger: validate hdr_size field in logger entry
- check hdr_size to make sure it is in the expected range
  from sizeof entry_v1 to entry (entry_v4).
- alter msg() method to report NULL on invalid hdr_size
- alter all users of msg() method.

Bug: 30947841
Change-Id: I9bc1740d7aa9f37df5be966c18de1fb9de63d5dd
2016-08-23 14:51:50 -07:00
Josh Gao
cc20f90d28 Merge "debuggerd: don't display fault addr for manually sent signals." am: ad52cbb9ec am: 504d4ccd7c
am: c8146aa39f

Change-Id: I792cceaf92e2d9865217a00f433fabf295c40035
2016-08-23 21:27:23 +00:00
Josh Gao
c8146aa39f Merge "debuggerd: don't display fault addr for manually sent signals." am: ad52cbb9ec
am: 504d4ccd7c

Change-Id: Iac8f64e01b5dd3fa9ab6e34c2c151800142ccc69
2016-08-23 21:24:53 +00:00
Josh Gao
504d4ccd7c Merge "debuggerd: don't display fault addr for manually sent signals."
am: ad52cbb9ec

Change-Id: I34284b398c32dbdfe2074d44d316f81fc45deee8
2016-08-23 21:23:15 +00:00
Treehugger Robot
ad52cbb9ec Merge "debuggerd: don't display fault addr for manually sent signals." 2016-08-23 21:03:18 +00:00
Elliott Hughes
fc04dce0f1 Merge "debuggerd: set SOCK_NONBLOCK in accept rather than later." am: 82b67fff06 am: 0d2ef3dc86
am: 50a99aa6cb

Change-Id: Id66bc64ba1aee8c12f8609bc6013a59f6e95ccad
2016-08-23 20:14:01 +00:00
Elliott Hughes
50a99aa6cb Merge "debuggerd: set SOCK_NONBLOCK in accept rather than later." am: 82b67fff06
am: 0d2ef3dc86

Change-Id: Ie8ae5707455f4d1741ca87ef515ea9a142e05aa5
2016-08-23 20:10:01 +00:00
Elliott Hughes
0d2ef3dc86 Merge "debuggerd: set SOCK_NONBLOCK in accept rather than later."
am: 82b67fff06

Change-Id: I6f2e72a4847fbfac8e1ba78321be7e026f7629bd
2016-08-23 20:05:48 +00:00
Elliott Hughes
3dcfa3fb1c Most accept/accept4 calls in system/core don't actually want the remote address.
So don't write the extra code for it or waste the kernel's time
copying it around.

Change-Id: I93de64064c2d4fe58ba5b5322cfa69bf31a76dad
2016-08-23 12:50:00 -07:00
Elliott Hughes
82b67fff06 Merge "debuggerd: set SOCK_NONBLOCK in accept rather than later." 2016-08-23 19:35:54 +00:00
Josh Gao
344ca5a681 debuggerd: don't display fault addr for manually sent signals.
Bug: http://b/30819045
Change-Id: Ic8ab21298dcba6acdfa876e7c729b14b0bf2afbb
Test: `killall -TRAP surfaceflinger` no longer shows fault addr,
      crasher still does
2016-08-23 12:31:14 -07:00
Daniel Rosenberg
9f0c6916c7 resolve merge conflicts of 852a4c7 to nyc-mr1-dev-plus-aosp
Change-Id: Ifc076749b4e23af00e0c900a28dfe770adb3e6b6
2016-08-22 22:42:42 -07:00
Daniel Rosenberg
10c50f4c50 Merge "DO NOT MERGE: Fix bug in product path building" into nyc-mr1-dev am: b7dece1b0e
am: d8c1fbc1ef

Change-Id: I04a41127683f45362adc999719a594b2977a8d7e
2016-08-23 05:25:32 +00:00
Daniel Rosenberg
ff1a7ac68b DO NOT MERGE: Fix bug in product path building am: 9914284d6a
am: a792c4cd7c  -s ours

Change-Id: I109f392ebca3d4b09993b8a60c9edade3ae554f1
2016-08-23 05:20:03 +00:00
Daniel Rosenberg
852a4c761d resolve merge conflicts of 40eff95 to stage-aosp-master
am: 559cc01e3e

Change-Id: Ief493c828bc7e03967a2bb5d439a7a4fd638a253
2016-08-23 04:32:30 +00:00
Daniel Rosenberg
d8c1fbc1ef Merge "DO NOT MERGE: Fix bug in product path building" into nyc-mr1-dev
am: b7dece1b0e

Change-Id: I0e4a5e3eae67fe97b26925e5eeb0eeb0a70c979d
2016-08-23 04:30:35 +00:00
Daniel Rosenberg
a792c4cd7c DO NOT MERGE: Fix bug in product path building
am: 9914284d6a

Change-Id: I94410e65b1e1bbdf05cddf7cbf11f9b946f64dd5
2016-08-23 04:30:33 +00:00
Daniel Rosenberg
b7dece1b0e Merge "DO NOT MERGE: Fix bug in product path building" into nyc-mr1-dev 2016-08-23 03:54:35 +00:00
Daniel Rosenberg
559cc01e3e resolve merge conflicts of 40eff95 to stage-aosp-master
Change-Id: I91935ba9603ffd41af2009adc13a024701619c52
2016-08-22 20:13:52 -07:00
Daniel Rosenberg
40eff9534e Merge changes I9f380f31,Ieab6bed7,Ia870e4be,I939b1e01,I8b723dda
* changes:
  Add skip-secondary flag
  Switch fastboot to new A/B spec
  Add Fastboot support for flashing secondary images
  Handle invalid suffix lists
  Call set_active after flashall and update
2016-08-23 02:18:33 +00:00
Elliott Hughes
5ac94687b5 Merge "liblog: use SOCK_NONBLOCK directly." am: fca43d3ec5 am: 33f8c194f9
am: 694b4880d8

Change-Id: I5e0fe80e9178978fa1760dfb90b9767667faeca3
2016-08-23 01:24:24 +00:00
Josh Gao
5bb5dd0eb6 Merge "adb: increase the authentication throttling limit." am: 393e5258f6 am: e4d79532de
am: a2408aaf2f

Change-Id: Ibc53b45c09cc4462175d52daa532ff305ce19145
2016-08-23 01:24:23 +00:00
Elliott Hughes
694b4880d8 Merge "liblog: use SOCK_NONBLOCK directly." am: fca43d3ec5
am: 33f8c194f9

Change-Id: I742833b2933d1ab17543839f9749a7c4d7f13944
2016-08-23 01:23:29 +00:00
Elliott Hughes
33f8c194f9 Merge "liblog: use SOCK_NONBLOCK directly."
am: fca43d3ec5

Change-Id: I4d959d9091adbf8bf2d7b68653a3c6064893a65a
2016-08-23 01:20:36 +00:00
Josh Gao
a2408aaf2f Merge "adb: increase the authentication throttling limit." am: 393e5258f6
am: e4d79532de

Change-Id: I4a0b0700cdee5f3b0e1577132080860402318851
2016-08-23 01:18:03 +00:00
Josh Gao
e4d79532de Merge "adb: increase the authentication throttling limit."
am: 393e5258f6

Change-Id: I483cf75ced8d9fb896c2f5e417d258970d7cabb1
2016-08-23 01:11:28 +00:00
Treehugger Robot
fca43d3ec5 Merge "liblog: use SOCK_NONBLOCK directly." 2016-08-23 01:08:18 +00:00
Daniel Rosenberg
9914284d6a DO NOT MERGE: Fix bug in product path building
-p <product> was failing to find the product image files since
get_my_path's result was ignored. As it was, it would only work
if you happened to call it from $OUT.

Change-Id: Id4183cb7fafb313c0b1feff93d7e22fd4658d267
Bug: 31022767
2016-08-23 00:26:19 +00:00
Treehugger Robot
393e5258f6 Merge "adb: increase the authentication throttling limit." 2016-08-23 00:12:52 +00:00