Jocelyn Bohr
db1accde79
Merge changes I5b1a1ce0,I483a18f9 am: 9349b72a67 am: 4cd2da28ff
...
am: 1bd50f6a98
2017-04-28 18:56:58 +00:00
Jocelyn Bohr
1bd50f6a98
Merge changes I5b1a1ce0,I483a18f9 am: 9349b72a67
...
am: 4cd2da28ff
2017-04-28 18:43:56 +00:00
Jocelyn Bohr
4cd2da28ff
Merge changes I5b1a1ce0,I483a18f9
...
am: 9349b72a67
2017-04-28 18:42:27 +00:00
Treehugger Robot
9349b72a67
Merge changes I5b1a1ce0,I483a18f9
...
* changes:
fastboot: Add 'get_staged' command
fastboot: Add 'stage' command
2017-04-28 18:34:08 +00:00
Keun-young Park
4de31e1481
combine wait for exec log with service exit log
...
- allows easier tracking of wait time from monitoring tools
- this change also reduces unnecessary log spam
- service exit log looks like this:
init: Service 'exec 4 (/system/bin/otapreopt_slot)' (pid 611) exited with status 0 waiting took 0.060771 seconds
bug: 37752410
Test: reboot and check log
Change-Id: I122902538697f33939eede548e39f155ec419e03
2017-04-28 11:20:12 -07:00
Paul Lawrence
2bf87eebe4
Enable metadata encryption
...
Bug: 26778031
Test: Boots, reboots, sector 0 of userdata encrypted
Make sure an FDE device, both default and password protected,
boots.
Make sure an FBE device without metadata encryption boots.
Change-Id: I55135f2d81002f4010a857c021ee840f792f7917
2017-04-28 17:26:30 +00:00
Abodunrinwa Toki
7716d5f969
Merge "Initialize textclassifier model update directory" into oc-dev am: 49f9b4c0d0 -s ours
...
am: 76018921ae
2017-04-28 15:39:59 +00:00
Josh Gao
87e7c31187
debuggerd_handler: don't assume that abort message implies fatal. am: 5fd02a8dbc
...
am: cc94c5d57d
2017-04-28 15:39:43 +00:00
Abodunrinwa Toki
76018921ae
Merge "Initialize textclassifier model update directory" into oc-dev
...
am: 49f9b4c0d0
2017-04-28 15:36:30 +00:00
Josh Gao
cc94c5d57d
debuggerd_handler: don't assume that abort message implies fatal.
...
am: 5fd02a8dbc
2017-04-28 15:36:12 +00:00
Abodunrinwa Toki
49f9b4c0d0
Merge "Initialize textclassifier model update directory" into oc-dev
2017-04-28 15:31:05 +00:00
Bowgo Tsai
359bed3615
fs_mgr: code clean up
...
- Returns FS_MGR_MNTALL_FAIL for failure paths in fs_mgr_mount_all()
- Removes the 'goto out' in fs_mgr_do_mount() as there is nothing to do in
the 'out' label now. Also removes the "ret = FS_MGR_DOMNT_FAILED;" and
just return FS_MGR_DOMNT_FAILED directly for the default failure path.
- Changes some LERROR to PERROR
Test: Use fs_mgr_do_mount() to mount /system with AVB
Change-Id: I126a0124a5c9d61302f40ab9db16989500d9777e
2017-04-28 12:47:18 +08:00
Josh Gao
49ceaec6f3
Merge "debuggerd_handler: don't assume that abort message implies fatal." am: 263e1e9509 am: f405fe0edb am: 1085eb5cc1
...
am: 125dd90a82
2017-04-28 03:38:04 +00:00
Jaesoo Lee
e894637e99
Merge "added include for unistd.h that was missing" am: 98cc0e1f02 am: 371e0bf298 am: b1989aa336 -s ours
...
am: e4de9ec23e
2017-04-28 03:37:45 +00:00
Bowgo Tsai
92e5f2d912
Merge "fs_mgr: set "partition.system.verified" when AVB is used in a A/B device" am: 5c7543569a am: b66306c7c1 am: 50f7d4a1ab
...
am: 5547de8f8e
2017-04-28 03:37:28 +00:00
Jerry Zhang
91fc4fd245
Merge "Revert "adb: Lower EP_ALLOC retry count"" am: 169590c47f am: 935d600800 am: ddcc232493
...
am: d3632d3ce1
2017-04-28 03:37:12 +00:00
Jaesoo Lee
8477333939
resolve merge conflicts of afc0aa78f to oc-dev-plus-aosp
...
am: 1e00517d71
2017-04-28 03:36:55 +00:00
Josh Gao
125dd90a82
Merge "debuggerd_handler: don't assume that abort message implies fatal." am: 263e1e9509 am: f405fe0edb
...
am: 1085eb5cc1
2017-04-28 03:35:22 +00:00
Jaesoo Lee
e4de9ec23e
Merge "added include for unistd.h that was missing" am: 98cc0e1f02 am: 371e0bf298
...
am: b1989aa336
2017-04-28 03:35:04 +00:00
Bowgo Tsai
5547de8f8e
Merge "fs_mgr: set "partition.system.verified" when AVB is used in a A/B device" am: 5c7543569a am: b66306c7c1
...
am: 50f7d4a1ab
2017-04-28 03:34:46 +00:00
Jerry Zhang
d3632d3ce1
Merge "Revert "adb: Lower EP_ALLOC retry count"" am: 169590c47f am: 935d600800
...
am: ddcc232493
2017-04-28 03:34:29 +00:00
Abodunrinwa Toki
d6ab6456c5
Initialize textclassifier model update directory
...
Test: Builds successfully. Directory is initialized on install. Tests pass.
bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Bug: 34780396
Merged-In: Icbf7962f11b66579931f48053132da6e03e62c61
Change-Id: Icbf7962f11b66579931f48053132da6e03e62c61
2017-04-28 04:15:57 +01:00
Josh Gao
1085eb5cc1
Merge "debuggerd_handler: don't assume that abort message implies fatal." am: 263e1e9509
...
am: f405fe0edb
2017-04-28 03:05:57 +00:00
Josh Gao
f405fe0edb
Merge "debuggerd_handler: don't assume that abort message implies fatal."
...
am: 263e1e9509
2017-04-28 03:02:35 +00:00
Josh Gao
5fd02a8dbc
debuggerd_handler: don't assume that abort message implies fatal.
...
Applications can set abort messages via android_set_abort_message
without actually aborting. This leads to following non-fatal dumps
printing their output to logcat in the same format as a regular crash.
Bug: http://b/37754992
Test: debuggerd_test
Change-Id: I9c5e942984dfda36448860202b0ff1c2950bdd07
(cherry picked from commit e06f2a4886
2017-04-27 19:58:47 -07:00
Treehugger Robot
263e1e9509
Merge "debuggerd_handler: don't assume that abort message implies fatal."
2017-04-28 02:47:16 +00:00
Abodunrinwa Toki
3e6e906448
Merge "Initialize textclassifier model update directory" am: a079e453a3 am: f566376046 am: d13dca13e8
...
am: 552a4c10b3
2017-04-28 02:30:47 +00:00
Tom Cherry
272a77eeb7
init: fix last_reboot_reason string am: 704b27bd85
...
am: 18c9ce2b93
2017-04-28 02:30:32 +00:00
Jerry Zhang
af96b5e80b
Merge "Move adbd stopped trigger for configfs into core." am: e21b2fb6b4 am: fa14b1de73 am: b3988e670d
...
am: ee82936ecd
2017-04-28 02:30:11 +00:00
Jaesoo Lee
1e00517d71
resolve merge conflicts of afc0aa78f to oc-dev-plus-aosp
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I0e1cc5f5367c4840eea5f56670f74a44743f1853
2017-04-28 10:52:15 +09:00
Jaesoo Lee
b1989aa336
Merge "added include for unistd.h that was missing" am: 98cc0e1f02
...
am: 371e0bf298
2017-04-28 01:50:51 +00:00
Jaesoo Lee
371e0bf298
Merge "added include for unistd.h that was missing"
...
am: 98cc0e1f02
2017-04-28 01:48:58 +00:00
Treehugger Robot
98cc0e1f02
Merge "added include for unistd.h that was missing"
2017-04-28 01:39:55 +00:00
Bowgo Tsai
50f7d4a1ab
Merge "fs_mgr: set "partition.system.verified" when AVB is used in a A/B device" am: 5c7543569a
...
am: b66306c7c1
2017-04-28 01:29:46 +00:00
Bowgo Tsai
b66306c7c1
Merge "fs_mgr: set "partition.system.verified" when AVB is used in a A/B device"
...
am: 5c7543569a
2017-04-28 01:27:46 +00:00
Treehugger Robot
5c7543569a
Merge "fs_mgr: set "partition.system.verified" when AVB is used in a A/B device"
2017-04-28 01:21:13 +00:00
Jerry Zhang
ddcc232493
Merge "Revert "adb: Lower EP_ALLOC retry count"" am: 169590c47f
...
am: 935d600800
2017-04-28 01:10:14 +00:00
Jerry Zhang
935d600800
Merge "Revert "adb: Lower EP_ALLOC retry count""
...
am: 169590c47f
2017-04-28 01:08:13 +00:00
Jerry Zhang
169590c47f
Merge "Revert "adb: Lower EP_ALLOC retry count""
2017-04-28 01:06:09 +00:00
Jaesoo Lee
afc0aa78f4
Merge changes from topic 'libutils-export-headers' am: 4af3a7966b
...
am: 0951ddeb69
2017-04-28 00:57:13 +00:00
Jaesoo Lee
0951ddeb69
Merge changes from topic 'libutils-export-headers'
...
am: 4af3a7966b
2017-04-28 00:55:51 +00:00
Jaesoo Lee
4af3a7966b
Merge changes from topic 'libutils-export-headers'
...
* changes:
libutils_headers: export libcutils_headers
libutils: export libbacktrace headers
libutils: export system_headers
2017-04-28 00:47:35 +00:00
Abodunrinwa Toki
552a4c10b3
Merge "Initialize textclassifier model update directory" am: a079e453a3 am: f566376046
...
am: d13dca13e8
2017-04-28 00:44:54 +00:00
Jaesoo Lee
1e8ac0fd03
libutils_headers: export libcutils_headers
...
These headers are used in headers in libutils_headers and must be
re-exported.
include/utils/Atomic.h:20:#include <cutils/atomic.h>
include/utils/Trace.h:24:#include <cutils/trace.h>
include/utils/Singleton.h:27:#include <cutils/compiler.h>
Test: modules using libutils_headers don't have to have
libcutils_headers include dirs set.
Bug: 33241851
Change-Id: I039aaaad93bf0944d42f04d2a9e6654b4f867042
2017-04-28 09:42:50 +09:00
Steven Moreland
4ad9d5155b
libutils: export libbacktrace headers
...
This is used in CallStack.h.
Test: m -j libutils
Test: links
Test: trying to compile with BOARD_VNDK_VERSION := current
Bug: 33241851
Change-Id: I076c9551d356824d6e69b82349b890369bc7eea3
Merged-In: If7258e7b38000a72fd520f725030fb0038f90167
2017-04-28 09:42:50 +09:00
Steven Moreland
2d0dc9966a
libutils: export system_headers
...
vendor + vendor_available modules built with BOARD_VNDK_VERSION :=
current aren't allowed to use global headers. Since libutils uses
system headers itself, it should export them as well.
Bug: 33241851
Test: building with BOARD_VNDK_VERSION := current produces many fewer
errors.
Change-Id: Icc7d2beb2a17da291434c6282eb1b9eb458f114c
Merged-In: I950821f1dae3ddc110db50869247913d5b1aa638
2017-04-28 09:42:50 +09:00
Abodunrinwa Toki
d13dca13e8
Merge "Initialize textclassifier model update directory" am: a079e453a3
...
am: f566376046
2017-04-28 00:40:44 +00:00
Abodunrinwa Toki
f566376046
Merge "Initialize textclassifier model update directory"
...
am: a079e453a3
2017-04-28 00:38:41 +00:00
Treehugger Robot
a079e453a3
Merge "Initialize textclassifier model update directory"
2017-04-28 00:30:26 +00:00
Josh Gao
e06f2a4886
debuggerd_handler: don't assume that abort message implies fatal.
...
Applications can set abort messages via android_set_abort_message
without actually aborting. This leads to following non-fatal dumps
printing their output to logcat in the same format as a regular crash.
Bug: http://b/37754992
Test: debuggerd_test
Change-Id: I9c5e942984dfda36448860202b0ff1c2950bdd07
2017-04-27 17:28:05 -07:00
