Jerry Zhang
75f8d89a8a
Move adbd stopped trigger for configfs into core.
...
This trigger resets ffs.ready in situations where
adbd is stopped via commandline.
Test: stop adbd
Change-Id: Ib5028d55c4883a8291d6de2dbcb0641ff8eb7a48
2017-04-27 14:59:48 -07:00
Jerry Zhang
a06ac26dd1
Merge "Add ffs.mtp.ready triggers to mtp configs."
2017-04-27 21:58:44 +00:00
Abodunrinwa Toki
40673e3381
Initialize textclassifier model update directory
...
Test: Builds successfully. Directory is initialized on install. Tests pass.
bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Bug: 34780396
Change-Id: Icbf7962f11b66579931f48053132da6e03e62c61
2017-04-27 22:56:43 +01:00
Steven Moreland
2483070b48
Merge "libtrusty: Android.mk -> Android.bp" am: de70e33092
am: 3257727096
...
am: bb3e2e96c7
Change-Id: Idf05d910d19b603b0b608ff351bf6b425990a069
2017-04-27 20:29:53 +00:00
Tom Cherry
07ea1a8833
Merge "init: fix last_reboot_reason string" am: 59c74a3bd1
am: 2be5884903
...
am: 8705f89826
Change-Id: Idaf8218594f50b860fdd9e5d12b8e6f7a4fe0e68
2017-04-27 20:29:32 +00:00
Steven Moreland
bb3e2e96c7
Merge "libtrusty: Android.mk -> Android.bp" am: de70e33092
...
am: 3257727096
Change-Id: I9587460646d9d83a3bfcc41be0ec71167a45db08
2017-04-27 20:24:46 +00:00
Steven Moreland
3257727096
Merge "libtrusty: Android.mk -> Android.bp"
...
am: de70e33092
Change-Id: Ic18c86fd29f3793026fb830d91ad44d62b3aed42
2017-04-27 20:20:45 +00:00
Treehugger Robot
de70e33092
Merge "libtrusty: Android.mk -> Android.bp"
2017-04-27 20:02:17 +00:00
Tom Cherry
8705f89826
Merge "init: fix last_reboot_reason string" am: 59c74a3bd1
...
am: 2be5884903
Change-Id: Ia1587bdd33faae3d0b3c0d31e3e799efff6d4642
2017-04-27 20:00:02 +00:00
Tom Cherry
704b27bd85
init: fix last_reboot_reason string
...
This got moved when refactoring the reboot commands.
Bug: 37540660
Test: verify bullhead's last_reboot_reason is correct
Change-Id: I3b86496fc469ca41645df7e7ba8bb51dd25b6b38
(cherry picked from commit 47336cebc3
)
2017-04-27 12:52:37 -07:00
Tom Cherry
2be5884903
Merge "init: fix last_reboot_reason string"
...
am: 59c74a3bd1
Change-Id: I77a91f303ffce4f040d774047d2c72920c1acaee
2017-04-27 19:49:30 +00:00
Treehugger Robot
59c74a3bd1
Merge "init: fix last_reboot_reason string"
2017-04-27 19:39:53 +00:00
Elliott Hughes
7f95f97bdd
Merge "Make "fastboot update" respect $TMPDIR." am: 8e0ccc9ff3
am: 8e0ded0c6c
...
am: d38d487304
Change-Id: I61e6f9833c37529ef772ab091101a0e85856ffa7
2017-04-27 15:57:53 +00:00
Elliott Hughes
d38d487304
Merge "Make "fastboot update" respect $TMPDIR." am: 8e0ccc9ff3
...
am: 8e0ded0c6c
Change-Id: I26b8ac39b30d623e8903b5b1887244a0af689489
2017-04-27 15:54:53 +00:00
Elliott Hughes
8e0ded0c6c
Merge "Make "fastboot update" respect $TMPDIR."
...
am: 8e0ccc9ff3
Change-Id: I74e6b2fb1e69de03960dfb0bfdd711af9e9cbd8f
2017-04-27 15:52:22 +00:00
Elliott Hughes
8e0ccc9ff3
Merge "Make "fastboot update" respect $TMPDIR."
2017-04-27 15:40:03 +00:00
Bowgo Tsai
48fdc292f9
fs_mgr: set "partition.system.verified" when AVB is used in a A/B device
...
In a A/B device, system partition is mounted by kernel as root.
In vboot 1.0, the dm device name of system partition is "system" with
the following configuration in kernel command line:
- dm="system none ro,0 1 android-verity /dev/sda34"
In AVB, the dm device name is switched to vroot as:
- dm="1 vroot none ro 1,0 5201456 verity 1 ..."
When sending ioctl DM_TABLE_STATUS to query status, we should use "vroot" as the
dm device name for AVB. But still pass "system" for the callback function to set
property [partition.system.verified] instead of [partition.vroot.verified].
Bug: 36900078
Test: Use AVB to mount system in a A/B device, checks the property exists
[partition.system.verified]
Test: Use vboot 1.0 to mount system in a A/B device, checks the property exists
[partition.system.verified]
Test: Checks 'adb remount' will output warning message:
- dm_verity is enabled on the system and vendor partitions.
- Use "adb disable-verity" to disable verity.
Change-Id: Iaee7eb2b00b03729bc07fa24f1b449488716d2ea
2017-04-27 18:58:29 +08:00
Randy Pan
f7e92a235f
Merge "Revert "Remove capability setting for legacy_wifi_hal"" into oc-dev
...
am: df54d0efc3
Change-Id: I631cc474f74c51f2de08d00b774f0d6c32818b5c
2017-04-27 03:50:45 +00:00
TreeHugger Robot
df54d0efc3
Merge "Revert "Remove capability setting for legacy_wifi_hal"" into oc-dev
2017-04-27 03:44:55 +00:00
Keun-young Park
602380aa5f
Merge "set default shutdown timeout to 6 secs" into oc-dev
...
am: 55bb3a9f75
Change-Id: I3ebe70762d49cd7ed4dc8d042406a5e9587e5f33
2017-04-27 02:14:41 +00:00
Keun-young Park
55bb3a9f75
Merge "set default shutdown timeout to 6 secs" into oc-dev
2017-04-27 02:10:17 +00:00
Steven Moreland
f304a20523
libtrusty: Android.mk -> Android.bp
...
Test: links
Change-Id: Ic64361f98e9e51b62bfda8b2b1c3a00ae03f0a37
2017-04-26 18:58:18 -07:00
Randy Pan
b8f707d641
Revert "Remove capability setting for legacy_wifi_hal"
...
This reverts commit faf317b7e9
.
Bug: 37713566
Test: Able to connect to GoogleGuest on Fugu
2017-04-26 18:24:48 -07:00
Jiyong Park
7eccd838c0
Merge "Relocate VNDK-SP to /system/lib/vndk-sp and add RS libs to VNDK-SP" into oc-dev
...
am: c43a4ad4bc
Change-Id: Ib2c7ba873d7e71aa23bcf28702c2e188f6918c15
2017-04-27 01:12:46 +00:00
TreeHugger Robot
c43a4ad4bc
Merge "Relocate VNDK-SP to /system/lib/vndk-sp and add RS libs to VNDK-SP" into oc-dev
2017-04-27 00:56:17 +00:00
Elliott Hughes
bbfc281485
Make "fastboot update" respect $TMPDIR.
...
Bug: http://b/32701538
Test: TMPDIR=/ fastboot update
Change-Id: I06d1bc8d43b306855dfe19bc736513d3336df287
2017-04-26 17:20:36 -07:00
Jerry Zhang
fb256b696b
Add ffs.mtp.ready triggers to mtp configs.
...
This allows devices to use functionfs for mtp and ptp instead
of the ordinary functions. The property is set regardless of
which function is enabled so mtp and ptp functions will continue
to work.
Bug: 33220530
Test: use mtp with ffs and non ffs devices
Change-Id: I4527e153bd10ef1e262e487482ae455835d1c698
2017-04-26 17:11:50 -07:00
Keun-young Park
be7ddb0043
set default shutdown timeout to 6 secs
...
- Test data shows that most shutdown finishes in 6 secs.
- The original 10 secs is too long wih no shutdown animation
running in screen.
bug: 36657139
Test: check time with reboot
(cherry picked from commit 7feab68238
)
Change-Id: I2e0ec81baa7b6cdb1ff0163c16f643c2549d74ab
2017-04-26 17:06:53 -07:00
Keun-young Park
6f4b2b5cd8
Merge "add additional dump for timeout" into oc-dev
...
am: f1f5eefcff
Change-Id: I84e7e57ad7268b453d7de62086489ee478f45f60
2017-04-27 00:00:45 +00:00
Steven Moreland
0bbbcf21fe
Merge "libbinderwrapper: Android.mk -> Android.bp" am: 8a85c253bf
am: 5076014708
...
am: f2ddd7e090
Change-Id: Ib5f6810871b910bb40b003775e8582bef62e1938
2017-04-26 23:40:34 +00:00
Steven Moreland
f2ddd7e090
Merge "libbinderwrapper: Android.mk -> Android.bp" am: 8a85c253bf
...
am: 5076014708
Change-Id: I758b188f19d5f1081d23428899b23c68ccd45297
2017-04-26 23:38:04 +00:00
Steven Moreland
5076014708
Merge "libbinderwrapper: Android.mk -> Android.bp"
...
am: 8a85c253bf
Change-Id: I48f566cc646a6b708a34389b8836a4441fe86af5
2017-04-26 23:34:36 +00:00
Keun-young Park
f1f5eefcff
Merge "add additional dump for timeout" into oc-dev
2017-04-26 23:29:37 +00:00
Treehugger Robot
8a85c253bf
Merge "libbinderwrapper: Android.mk -> Android.bp"
2017-04-26 23:24:58 +00:00
Keun-young Park
6c61e087e4
Merge "set default shutdown timeout to 6 secs" am: 47d15ed5b9
am: 0020d4c076
...
am: 09c780db3a
Change-Id: I38ec920f5034b2adc9ab8354144cae1fe554d753
2017-04-26 22:49:02 +00:00
Keun-young Park
09c780db3a
Merge "set default shutdown timeout to 6 secs" am: 47d15ed5b9
...
am: 0020d4c076
Change-Id: I1c0b4552ebc5e52475b4bd98e82a837137be7f6b
2017-04-26 22:47:00 +00:00
Keun-young Park
0020d4c076
Merge "set default shutdown timeout to 6 secs"
...
am: 47d15ed5b9
Change-Id: I076911247627894009490047caa9f04b8e616755
2017-04-26 22:43:29 +00:00
Keun-young Park
2a53c3ed61
Merge "do not start shutdown animation from init" into oc-dev
...
am: 2083079018
Change-Id: Ie114d6109cdd3e0a1e7abb0be9f946d1a5a078e2
2017-04-26 22:43:09 +00:00
Erik Staats
d32331fb27
Change set_sched_policy to set slack for current thread.
...
Change set_sched_policy to use prctl PR_SET_TIMERSLACK if setting the policy
for the current thread and /proc/<tid>/timerslack_ns is not supported by the
kernel.
Bug: 32972117
Test: Verified that libcutils SchedPolicy tests pass. See details in
testing done comment in
https://android-review.googlesource.com/381303 .
Change-Id: Id70940ed7f9ed94c3d105213f069bf3e5a8d8824
2017-04-26 15:39:26 -07:00
Keun-young Park
47d15ed5b9
Merge "set default shutdown timeout to 6 secs"
2017-04-26 22:35:26 +00:00
Keun-young Park
2083079018
Merge "do not start shutdown animation from init" into oc-dev
2017-04-26 22:30:43 +00:00
Philip Cuadra
d1ff4c2156
Allow Bluetooth HAL CAP_SYS_NICE
...
am: 1c268a86a1
-s ours
Change-Id: I93586f94acf2e13daf8bfd8e1ecd1e7be871f7d8
2017-04-26 21:28:27 +00:00
Keun-young Park
b549370bf3
Merge "do not start shutdown animation from init" am: 84d43c8df7
am: 76a3b3ce5c
...
am: a15436569f
Change-Id: I5fea05ff1c4d5cfb2d50b9aab7805d229c43d89b
2017-04-26 21:27:01 +00:00
Keun-young Park
5b1300c154
Merge "add additional dump for timeout" am: 8cde09064e
am: fadad58262
...
am: 606df0e2cb
Change-Id: I386ee368f2fd08575b69cc776ea2ccee55bdd225
2017-04-26 21:26:43 +00:00
Keun-young Park
a15436569f
Merge "do not start shutdown animation from init" am: 84d43c8df7
...
am: 76a3b3ce5c
Change-Id: If1f6bba314fe2f09620ea0574715a51f68791e96
2017-04-26 21:16:15 +00:00
Keun-young Park
606df0e2cb
Merge "add additional dump for timeout" am: 8cde09064e
...
am: fadad58262
Change-Id: Iaa1e0f86d36a6c6fcb10168df38408e315afeaca
2017-04-26 21:15:57 +00:00
Keun-young Park
76a3b3ce5c
Merge "do not start shutdown animation from init"
...
am: 84d43c8df7
Change-Id: I2cc5860c125a34b356bff9b62a9027ee293da683
2017-04-26 21:05:41 +00:00
Keun-young Park
fadad58262
Merge "add additional dump for timeout"
...
am: 8cde09064e
Change-Id: I7413854112a4d4d2f8e286e7f8be177ec4e282dc
2017-04-26 21:05:22 +00:00
Keun-young Park
92b03051f8
do not start shutdown animation from init
...
- init will only keep animation related services as shutdown critical.
- external component like system server can start shutdown animation.
bug: 37500823
Test: reboot
(cherry picked from commit e2b04b71ae
)
Change-Id: I9a0432148887557b705d6b8bbe35f5fb1ffad5b9
2017-04-26 14:02:41 -07:00
Treehugger Robot
84d43c8df7
Merge "do not start shutdown animation from init"
2017-04-26 20:59:56 +00:00