Commit Graph
7512 Commits
Author SHA1 Message Date
Michael Runge c224ac28ad am 3b5c6dca: am 2f0ef730: Treat already-renamed files as having no problems.
* commit '3b5c6dca0a448d1a09bf9adb905bc5a86230c7fc':
  Treat already-renamed files as having no problems.
2014-10-23 20:40:59 +00:00
Michael Runge 168f777877 Allow passing of mount args to mountFn
Bug: 18079773
Bug: 18092222

Change-Id: Ifc3f3e123de729dfbb2f49414b3207afa96268d5
2014-10-23 18:13:26 +00:00
Brian Carlstrom 473967d87f Merge "Log to UI any metadata setting errors" into lmp-dev 2014-10-23 17:18:13 +00:00
Michael Runge d4a63426ef Log to UI any metadata setting errors
Bug: 18079773
Change-Id: Ic6fddbcbcb6ddb9e1cbd1698df98387c0033ae15
2014-10-23 10:06:33 -07:00
Nick Kralevich d0602fbb88 am 9b2db80d: Merge "Make /cache/recovery/last_log available in recovery" into lmp-dev
* commit '9b2db80d407752fd524e799e4c7051162e63f91c':
  Make /cache/recovery/last_log available in recovery
2014-10-23 16:34:39 +00:00
Michael Runge 3b5c6dca0a am 2f0ef730: Treat already-renamed files as having no problems.
* commit '2f0ef73029fc51c6404121f338b034c8b516652c':
  Treat already-renamed files as having no problems.
2014-10-23 16:34:38 +00:00
Nick Kralevich 9b2db80d40 Merge "Make /cache/recovery/last_log available in recovery" into lmp-dev 2014-10-23 15:37:10 +00:00
Dan Albert 38388a7216 am 0745fbfa: am c7249660: am 4f66469b: Merge "More test makefile cleanup."
* commit '0745fbfad9cadafc0f911ec7c6d06d470839b85a':
2014-10-23 15:07:58 +00:00
Dan Albert 6ee44c8aaf am 440185cd: am ea5828a2: am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb.""
* commit '440185cdd383289fbf8afec353aa64fe0ed30773':
2014-10-23 15:07:57 +00:00
Jeff Sharkey 8e76d2b005 am 39705685: am e95ed95f: am a6e13ae0: Include reason when wiping data.
* commit '3970568560f62c87d9ef7a1c0617c16b23271b6e':
2014-10-23 15:07:57 +00:00
Elliott Hughes 50758abdc8 am e5ce559f: am 78a30278: am 530b61e0: Merge "Copy epoll(2) changes to minadb."
* commit 'e5ce559fb620ddea535b428d4cc21da701a5e4e7':
2014-10-23 15:07:56 +00:00
The Android Automerger 249604c5da merge in lmp-mr1-release history after reset to 9eb8c8bdbe 2014-10-23 06:09:34 -07:00
Dan Albert 0745fbfad9 am c7249660: am 4f66469b: Merge "More test makefile cleanup."
* commit 'c7249660f908c74687b5fdadc1296eb9d4903cc7':
2014-10-23 13:04:57 +00:00
Dan Albert 440185cdd3 am ea5828a2: am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb.""
* commit 'ea5828a24f3a8f6a44e2f15e76cacdb5bc524db0':
2014-10-23 13:04:57 +00:00
Jeff Sharkey 3970568560 am e95ed95f: am a6e13ae0: Include reason when wiping data.
* commit 'e95ed95f05d22929e0bb8610a83c4e6a01fb3a33':
2014-10-23 13:04:56 +00:00
Elliott Hughes e5ce559fb6 am 78a30278: am 530b61e0: Merge "Copy epoll(2) changes to minadb."
* commit '78a30278607f0e57ace53eb5df7e5f7f196387a4':
2014-10-23 13:04:56 +00:00
Nick Kralevich a9ad0324d1 Make /cache/recovery/last_log available in recovery
Create a new recovery UI option to allow the user to view
/cache/recovery/last_log for their device. This gives enhanced
debugging information which may be necessary when a failed
OTA occurs.

Bug: 18094012
Change-Id: Ic3228de96e9bfc2a0141c7aab4ce392a38140cf3
2014-10-22 21:43:08 -07:00
Michael Runge d5b1727765 Treat already-renamed files as having no problems.
This should help with reentrant OTAs.

Bug: 18079773

Change-Id: I102fd738e3b450483ecd4471384c12e89fc586e2
2014-10-22 17:44:33 -07:00
Michael Runge 2f0ef73029 Treat already-renamed files as having no problems.
This should help with reentrant OTAs.

Bug: 18079773

Change-Id: I102fd738e3b450483ecd4471384c12e89fc586e2
2014-10-23 00:04:36 +00:00
Ethan Yonker b53fcaa35f 2.8.1.0
Change-Id: Idd08b4a2d388fa4d456f53a6794e7e606e9025e7
2014-10-22 14:02:51 -05:00
Ethan Yonker ffbd6ffc21 Fix crash when rapid firing command line commands
Change-Id: I0caaa51720fe3608b8c4cb02f046afb3cbaa54f9
2014-10-22 10:48:16 -05:00
The Android Automerger e458ddc583 merge in lmp-mr1-release history after reset to 9eb8c8bdbe 2014-10-22 06:08:47 -07:00
The Android Automerger 6dcd119446 merge in lmp-release history after reset to a6e13ae01b 2014-10-21 17:42:57 -07:00
JP Abgrall a7a0ed94a2 am dd57886c: am 9eb8c8bd: init.rc: Inidicate that booting is complete wrt firwmare requests
* commit 'dd57886ce6ec100ce212b7d8d1f6991a4b77e004':
  init.rc: Inidicate that booting is complete wrt firwmare requests
2014-10-21 17:48:18 +00:00
JP Abgrall dd57886ce6 am 9eb8c8bd: init.rc: Inidicate that booting is complete wrt firwmare requests
* commit '9eb8c8bdbe4965e9a92d83882e97cf67aee20821':
  init.rc: Inidicate that booting is complete wrt firwmare requests
2014-10-21 17:42:56 +00:00
The Android Automerger e55d0326c4 merge in lmp-release history after reset to a6e13ae01b 2014-10-21 06:09:31 -07:00
The Android Automerger 0951a52857 merge in lmp-mr1-release history after reset to d83e4f1589 2014-10-21 06:08:48 -07:00
HandyMenny b603345e32 Add support for temperatures in tenths of a degree Celsius
Change-Id: I3aa7c3d193715b8c309a99afd23e753a559e3083
2014-10-21 13:58:17 +02:00
JP Abgrall 9eb8c8bdbe init.rc: Inidicate that booting is complete wrt firwmare requests
ueventd will wait for /dev/.booting to go away before giving up
on loading firmware.
The issue was introduced in Ifdd5dd1e95d7e064dde5c80b70198882d949a710
which forgot to update recovery's init.rc

Bug: 17993625
Change-Id: I91205fe6eea50aaef9b401d650ec8d6843a92a57
2014-10-20 20:02:57 -07:00
The Android Automerger 4bc3aa2f5b merge in lmp-mr1-release history after reset to d83e4f1589 2014-10-20 06:08:45 -07:00
HandyMenny 466dc9764b gui: Disable unnecessary checks if TW_CUSTOM_THEME is defined
if TW_CUSTOM_THEME is defined there's no need to check if
$(commands_recovery_local_path)/gui/devices/$(DEVICE_RESOLUTION) exist.

Change-Id: I234374eb1db187758102ca64884a94a81c938b54
2014-10-20 14:50:07 +02:00
Ethan Yonker 5ef301ec95 Do not set contexts during a factory reset
We should not need to set or change the contexts of the media
folder when doing a factory reset. We should only do this when
we need to recreate the media folder.

Change-Id: I9f9918743d687b0aa0eb1e50747677f883037047
2014-10-20 14:42:47 +02:00
Captain Throwback a7f5ce31da Fix placement of Android Secure and SD-EXT on wipe page
Change-Id: Iac1c13b38df2ac66106abcda7c9d171a1549b65f
2014-10-20 07:41:13 -05:00
The Android Automerger b57de6082a merge in lmp-release history after reset to a6e13ae01b 2014-10-19 17:07:49 -07:00
The Android Automerger 7c2f54b9b3 merge in lmp-mr1-release history after reset to d83e4f1589 2014-10-19 06:08:39 -07:00
The Android Automerger b453560037 merge in lmp-mr1-release history after reset to d83e4f1589 2014-10-18 06:09:04 -07:00
Dan Albert 92fb368036 am 5b7f5b15: am 4f66469b: Merge "More test makefile cleanup."
* commit '5b7f5b15af016299e10d18979ec65720ab447786':
  More test makefile cleanup.
2014-10-17 07:53:34 +00:00
Dan Albert 5b7f5b15af am 4f66469b: Merge "More test makefile cleanup."
* commit '4f66469b29a34811b69518a266be31fe42cc111b':
  More test makefile cleanup.
2014-10-17 07:48:06 +00:00
Dan Albert c7249660f9 am 4f66469b: Merge "More test makefile cleanup."
* commit '4f66469b29a34811b69518a266be31fe42cc111b':
  More test makefile cleanup.
2014-10-17 07:47:57 +00:00
Dan Albert 4f66469b29 Merge "More test makefile cleanup." 2014-10-17 01:28:35 +00:00
Dan Albert 13f21c2bc7 More test makefile cleanup.
Global variables kill.
No need to manually link gtest, and that causes problems with
libc++.

Change-Id: If804cdd436cf1addfa9a777708efbc37c27770b6
2014-10-17 01:05:08 +00:00
The Android Automerger a238104904 merge in lmp-release history after reset to a6e13ae01b 2014-10-16 06:09:42 -07:00
The Android Automerger d9993ef3f7 merge in lmp-mr1-release history after reset to d83e4f1589 2014-10-16 06:09:17 -07:00
The Android Automerger 3648601635 merge in lmp-release history after reset to a6e13ae01b 2014-10-15 06:09:28 -07:00
The Android Automerger f6674a8b1a merge in lmp-mr1-release history after reset to d83e4f1589 2014-10-15 06:09:03 -07:00
Ethan Yonker 25f20c1928 Fix wiping crash when block device is not present
Especially with /sd-ext, trying to wipe when the device is not
present causes a seg fault in the make_ext4fs function. Check to
make sure that the block device is present before trying to wipe.

Change-Id: I91973b5b832c9edbce81d61a271e84363c19e6c5
2014-10-14 09:04:54 -05:00
that 5823d48f9e mtp: fix log spam: findNode not finding a node is not an error
The requested file might be on another storage.

Change-Id: Ia71525058b616a28a8ea2b4ab48ebac1c790757e
2014-10-14 15:19:29 +02:00
Captain Throwback 5f4fd8c03e Update reference to 24-hour clock
Change-Id: Ic864fae4fda9707fc84d6d8b33587863b7664e1e
2014-10-14 08:17:04 -05:00
The Android Automerger c6aafd42da merge in lmp-release history after reset to a6e13ae01b 2014-10-14 06:09:29 -07:00
The Android Automerger f780f45619 merge in lmp-mr1-release history after reset to d83e4f1589 2014-10-14 06:09:00 -07:00