Josh Gao
3ddc5e7d6d
resolve merge conflicts of 9515c23e16
to klp-modular-dev am: 91b48c3796
-s ours am: adc3bcb1d5
am: 7e10520392
am: b97b07e55b
am: c663d0482b
am: 92e0f8f49d
am: 65f7b2d616
...
am: f25e2dfd3f
* commit 'f25e2dfd3f441b6cfbee30a18bb5507dee28349a':
debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
2016-02-24 22:20:48 +00:00
Josh Gao
f25e2dfd3f
resolve merge conflicts of 9515c23e16
to klp-modular-dev am: 91b48c3796
-s ours am: adc3bcb1d5
am: 7e10520392
am: b97b07e55b
am: c663d0482b
am: 92e0f8f49d
...
am: 65f7b2d616
* commit '65f7b2d6169a2a61fe1d607ca55e690721faf31a':
debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
2016-02-24 22:14:05 +00:00
Josh Gao
65f7b2d616
resolve merge conflicts of 9515c23e16
to klp-modular-dev am: 91b48c3796
-s ours am: adc3bcb1d5
am: 7e10520392
am: b97b07e55b
am: c663d0482b
...
am: 92e0f8f49d
* commit '92e0f8f49d952b365b2be7715a4320d2451d7a67':
debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
2016-02-24 22:06:23 +00:00
Josh Gao
92e0f8f49d
resolve merge conflicts of 9515c23e16
to klp-modular-dev am: 91b48c3796
-s ours am: adc3bcb1d5
am: 7e10520392
am: b97b07e55b
...
am: c663d0482b
* commit 'c663d0482b67d028e5b30dbe5f45ef7da2b3e5de':
debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
2016-02-24 21:59:21 +00:00
Josh Gao
c663d0482b
resolve merge conflicts of 9515c23e16
to klp-modular-dev am: 91b48c3796
-s ours am: adc3bcb1d5
am: 7e10520392
...
am: b97b07e55b
* commit 'b97b07e55b4ef4312870398bf658b30b41103403':
debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
2016-02-24 21:52:52 +00:00
Josh Gao
b97b07e55b
resolve merge conflicts of 9515c23e16
to klp-modular-dev am: 91b48c3796
-s ours am: adc3bcb1d5
...
am: 7e10520392
* commit '7e105203923041986a1bd125d86495663fee3abf':
debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
2016-02-24 21:37:04 +00:00
Josh Gao
7e10520392
resolve merge conflicts of 9515c23e16
to klp-modular-dev am: 91b48c3796
-s ours
...
am: adc3bcb1d5
* commit 'adc3bcb1d5e4426273223e0889c7f207abb240f2':
debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
2016-02-24 21:30:36 +00:00
Josh Gao
adc3bcb1d5
resolve merge conflicts of 9515c23e16
to klp-modular-dev
...
am: 91b48c3796
-s ours
* commit '91b48c37962238e3568d6660aeadfcd4d6eb4207':
debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
2016-02-24 21:23:55 +00:00
Nick Kralevich
4a843ec4e4
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
am: c61a896f20
-s ours am: d61ebb0851
am: 75ccd732f3
-s ours am: 505a431468
am: b760e61686
-s ours am: d5cb8b417b
am: 77dd50b470
...
am: 89c789ae47
* commit '89c789ae47031eb6bde161991005f7a6e8198556':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 21:06:44 +00:00
Nick Kralevich
89c789ae47
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
am: c61a896f20
-s ours am: d61ebb0851
am: 75ccd732f3
-s ours am: 505a431468
am: b760e61686
-s ours am: d5cb8b417b
...
am: 77dd50b470
* commit '77dd50b4707b0b2b12d4ca136d8c0529d18eedc1':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 20:57:19 +00:00
Josh Gao
91b48c3796
resolve merge conflicts of 9515c23e16
to klp-modular-dev
...
Change-Id: I4b39875ce57bb1ea55898db3ffc004a491bbeaa4
2016-02-24 12:08:28 -08:00
Josh Gao
f740908c5b
Don\'t create tombstone directory. am: cb9625cbe5
am: 99b8a56616
am: 0cf99e2b61
am: 338f1802ee
am: 3ee4a0be2a
am: 7f0d750b2d
...
am: 41f72f0537
* commit '41f72f05370fd7fa651131daec5ecd4e89afc9f5':
Don't create tombstone directory.
2016-02-24 19:56:08 +00:00
Nick Kralevich
9b26997a1f
ensure /data/tombstones exists on all Android devices am: e2796207ee
am: 9660c6759e
am: 4d4eb0db97
am: 6d7ce7b14c
am: 077a9ffe40
am: bf8ace32ef
...
am: a03485daa5
* commit 'a03485daa5491b4315d01d0ef881c4876882db54':
ensure /data/tombstones exists on all Android devices
2016-02-24 19:56:00 +00:00
Nick Kralevich
77dd50b470
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
am: c61a896f20
-s ours am: d61ebb0851
am: 75ccd732f3
-s ours am: 505a431468
am: b760e61686
-s ours
...
am: d5cb8b417b
* commit 'd5cb8b417bd938d9c1ef1262df88ed3d90706301':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 19:55:37 +00:00
Josh Gao
41f72f0537
Don\'t create tombstone directory. am: cb9625cbe5
am: 99b8a56616
am: 0cf99e2b61
am: 338f1802ee
am: 3ee4a0be2a
...
am: 7f0d750b2d
* commit '7f0d750b2d8907816b3d9b171f2eebda38be6e03':
Don't create tombstone directory.
2016-02-24 19:49:23 +00:00
Nick Kralevich
a03485daa5
ensure /data/tombstones exists on all Android devices am: e2796207ee
am: 9660c6759e
am: 4d4eb0db97
am: 6d7ce7b14c
am: 077a9ffe40
...
am: bf8ace32ef
* commit 'bf8ace32efb4903642b0e372a5fe939685686467':
ensure /data/tombstones exists on all Android devices
2016-02-24 19:49:12 +00:00
Nick Kralevich
d5cb8b417b
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
am: c61a896f20
-s ours am: d61ebb0851
am: 75ccd732f3
-s ours am: 505a431468
...
am: b760e61686
-s ours
* commit 'b760e61686e592eb268ffe667e6c164b0aa29f47':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 19:48:55 +00:00
Nick Kralevich
b760e61686
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
am: c61a896f20
-s ours am: d61ebb0851
am: 75ccd732f3
-s ours
...
am: 505a431468
* commit '505a43146861f5e5f3852b2cb47ff8af54d04b75':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 19:43:01 +00:00
Josh Gao
7f0d750b2d
Don\'t create tombstone directory. am: cb9625cbe5
am: 99b8a56616
am: 0cf99e2b61
am: 338f1802ee
...
am: 3ee4a0be2a
* commit '3ee4a0be2ae8b21a2235278c88d40b4feb3ddd08':
Don't create tombstone directory.
2016-02-24 19:37:01 +00:00
Nick Kralevich
bf8ace32ef
ensure /data/tombstones exists on all Android devices am: e2796207ee
am: 9660c6759e
am: 4d4eb0db97
am: 6d7ce7b14c
...
am: 077a9ffe40
* commit '077a9ffe402c0776328bd5a4e85230bba458dc47':
ensure /data/tombstones exists on all Android devices
2016-02-24 19:36:45 +00:00
Josh Gao
3ee4a0be2a
Don\'t create tombstone directory. am: cb9625cbe5
am: 99b8a56616
am: 0cf99e2b61
...
am: 338f1802ee
* commit '338f1802ee7d87bb4ea2f3fe9ef1c72e1784188b':
Don't create tombstone directory.
2016-02-24 19:31:16 +00:00
Nick Kralevich
505a431468
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
am: c61a896f20
-s ours am: d61ebb0851
...
am: 75ccd732f3
-s ours
* commit '75ccd732f3fef68fc568d96d00a412920798f55c':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 19:31:07 +00:00
Nick Kralevich
077a9ffe40
ensure /data/tombstones exists on all Android devices am: e2796207ee
am: 9660c6759e
am: 4d4eb0db97
...
am: 6d7ce7b14c
* commit '6d7ce7b14c906eff4488bddb0338a38f57eac1de':
ensure /data/tombstones exists on all Android devices
2016-02-24 19:31:04 +00:00
Josh Gao
338f1802ee
Don\'t create tombstone directory. am: cb9625cbe5
am: 99b8a56616
...
am: 0cf99e2b61
* commit '0cf99e2b618ac5c8a495f607b1978fcd9e3ee827':
Don't create tombstone directory.
2016-02-24 19:25:50 +00:00
Nick Kralevich
75ccd732f3
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
am: c61a896f20
-s ours
...
am: d61ebb0851
* commit 'd61ebb085172200c02af73e030646baf3301028c':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 19:25:39 +00:00
Nick Kralevich
6d7ce7b14c
ensure /data/tombstones exists on all Android devices am: e2796207ee
am: 9660c6759e
...
am: 4d4eb0db97
* commit '4d4eb0db978bca41727ed21406da42332367de7d':
ensure /data/tombstones exists on all Android devices
2016-02-24 19:25:38 +00:00
Nick Kralevich
d61ebb0851
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
...
am: c61a896f20
-s ours
* commit 'c61a896f2006d76fd3d805ace2282b9590432a67':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 19:18:41 +00:00
Josh Gao
0cf99e2b61
Don\'t create tombstone directory. am: cb9625cbe5
...
am: 99b8a56616
* commit '99b8a5661614c3b973ab421ecff4ae40249c1579':
Don't create tombstone directory.
2016-02-24 19:11:53 +00:00
Nick Kralevich
4d4eb0db97
ensure /data/tombstones exists on all Android devices am: e2796207ee
...
am: 9660c6759e
* commit '9660c6759e165ddbc91f823672ba9631199ae9dc':
ensure /data/tombstones exists on all Android devices
2016-02-24 19:11:42 +00:00
Nick Kralevich
c61a896f20
ensure /data/tombstones exists on all Android device. DO NOT MERGE
...
am: 9c0ed66313
* commit '9c0ed663138138bb40396bfd350f137e5057277b':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 19:11:38 +00:00
Josh Gao
99b8a56616
Don\'t create tombstone directory.
...
am: cb9625cbe5
* commit 'cb9625cbe54f009c216a1f50fcaee15ee3478357':
Don't create tombstone directory.
2016-02-24 19:05:34 +00:00
Nick Kralevich
9660c6759e
ensure /data/tombstones exists on all Android devices
...
am: e2796207ee
* commit 'e2796207ee5a1ff2ebea30bdcf6d2c2553546b86':
ensure /data/tombstones exists on all Android devices
2016-02-24 19:05:12 +00:00
William Luh
041cb4aa55
Add macro to call event logger for errors. DO NOT MERGE am: 769cba57e4
-s ours am: 43c0f28c11
am: ec0d1037ab
...
am: 785f82c09d
* commit '785f82c09d113126e6575d257df2bbf8b0823afe':
Add macro to call event logger for errors. DO NOT MERGE
2016-02-24 03:01:13 +00:00
William Luh
785f82c09d
Add macro to call event logger for errors. DO NOT MERGE am: 769cba57e4
-s ours am: 43c0f28c11
...
am: ec0d1037ab
* commit 'ec0d1037ab53465734934f2c91a5e0c015881633':
Add macro to call event logger for errors. DO NOT MERGE
2016-02-24 02:54:36 +00:00
William Luh
ec0d1037ab
Add macro to call event logger for errors. DO NOT MERGE am: 769cba57e4
-s ours
...
am: 43c0f28c11
* commit '43c0f28c1135bd1f1640441e3fa259be04aa04b0':
Add macro to call event logger for errors. DO NOT MERGE
2016-02-24 02:46:27 +00:00
William Luh
43c0f28c11
Add macro to call event logger for errors. DO NOT MERGE
...
am: 769cba57e4
-s ours
* commit '769cba57e446be099c792516486a304a18ee2952':
Add macro to call event logger for errors. DO NOT MERGE
2016-02-24 02:39:45 +00:00
William Luh
769cba57e4
Add macro to call event logger for errors. DO NOT MERGE
...
Bug:23180694
Change-Id: I566a290334345f48013029534efef3e08e726e40
2016-02-23 16:04:34 -08:00
Mohamad Ayyash
1dec743e01
Add CASIO to approved vendor IDs
...
am: 6c48349dee
* commit '6c48349deec6d7b6e654067416790fe16c69c28e':
Add CASIO to approved vendor IDs
2016-02-17 07:01:15 +00:00
Mohamad Ayyash
6c48349dee
Add CASIO to approved vendor IDs
...
BUG: 27021418
Change-Id: I083447d3555891db4fced2171a0a747882c4435a
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2016-02-16 20:14:01 -08:00
Josh Gao
cb9625cbe5
Don't create tombstone directory.
...
Partial backport of cf79748.
Bug: http://b/26403620
Change-Id: Ib877ab6cfab6aef079830c5a50ba81141ead35ee
2016-02-16 15:09:46 -08:00
Nick Kralevich
e2796207ee
ensure /data/tombstones exists on all Android devices
...
/data/tombstones is referenced by core platform code, but is not
guaranteed to exist on all Android devices. Move the directory
creation out of device specific files and into the core
init.rc file.
Bug: https://code.google.com/p/android/issues/detail?id=93207
Change-Id: I94ae5199a6a32c4fe555ca994fc4a8345e0c9690
Bug: http://b/26403620
(cherry picked from commit 0359d778a5
)
2016-02-16 15:09:43 -08:00
Josh Gao
9515c23e16
debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
...
Effectively a cherry-pick of 04f9b2a
.
Bug: http://b/26403620
Change-Id: I0437fdc774501f428d8b4f8dd7682b32eaa29cef
2016-02-16 15:07:35 -08:00
Nick Kralevich
9c0ed66313
ensure /data/tombstones exists on all Android device. DO NOT MERGE
...
/data/tombstones is referenced by core platform code, but is not
guaranteed to exist on all Android devices. Move the directory
creation out of device specific files and into the core
init.rc file.
Bug: https://code.google.com/p/android/issues/detail?id=93207
Change-Id: I94ae5199a6a32c4fe555ca994fc4a8345e0c9690
Bug: http://b/26403620
(cherry picked from commit 0359d778a5
)
2016-02-16 15:07:29 -08:00
Jeff Sharkey
77a3c8fccd
Re-derive permissions after package changes. am: a44febd19b
...
am: 36a6835aa5
* commit '36a6835aa5c40c5a83400c2fb162bd6fd5c5f878':
Re-derive permissions after package changes.
2016-02-14 22:39:02 +00:00
Jeff Sharkey
36a6835aa5
Re-derive permissions after package changes.
...
am: a44febd19b
* commit 'a44febd19b4efd17fe31d75c964ec47f85832a2a':
Re-derive permissions after package changes.
2016-02-14 22:28:35 +00:00
Jeff Sharkey
a44febd19b
Re-derive permissions after package changes.
...
When packages change, existing package-specific directories may have
gained/lost a UID mapping, so we need to update the permissions for
any in-memory nodes.
This allows an app to deliver data for another package before that
package is installed, which is the typical pattern of how OBB files
are delivered.
Also fix bug by re-deriving permissions when files are moved.
Bug: 25399427
Change-Id: I06f38a24ad7dee5f5099ba81429aef03208e5683
(cherry picked from commit f7aad11c1c
)
2016-02-12 20:37:05 +00:00
Thierry Strudel
b84295d027
Merge "[DO NOT MERGE] Use FUSE_SHORTCIRCUIT if available" into mnc-dr1.5-dev
2016-01-14 00:32:01 +00:00
Thierry Strudel
ac5175f9a6
[DO NOT MERGE] Use FUSE_SHORTCIRCUIT if available
...
Use a non yet maintainer reviewed kernel patch from QCOM that greatly
improves IO speed in case it is available from the device specific
kernel headers.
Bug: 24216004
Change-Id: I4101d80082c9ad9d042dde5c620ddb309d193d52
2016-01-13 15:11:35 -08:00
Ching Tzung Lin
905ad1d3e7
Mount debugfs earlier regardless build variant
...
am: df2d782368
* commit 'df2d78236834f5f6a99e88c8cd629b09d8292bb6':
Mount debugfs earlier regardless build variant
2016-01-11 22:50:00 +00:00
Ching Tzung Lin
df2d782368
Mount debugfs earlier regardless build variant
...
ag/835596 can be reverted after this CL is merged.
BUG:26455292
Change-Id: I453b0f1d08d822f8cd2d4d33f1c1b21f0d7f543a
2016-01-11 13:00:22 -08:00