Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to upstream #34

Merged
merged 5 commits into from
Feb 4, 2015
Merged

Update to upstream #34

merged 5 commits into from
Feb 4, 2015

Conversation

percy-g2
Copy link
Member

@percy-g2 percy-g2 commented Feb 4, 2015

No description provided.

intervigilium and others added 5 commits February 3, 2015 17:35
This reverts commit 13d53a4.

Change-Id: I66d0c957d52fc7f2324d1641d8af9880b8b2f7d5
…em type"

This reverts commit d1bec30.

Change-Id: Iadcdf9d96dfd455bae61241bf8d6e14086ce32e7
* Add this function for recovery to use

Change-Id: I314c5452a337245ecac5c9628ad0568018e1cf7b
* Prevent accidentally destroying a partition of the wrong type.
* Don't skip iterations of the internal mount_all loop, otherwise
  encryptability may not be properly handled.

Change-Id: I8f3ddc396a5fb85f4ae0a0a11dd61fb4d6462d6d
L moved the location of install-recovery.sh from /system/etc/ to
/system/bin. Since CWM recovery isn't looking for this location
anyway, let's return the file to this standard location. This allows
all other code in L to function properly.

Maintain the change to the init to allow flash_recovery to be disabled
in settings.

Change-Id: I8a85db8addeb75a2fd60d809c5ed4edc619ef7ed
percy-g2 added a commit that referenced this pull request Feb 4, 2015
@percy-g2 percy-g2 merged commit a3f9e13 into XperiaSTE:cm-12.0 Feb 4, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants