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

Commit 438c3af0 authored by Eric Biggers's avatar Eric Biggers
Browse files

Remove CryptKeeper 

Since Android 10, new devices have been required to use FBE (File Based
Encryption) instead of FDE (Full Disk Encryption).  FDE support was
already removed from system components such as init and vold.
Therefore, the CryptKeeper activity is no longer needed.  Remove it.

Note: this CL only removes CryptKeeper itself, i.e. the activity which
runs at boot time on devices that are using FDE or are being encrypted
with FDE in-place.  Later CLs will remove FDE-specific code from the
Settings app.

Bug: 208476087
Change-Id: I4aaf795e8cee1ff3cdd55a41c975273c8faeefa9
(cherry picked from commit 43616ed3)
Merged-In: I4aaf795e8cee1ff3cdd55a41c975273c8faeefa9
parent 41790c68

AndroidManifest.xml

+0 −25
Original line number Diff line number Diff line
@@ -2834,25 +2834,6 @@ 
                       android:value="@string/menu_key_accounts"/>

        </activity>



        <activity android:name=".CryptKeeper"

                  androidprv:systemUserOnly="true"

                  android:immersive="true"

                  android:launchMode="singleTop"

                  android:excludeFromRecents="true"

                  android:theme="@style/Theme.CryptKeeper"

                  android:configChanges="mnc|mcc|keyboard|keyboardHidden|uiMode"

                  android:windowSoftInputMode="adjustResize"

                  android:screenOrientation="nosensor"

                  android:taskAffinity="com.android.settings.CryptKeeper"

                  android:exported="true"

                  android:process=":CryptKeeper">

            <intent-filter android:priority="10">

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.HOME" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>



        <!-- Triggered when user-selected home app isn't encryption aware -->

        <activity android:name=".FallbackHome"

                  android:excludeFromRecents="true"
@@ -2868,12 +2849,6 @@ 
            </intent-filter>

        </activity>



        <activity android:name=".CryptKeeper$FadeToBlack"

            android:immersive="true"

            android:launchMode="singleTop"

            android:theme="@style/CryptKeeperBlankTheme"

        />



        <activity android:name=".CryptKeeperConfirm$Blank"

            android:immersive="true"

            android:launchMode="singleTop"

color-check-baseline.xml

+0 −144
Original line number Diff line number Diff line
@@ -77,22 +77,6 @@ 
            column="5"/>

    </issue>



    <issue

        id="HardCodedColor"

        severity="Error"

        message="Avoid using hardcoded color"

        category="Correctness"

        priority="4"

        summary="Using hardcoded color"

        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."

        errorLine1="    &lt;color name=&quot;crypt_keeper_clock_background&quot;>#ff9a9a9a&lt;/color>"

        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/values/colors.xml"

            line="20"

            column="5"/>

    </issue>



    <issue

        id="HardCodedColor"

        severity="Error"
@@ -109,22 +93,6 @@ 
            column="5"/>

    </issue>



    <issue

        id="HardCodedColor"

        severity="Error"

        message="Avoid using hardcoded color"

        category="Correctness"

        priority="4"

        summary="Using hardcoded color"

        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."

        errorLine1="    &lt;color name=&quot;crypt_keeper_clock_foreground&quot;>#ff666666&lt;/color>"

        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/values/colors.xml"

            line="21"

            column="5"/>

    </issue>



    <issue

        id="HardCodedColor"

        severity="Error"
@@ -141,38 +109,6 @@ 
            column="5"/>

    </issue>



    <issue

        id="HardCodedColor"

        severity="Error"

        message="Avoid using hardcoded color"

        category="Correctness"

        priority="4"

        summary="Using hardcoded color"

        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."

        errorLine1="    &lt;color name=&quot;crypt_keeper_clock_am_pm&quot;>#ff9a9a9a&lt;/color>"

        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/values/colors.xml"

            line="22"

            column="5"/>

    </issue>



    <issue

        id="HardCodedColor"

        severity="Error"

        message="Avoid using hardcoded color"

        category="Correctness"

        priority="4"

        summary="Using hardcoded color"

        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."

        errorLine1="    &lt;color name=&quot;crypt_keeper_password_background&quot;>#70606060&lt;/color>"

        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/values/colors.xml"

            line="23"

            column="5"/>

    </issue>



    <issue

        id="HardCodedColor"

        severity="Error"
@@ -2141,86 +2077,6 @@ 
            column="8"/>

    </issue>



    <issue

        id="HardCodedColor"

        severity="Error"

        message="Avoid using hardcoded color"

        category="Correctness"

        priority="4"

        summary="Using hardcoded color"

        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."

        errorLine1="        android:textColor=&quot;#FFFFFF&quot;"

        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/layout/crypt_keeper_emergency_button.xml"

            line="35"

            column="9"/>

    </issue>



    <issue

        id="HardCodedColor"

        severity="Error"

        message="Avoid using hardcoded color"

        category="Correctness"

        priority="4"

        summary="Using hardcoded color"

        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."

        errorLine1="        android:background=&quot;@color/crypt_keeper_password_background&quot;>"

        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/layout/crypt_keeper_password_entry.xml"

            line="34"

            column="9"/>

    </issue>



    <issue

        id="HardCodedColor"

        severity="Error"

        message="Avoid using hardcoded color"

        category="Correctness"

        priority="4"

        summary="Using hardcoded color"

        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."

        errorLine1="       android:background=&quot;@color/lock_pattern_background&quot; />"

        errorLine2="       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/layout/crypt_keeper_pattern_field.xml"

            line="27"

            column="8"/>

    </issue>



    <issue

        id="HardCodedColor"

        severity="Error"

        message="Avoid using hardcoded color"

        category="Correctness"

        priority="4"

        summary="Using hardcoded color"

        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."

        errorLine1="        android:background=&quot;@color/crypt_keeper_password_background&quot;>"

        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/layout/crypt_keeper_pin_entry.xml"

            line="34"

            column="9"/>

    </issue>



    <issue

        id="HardCodedColor"

        severity="Error"

        message="Avoid using hardcoded color"

        category="Correctness"

        priority="4"

        summary="Using hardcoded color"

        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."

        errorLine1="        android:textColor=&quot;#B3FFFFFF&quot;"

        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/layout/crypt_keeper_status.xml"

            line="55"

            column="9"/>

    </issue>



    <issue

        id="HardCodedColor"

        severity="Error"

res/drawable-hdpi/encroid_waiting.png

deleted100644 → 0
−23.6 KiB
Loading image diff...

res/drawable-mdpi/encroid_waiting.png

deleted100644 → 0
−13.8 KiB
Loading image diff...

res/drawable-xhdpi/encroid_waiting.png

deleted100644 → 0
−35.2 KiB
Loading image diff...