Bill Yi
1b4ee01cfa
Import translations. DO NOT MERGE
...
Change-Id: Ib4ebc02261abc4610947ab54f5e53f9958190e27
Auto-generated-cl: translation import
2016-04-05 09:23:08 -07:00
Bill Yi
dcc29b8ff5
Import translations. DO NOT MERGE am: f75b6e4
-s ours
...
am: ea22f8f
-s ours
* commit 'ea22f8f61ed2c3bbda0c45b08934d1d84f107651':
Import translations. DO NOT MERGE
Change-Id: I10f58bfa96d16326e4a912abf96a2a82a82a376e
2016-04-05 03:29:37 +00:00
Bill Yi
ea22f8f61e
Import translations. DO NOT MERGE
...
am: f75b6e4
-s ours
* commit 'f75b6e47def859039627a557c1046f1fc723036b':
Import translations. DO NOT MERGE
Change-Id: I948c6f31dd9c54a1f1abc5e0fdccb6571f095eb6
2016-04-05 03:26:34 +00:00
Bill Yi
f75b6e47de
Import translations. DO NOT MERGE
...
Change-Id: Ia0012b89f00c65ec6056d29612748e60564bab32
Auto-generated-cl: translation import
2016-04-04 17:59:17 -07:00
Bill Yi
af39dc8d36
Import translations. DO NOT MERGE
...
Change-Id: I5280c977c6c5099c681fa5069bdde9b5426d5949
Auto-generated-cl: translation import
2016-04-04 16:28:16 -07:00
Elliott Hughes
844007b722
Merge "Move selinux dependencies out of header files." am: 8124750
am: dc91161
...
am: 5c23b80
* commit '5c23b801e5f29ca85dde4a58fde4a69faacd7c6c':
Move selinux dependencies out of header files.
Change-Id: I191e0337501fc5520da1fa726911ffabd5d156c9
2016-04-02 16:12:29 +00:00
Elliott Hughes
5c23b801e5
Merge "Move selinux dependencies out of header files." am: 8124750
...
am: dc91161
* commit 'dc91161a56c74bb6c73560d728d92b115f0f6e75':
Move selinux dependencies out of header files.
Change-Id: I439d352c9366dbed201a5592059b886968324633
2016-04-02 16:06:57 +00:00
Elliott Hughes
dc91161a56
Merge "Move selinux dependencies out of header files."
...
am: 8124750
* commit '81247500d535dac714fad657860b67474e1f6e42':
Move selinux dependencies out of header files.
Change-Id: If8fde7a64334327a2b0880a742d784642481ceeb
2016-04-02 16:01:25 +00:00
Elliott Hughes
81247500d5
Merge "Move selinux dependencies out of header files."
2016-04-02 15:53:11 +00:00
Elliott Hughes
4bbd5bf8a6
Move selinux dependencies out of header files.
...
Bug: http://b/27764900
Change-Id: Ib62a59edcb13054f40f514c404d32b87b14ed5f1
2016-04-01 18:24:39 -07:00
Mark Salyzyn
ccc49f9da6
recovery: use __android_log_pmsg_file_write for log files am: 13aca59
...
am: 658a467
* commit '658a467a1228e99cd858b49c7571c420b41419bf':
recovery: use __android_log_pmsg_file_write for log files
Change-Id: I94f01d485b0f0ca0e697763d9f428b6014d667ac
2016-03-31 21:56:17 +00:00
Mark Salyzyn
658a467a12
recovery: use __android_log_pmsg_file_write for log files
...
am: 13aca59
* commit '13aca598f8e93548fef36d87136e85ce8c9d18de':
recovery: use __android_log_pmsg_file_write for log files
Change-Id: I068397cfa182fb14285a266f038f8c5230466a3b
2016-03-31 21:53:01 +00:00
Mark Salyzyn
2929e8ff3a
Merge "recovery: use __android_log_pmsg_file_write for log files" am: 75da771
am: 6f83130
...
am: 9b9e584
* commit '9b9e5843d296c4bb0d2cdca5eb18a2d2277dff96':
recovery: use __android_log_pmsg_file_write for log files
Change-Id: I0a2aeb27f786740c693e0a21c9da1eca5b0e6216
2016-03-31 21:04:11 +00:00
Mark Salyzyn
9b9e5843d2
Merge "recovery: use __android_log_pmsg_file_write for log files" am: 75da771
...
am: 6f83130
* commit '6f83130d7acd85df89a80e691d3aa63bd2ceda39':
recovery: use __android_log_pmsg_file_write for log files
Change-Id: Id2e7a76bae8eb061f6f57249dd912f25cd6332c6
2016-03-31 21:00:59 +00:00
Mark Salyzyn
6f83130d7a
Merge "recovery: use __android_log_pmsg_file_write for log files"
...
am: 75da771
* commit '75da77105f329f5d6c1b4dc46ce02377ec4afd6a':
recovery: use __android_log_pmsg_file_write for log files
Change-Id: I3da18530294ec71cd24b5ad8c720ab16c3e47dab
2016-03-31 20:57:51 +00:00
Mark Salyzyn
13aca598f8
recovery: use __android_log_pmsg_file_write for log files
...
(cherry-pick from commit a4f701af93
)
- Add call to __android_log_pmsg_file_write for recovery logging.
- Add call to refresh pmsg if we reboot back into recovery and then
allow overwrite of those logs.
- Add a new one-time executable recovery-refresh that refreshes pmsg
in post-fs phase of init. We rely on pmsg eventually scrolling off
to age the content after recovery-persist has done its job.
- Add a new one-time executable recovery-persist that transfers from
pmsg to /data/misc/recovery/ directory if /cache is not mounted
in post-fs-data phase of init.
- Build and appropriately trigger the above two as required if
BOARD_CACHEIMAGE_PARTITION_SIZE is undefined.
- Add some simple unit tests
NB: Test failure is expected on systems that do not deliver either
the recovery-persist or recovery-refresh executables, e.g. systems
with /cache. Tests also require a timely reboot sequence of test
to truly verify, tests provide guidance on stderr to direct.
Bug: 27176738
Change-Id: I17bb95980234984f6b2087fd5941b0a3126b706b
2016-03-31 13:52:54 -07:00
Mark Salyzyn
75da77105f
Merge "recovery: use __android_log_pmsg_file_write for log files"
2016-03-31 20:49:56 +00:00
Bill Yi
a1e7866b6a
Import translations. DO NOT MERGE am: f1b2785
-s ours
...
am: 6a54ca4
-s ours
* commit '6a54ca4f9181774fe6cb58940d73f86aee506423':
Import translations. DO NOT MERGE
Change-Id: Id0e7d247df98ac9fbfa7579b39b72e1fa0e00f20
2016-03-31 15:48:58 +00:00
Bill Yi
6a54ca4f91
Import translations. DO NOT MERGE
...
am: f1b2785
-s ours
* commit 'f1b2785129b64a140764483901530f40716e53f5':
Import translations. DO NOT MERGE
Change-Id: I36787400a12a3a9258a9d9c569da69b79cb2738f
2016-03-31 15:45:44 +00:00
Bill Yi
f1b2785129
Import translations. DO NOT MERGE
...
Change-Id: Id992a2cff5d431b5862f7c27f3823dbffe52f5c7
Auto-generated-cl: translation import
2016-03-30 22:15:27 -07:00
Bill Yi
452aec0c5b
Import translations. DO NOT MERGE
...
Change-Id: I96a3ebec0ab7b7400bcf8ffd2a899d291d8a4579
Auto-generated-cl: translation import
2016-03-30 20:41:15 -07:00
Yabin Cui
af337d8dde
Merge "uncrypt: remove --read-bcb option." am: ebd22be
am: ecc068c
-s ours
...
am: f41c35d
* commit 'f41c35d774de88bc668c94ee5cfa43b60eb6eea1':
uncrypt: remove --read-bcb option.
Change-Id: I05dfeef0be5d80d717c37a9fc03b1c61cb3e5e6b
2016-03-30 02:02:50 +00:00
Yabin Cui
f41c35d774
Merge "uncrypt: remove --read-bcb option." am: ebd22be
...
am: ecc068c
-s ours
* commit 'ecc068c2f83b4db891f9d479170c06cf06bb409a':
uncrypt: remove --read-bcb option.
Change-Id: I53dc530930eb95d00ea2efd51a07e34502ab63c6
2016-03-30 01:59:07 +00:00
Yabin Cui
ecc068c2f8
Merge "uncrypt: remove --read-bcb option."
...
am: ebd22be
* commit 'ebd22be4f742f5eeb32b2eeaf212b34e7605da50':
uncrypt: remove --read-bcb option.
Change-Id: I06ed6c0a36246041d03c57bc03f532de414c926f
2016-03-30 01:29:42 +00:00
Yabin Cui
ebd22be4f7
Merge "uncrypt: remove --read-bcb option."
2016-03-30 01:19:25 +00:00
Yabin Cui
6507265906
uncrypt: remove --read-bcb option.
...
Bug: 27897241
Change-Id: I4f52ada58e8f204dba8c974ea0ae03876411ecf0
(cherry picked from commit 61799baba3
)
2016-03-29 18:14:44 -07:00
Yabin Cui
08875b220d
Merge "uncrypt: fix call to close()." into nyc-dev am: 912e87e
-s ours
...
am: 31d0872
* commit '31d08721194392bb8dd19fa2aee5d9720e960843':
uncrypt: fix call to close().
Change-Id: Ida59e364ac117786d996eb841d5acb89ebb7dfa7
2016-03-30 00:21:43 +00:00
Yabin Cui
31d0872119
Merge "uncrypt: fix call to close()." into nyc-dev
...
am: 912e87e
-s ours
* commit '912e87e91d15c35c18ce6710bf6a0b34f50b3672':
uncrypt: fix call to close().
Change-Id: Ib9d13b4b39d64a9b7ff95429152eb9f3383ee4b3
2016-03-30 00:18:38 +00:00
Tianjie Xu
d0678147cd
Merge "Add string for Installing_security_update" am: 3568004
am: 2e21897
...
am: 0d66126
* commit '0d661262e99ae6ba6baeae6cdce05791923fe445':
Add string for Installing_security_update
Change-Id: I5a1817ff5ef8494c53441892612070274432c92a
2016-03-30 00:11:58 +00:00
Tianjie Xu
0d661262e9
Merge "Add string for Installing_security_update" am: 3568004
...
am: 2e21897
* commit '2e2189728b3172327e93825ed803768c72fe7f28':
Add string for Installing_security_update
Change-Id: I5b00f7c996c2a0653f1769790498c0a6578f6ac5
2016-03-30 00:08:55 +00:00
Tianjie Xu
2e2189728b
Merge "Add string for Installing_security_update"
...
am: 3568004
* commit '3568004cba740a466bd9731a4bb5c8a1475e6d2d':
Add string for Installing_security_update
Change-Id: I11a147726cd535e574690e01df35ec961888c5c6
2016-03-30 00:05:54 +00:00
Tianjie Xu
3568004cba
Merge "Add string for Installing_security_update"
2016-03-29 23:58:31 +00:00
Yabin Cui
2286b23373
resolve merge conflicts of 61799ba
to nyc-dev-plus-aosp
...
am: 0c39203
* commit '0c39203698b904e165237f67d6bd013debd6dc47':
uncrypt: remove --read-bcb option.
Change-Id: Ic84b20a7736d6c0cd5f4e3ff07a02cbd64e285aa
2016-03-29 23:53:26 +00:00
Yabin Cui
0c39203698
resolve merge conflicts of 61799ba
to nyc-dev-plus-aosp
...
Change-Id: Ib1d0afe9022ec82f05be8b56201e73505160cacc
2016-03-29 16:47:18 -07:00
Yabin Cui
912e87e91d
Merge "uncrypt: fix call to close()." into nyc-dev
2016-03-29 22:48:08 +00:00
Yabin Cui
ffa3a1c222
uncrypt: fix call to close().
...
Bug: 27897229
Change-Id: Iab5e829af1676f7fcd8a4b00a194aa679ed4e372
2016-03-29 15:35:58 -07:00
Yabin Cui
61799baba3
uncrypt: remove --read-bcb option.
...
Bug: 27897241
Change-Id: I4f52ada58e8f204dba8c974ea0ae03876411ecf0
2016-03-29 14:33:35 -07:00
Tianjie Xu
78bac9a66a
Add string for Installing_security_update am: 1ee0ff3
...
am: 0f54a46
* commit '0f54a46af3d2fa5f01fd1e37ed050b3cf697008c':
Add string for Installing_security_update
Change-Id: Ib9cc5307a030a94f7d9d6e9c52646cf1665bbe3d
2016-03-29 21:09:03 +00:00
Tianjie Xu
0f54a46af3
Add string for Installing_security_update
...
am: 1ee0ff3
* commit '1ee0ff3d78c5143d4e3307bc44e3c27792e72d1e':
Add string for Installing_security_update
Change-Id: Ied2a3b07fbf8548688759727da527fc7a994d5a0
2016-03-29 21:06:05 +00:00
Tianjie Xu
1c95c97e55
Add string for Installing_security_update
...
Bug: 27837319
Change-Id: I037158697a294c3e03f186f3b4207ea700321a8a
(cherry picked from commit 1ee0ff3d78
)
2016-03-29 13:59:22 -07:00
Elliott Hughes
ee3314d335
Fix uncrypt.cpp unique_fd build breakage.
...
am: d6ac686
* commit 'd6ac68665dcef6c12d44ee6bcd7d938ab5028150':
Fix uncrypt.cpp unique_fd build breakage.
Change-Id: Ibb0c2a7e7cc3668b2fe41e756a637043cfecc03f
2016-03-29 20:09:36 +00:00
Elliott Hughes
d6ac68665d
Fix uncrypt.cpp unique_fd build breakage.
...
Change-Id: I4654f59463d1f3e1f4450e937cd910508b64c157
2016-03-29 12:53:36 -07:00
Elliott Hughes
54937d0b59
resolve merge conflicts of 5cf4701
to nyc-dev-plus-aosp
...
am: 20ab2db
* commit '20ab2db8f1e04f4f9b4c1dc0e9377f0586bfc10a':
Switch to <android-base/unique_fd.h>.
Change-Id: I3ad1eae327ad83c82aa684e4a2846d4313fd4486
2016-03-29 18:29:55 +00:00
Elliott Hughes
20ab2db8f1
resolve merge conflicts of 5cf4701
to nyc-dev-plus-aosp
...
Change-Id: Ia69f8b070c05cfe201115de510e3c12e813e38b5
2016-03-29 11:15:47 -07:00
Elliott Hughes
5cf4701d66
Merge "Switch to <android-base/unique_fd.h>."
...
am: 5d73735
* commit '5d73735552b3eca103830bd1433ce4b74b54b2b3':
Switch to <android-base/unique_fd.h>.
Change-Id: I2f03ba036160376f03516eb7ede62229bb8e20ba
2016-03-29 18:00:38 +00:00
Elliott Hughes
5d73735552
Merge "Switch to <android-base/unique_fd.h>."
2016-03-29 17:55:47 +00:00
Elliott Hughes
bcabd09293
Switch to <android-base/unique_fd.h>.
...
Change-Id: I13ba3f40bd52b5f3e3fe9002a45a9a8630040129
2016-03-29 08:18:34 -07:00
Tianjie Xu
1ee0ff3d78
Add string for Installing_security_update
...
Bug: 27837319
Change-Id: I037158697a294c3e03f186f3b4207ea700321a8a
2016-03-28 18:16:15 -07:00
Mark Salyzyn
a4f701af93
recovery: use __android_log_pmsg_file_write for log files
...
- Add call to __android_log_pmsg_file_write for recovery logging.
- Add call to refresh pmsg if we reboot back into recovery and then
allow overwrite of those logs.
- Add a new one-time executable recovery-refresh that refreshes pmsg
in post-fs phase of init. We rely on pmsg eventually scrolling off
to age the content after recovery-persist has done its job.
- Add a new one-time executable recovery-persist that transfers from
pmsg to /data/misc/recovery/ directory if /cache is not mounted
in post-fs-data phase of init.
- Build and appropriately trigger the above two as required if
BOARD_CACHEIMAGE_PARTITION_SIZE is undefined.
- Add some simple unit tests
NB: Test failure is expected on systems that do not deliver either
the recovery-persist or recovery-refresh executables, e.g. systems
with /cache. Tests also require a timely reboot sequence of test
to truly verify, tests provide guidance on stderr to direct.
Bug: 27176738
Change-Id: I17bb95980234984f6b2087fd5941b0a3126b706b
2016-03-28 11:07:00 -07:00
Elliott Hughes
0609e14728
Move recovery_l10n here from development/tools. am: cc79490
...
am: e833769
* commit 'e833769e7be7ffa3db8a35c84fc9c6b6aea9f663':
Move recovery_l10n here from development/tools.
2016-03-26 17:11:57 +00:00