Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 867d97d1 authored by Joey Rizzoli's avatar Joey Rizzoli Committed by Joey Rizzoli
Browse files

Revert "[2/2] settings: support setting a separate encryption password" 



This reverts commit c585070f.

Separated encryption password implementation is currently not so well implemented
and it exposes some additional security issues

Change-Id: I0000476d3fae0ad067b741366efe62787213515b
Signed-off-by: default avatarJoey Rizzoli <joey@lineageos.org>
parent e97413de

AndroidManifest.xml

+0 −9
Original line number Diff line number Diff line
@@ -1842,15 +1842,6 @@ 
            android:theme="@style/SetupWizardTheme.Light"

            android:windowSoftInputMode="stateVisible|adjustResize"/>



        <activity android:name="ChooseEncryptionPassword"

            android:exported="false"

            android:theme="@style/SetupWizardTheme.Light"

            android:windowSoftInputMode="stateVisible|adjustResize"/>



        <activity android:name="ReplaceEncryptionPassword"

            android:exported="false"

            android:theme="@style/SetupWizardTheme.Light"/>



        <activity android:name=".SetupEncryptionInterstitial"

            android:label="@string/encryption_interstitial_header"

            android:taskAffinity="com.android.wizard"

res/values/cm_strings.xml

+0 −7
Original line number Diff line number Diff line
@@ -429,13 +429,6 @@ 
    <string name="heads_up_notifications_enabled_title">Heads-up</string>

    <string name="heads_up_notifications_enabled_summary">Display priority notifications in a small floating window</string>



    <!-- Encryption password -->

    <string name="crypt_keeper_change_password_title">Change encryption password</string>

    <string name="crypt_keeper_change_password_summary">Change the password used for device encryption</string>

    <string name="crypt_keeper_choose_your_password_header">Set encryption password</string>

    <string name="crypt_keeper_replace_password_title">Replace encryption password</string>

    <string name="crypt_keeper_replace_password_summary">Remove the separate encryption password</string>



    <!-- Tethering & portable hotspot other category -->

    <string name="tethering_other_category_text">Other</string>

    <!-- Wi-Fi tethering inactivity timeout -->

res/xml/security_settings_encrypted.xml

+1 −20
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
                  android:title="@string/security_settings_title">



    <PreferenceCategory

        android:key="encryption_category"

        android:key="security_category"

        android:title="@string/crypt_keeper_settings_title">



        <Preference
@@ -30,24 +30,5 @@ 


    </PreferenceCategory>



    <Preference

        android:key="crypt_keeper_change_password"

        android:title="@string/crypt_keeper_change_password_title"

        android:summary="@string/crypt_keeper_change_password_summary">



        <intent android:action="android.intent.action.MAIN"

            android:targetPackage="com.android.settings"

            android:targetClass="com.android.settings.ChooseEncryptionPassword" />

    </Preference>



    <Preference

        android:key="crypt_keeper_replace_password"

        android:title="@string/crypt_keeper_replace_password_title"

        android:summary="@string/crypt_keeper_replace_password_summary">



        <intent android:action="android.intent.action.MAIN"

            android:targetPackage="com.android.settings"

            android:targetClass="com.android.settings.ReplaceEncryptionPassword" />

    </Preference>



</PreferenceScreen>