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

Commit 82e9a3d2 authored by Rubin Xu's avatar Rubin Xu Committed by Automerger Merge Worker
Browse files

Merge "Remove password shards from memory" into rvc-dev am: 01bd0fca 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11838400

Change-Id: I2ff8a9463851852845940ab75fe3202c7739b9a4
parents fb59d6c8 01bd0fca

src/com/android/settings/password/ChooseLockGeneric.java

+8 −0
Original line number Diff line number Diff line
@@ -821,6 +821,14 @@ public class ChooseLockGeneric extends SettingsActivity { 
        @Override

        public void onDestroy() {

            super.onDestroy();

            if (mUserPassword != null) {

                mUserPassword.zeroize();

            }

            // Force a garbage collection immediately to remove remnant of user password shards

            // from memory.

            System.gc();

            System.runFinalization();

            System.gc();

        }



        @Override

src/com/android/settings/password/ChooseLockPassword.java

+13 −0
Original line number Diff line number Diff line
@@ -530,6 +530,19 @@ public class ChooseLockPassword extends SettingsActivity { 
            }

        }



        @Override

        public void onDestroy() {

            super.onDestroy();

            if (mCurrentCredential != null) {

                mCurrentCredential.zeroize();

            }

            // Force a garbage collection immediately to remove remnant of user password shards

            // from memory.

            System.gc();

            System.runFinalization();

            System.gc();

        }



        protected int getStageType() {

            return mForFingerprint ? Stage.TYPE_FINGERPRINT :

                    mForFace ? Stage.TYPE_FACE :

src/com/android/settings/password/ChooseLockPattern.java

+13 −0
Original line number Diff line number Diff line
@@ -617,6 +617,19 @@ public class ChooseLockPattern extends SettingsActivity { 
            }

        }



        @Override

        public void onDestroy() {

            super.onDestroy();

            if (mCurrentCredential != null) {

                mCurrentCredential.zeroize();

            }

            // Force a garbage collection immediately to remove remnant of user password shards

            // from memory.

            System.gc();

            System.runFinalization();

            System.gc();

        }



        protected Intent getRedactionInterstitialIntent(Context context) {

            return RedactionInterstitial.createStartIntent(context, mUserId);

        }

src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java

+10 −0
Original line number Diff line number Diff line
@@ -157,6 +157,16 @@ public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivi 
        }

    }



    @Override

    public void onDestroy() {

        super.onDestroy();

        // Force a garbage collection immediately to remove remnant of user password shards

        // from memory.

        System.gc();

        System.runFinalization();

        System.gc();

    }



    @Override

    public void finish() {

        super.finish();

src/com/android/settings/password/ConfirmLockPassword.java

+11 −0
Original line number Diff line number Diff line
@@ -217,6 +217,17 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity { 
            }

        }



        @Override

        public void onDestroy() {

            super.onDestroy();

            mPasswordEntry.setText(null);

            // Force a garbage collection immediately to remove remnant of user password shards

            // from memory.

            System.gc();

            System.runFinalization();

            System.gc();

        }



        private int getDefaultHeader() {

            if (mFrp) {

                return mIsAlpha ? R.string.lockpassword_confirm_your_password_header_frp