Commit Graph

9577 Commits

Author SHA1 Message Date
Bill Yi 53ea95d0c2 Import translations. DO NOT MERGE
Change-Id: Id4a5f32acb01776c95b092cc6e883036812836a9
Auto-generated-cl: translation import
2016-04-06 04:02:16 -07:00
Jeremy Compostella b3bf958d4f Define the Bootloader Control A/B structure
Define the A/B structure for implementation using the misc partition
as storage.  The bootloader_control structure is designed to be put in
the bootloader_message slot_suffix field.

Change-Id: I158bdf3e69b3f327a1dde4c6eb1f907dbaf8939c
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
2016-04-06 09:56:10 +02:00
Wechy77 b894cd2a89 Update hungarian translation
Change-Id: Iabd66596c0d1b83935c4adc4ac048f3881284269
2016-04-06 03:46:52 +01:00
The Android Automerger a75a28b792 merge in nyc-release history after reset to nyc-dev 2016-04-05 16:05:12 -07:00
Bill Yi c91a08359c Merge "Import translations. DO NOT MERGE" into nyc-dev am: b162551 -s ours
am: fc60583  -s ours

* commit 'fc60583a2c494414840fa181438135d1926aba8a':
  Import translations. DO NOT MERGE

Change-Id: Ie62a08f06cb9eaff0a441e3c784b1f1c605dec97
2016-04-05 18:54:13 +00:00
Bill Yi fc60583a2c Merge "Import translations. DO NOT MERGE" into nyc-dev
am: b162551  -s ours

* commit 'b162551a30ce45e991fbd24f0647b6320d3b9b67':
  Import translations. DO NOT MERGE

Change-Id: If605bd508a2f61db0d96b4f6261aa59c92486e0b
2016-04-05 18:51:08 +00:00
Bill Yi b162551a30 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-05 18:44:50 +00:00
Bill Yi c1afe830cf Import translations. DO NOT MERGE
Change-Id: Ic643d0e2d39e45d772ffb25001de45afdf923579
Auto-generated-cl: translation import
2016-04-05 11:13:59 -07:00
Bill Yi 1d2bf4f631 Merge "Import translations. DO NOT MERGE" 2016-04-05 16:33:18 +00:00
Bill Yi 1b4ee01cfa Import translations. DO NOT MERGE
Change-Id: Ib4ebc02261abc4610947ab54f5e53f9958190e27
Auto-generated-cl: translation import
2016-04-05 09:23:08 -07:00
thecrazyskull 30f0c228db translate install reboot option to dutch
Change-Id: I23b2c44afca5c903becd201503f81766828c9304
2016-04-05 11:17:05 -04:00
Mark Salyzyn a29251c0ae recovery-persist: pick up both pstore console files am: a569727
am: f726865

* commit 'f7268653331bf20740b9dfa211f05d204905befc':
  recovery-persist: pick up both pstore console files

Change-Id: I4787bf7b5893e2d902e55d0c2d92b33f9bc277a5
2016-04-05 14:59:06 +00:00
Mark Salyzyn f726865333 recovery-persist: pick up both pstore console files
am: a569727

* commit 'a5697276097913f3b2771f9b2cb077bdbcbecf38':
  recovery-persist: pick up both pstore console files

Change-Id: I9f2165a63ee73b26d49a85eba62707c50f44359a
2016-04-05 14:55:50 +00:00
Mark Salyzyn a569727609 recovery-persist: pick up both pstore console files
(cherry pick from commit 5f7111ff4d)

- Volantis console-ramoops-0 (upstream correct)
- Angler console-ramoops
- Bullhead console-ramoops
- Shamu console-ramoops

NB: Shamu also has kernel crashes in other pstore files,
    not merging them in.

Bug: 27176738
Change-Id: Ib6eef3e25475935b89252f51c960719c7860511a
2016-04-05 07:46:34 -07:00
Mark Salyzyn af1cc8c327 Merge "recovery-persist: pick up both pstore console files" am: 901f315 am: 4195388
am: 59a55b5

* commit '59a55b57bc8543ad0d080f117fc9ae53b1d95e1b':
  recovery-persist: pick up both pstore console files

Change-Id: I94e04f486fed0bc79827a1805989424265afa28b
2016-04-05 14:41:31 +00:00
Mark Salyzyn 59a55b57bc Merge "recovery-persist: pick up both pstore console files" am: 901f315
am: 4195388

* commit '419538869d3e92270f748316f4956eeb431663c3':
  recovery-persist: pick up both pstore console files

Change-Id: I85571bfef8ab8f1a4f44c2a9138d3eaca78e57aa
2016-04-05 14:38:39 +00:00
Mark Salyzyn 419538869d Merge "recovery-persist: pick up both pstore console files"
am: 901f315

* commit '901f31531ba7b7e40e8a9c915467892997d176da':
  recovery-persist: pick up both pstore console files

Change-Id: I7febc439147995adc06b75d1b0de3d30f55719a9
2016-04-05 14:35:53 +00:00
Mark Salyzyn 901f31531b Merge "recovery-persist: pick up both pstore console files" 2016-04-05 14:29:05 +00: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
Mark Salyzyn 5f7111ff4d recovery-persist: pick up both pstore console files
- Volantis console-ramoops-0 (upstream correct)
- Angler console-ramoops
- Bullhead console-ramoops
- Shamu console-ramoops

NB: Shamu also has kernel crashes in other pstore files,
    not merging them in.

Bug: 27176738
Change-Id: Ib6eef3e25475935b89252f51c960719c7860511a
2016-04-04 16:24:48 -07:00
Alex Kalles 2e21597212 Greek Translation from the updated en.xml
Change-Id: I5cd1b9c394c2777503e5567aaaa01210cfdb4caa
2016-04-04 20:30:08 +01:00
The Android Automerger 60e656e434 merge in nyc-release history after reset to nyc-dev 2016-04-04 12:15:09 -07:00
The Android Automerger 44400d32ce merge in nyc-release history after reset to nyc-dev 2016-04-04 11:58:51 -07:00
Ethan Yonker 4b131f70ac 3.0.2-0
Change-Id: I28fa04cb90dd4255db9dc5d771416ab8d456de46
2016-04-04 09:25:59 -05:00
Sultan Qasim Khan 14138d9f74 gui: don't mix up display value with actual value
In the case of password entry, the two differ. Password entry was broken
by the earlier commit entitled "Improve input box text handling" because
it started using the displayValue as the actual value, even in cases where
they differ because of a mask value.

Change-Id: Iaf5a67e1d928f34595962a1f1b80eebb64e8b493
2016-04-04 08:26:33 -05:00
SlimShadys b85189658a language: add 2 new strings in it.xml
Change-Id: I45a6a75d2b9332e523a7f61f19594c4029665ed7
2016-04-04 14:02:41 +01:00
SevenMaxs f7b048c0c4 languages: add 2 new strings for RU
Added translation Reboot Option and minor fix for Russian localization.

Change-Id: Ibeade0ce85ac65daf68dfd6b085a32148f66d1cb
2016-04-04 14:02:14 +01:00
thecrazyskull c53323af21 fix typo
Change-Id: I65f16530565c4b510274c72227a5f1483519a677
2016-04-03 10:02:00 -04:00
The Android Automerger e4ca846da4 merge in nyc-release history after reset to nyc-dev 2016-04-03 00:02:40 -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
Ethan Yonker 308b1cadc4 Really remove all old SP* flags and code
Change-Id: I5ece02a8721e1b7541fb5182366a55fd0f037a7a
2016-04-01 22:39:22 -05: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
Ethan Yonker f177066df7 3.0.1-0
Change-Id: Iecf5c3f70559ef90e18f4807f80707fa5a3c78f0
2016-03-31 14:38:42 -05:00
Dees Troy eac1412e82 Merge "language: add 2 new strings to DE" into android-6.0 2016-03-31 21:31:42 +02:00
z31s1g ca859576b3 language: add 2 new strings to DE
Change-Id: Ic9d51ddb7a8e47c62399d2e3101e788994276104
2016-03-31 21:28:33 +02:00
Dees Troy 325e4dfa24 Merge "languages: add Reboot Option translation" into android-6.0 2016-03-31 21:28:11 +02:00
Daniel Sikorski f4d1686a5f languages: add Reboot Option translation
Change-Id: I33acec5b4d0a371978bf2a6ab3beb26d0d18400f
2016-03-31 20:08:38 +01:00