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

Unverified Commit c239fc7f authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-9.0.0_r53' into staging/lineage-16.0_merge-android-9.0.0_r53 

Android 9.0.0 Release 53 (6107734)

* tag 'android-9.0.0_r53':
  Prevent accounts page directly opening in screen pinning mode

Change-Id: I84f8d909df98b517478eea5bf67fed047db445f5
parents 2dbb9c86 65e18e18

src/com/android/settings/SettingsActivity.java

+20 −0
Original line number Diff line number Diff line
@@ -234,6 +234,12 @@ public class SettingsActivity extends SettingsDrawerActivity 
    protected void onCreate(Bundle savedState) {

        super.onCreate(savedState);

        Log.d(LOG_TAG, "Starting onCreate");



        if (isLockTaskModePinned() && !isSettingsRunOnTop()) {

            Log.w(LOG_TAG, "Devices lock task mode pinned.");

            finish();

        }



        long startTime = System.currentTimeMillis();



        final FeatureFactory factory = FeatureFactory.getFactory(this);
@@ -810,4 +816,18 @@ public class SettingsActivity extends SettingsDrawerActivity 


        return bitmap;

    }



    private boolean isLockTaskModePinned() {

        final ActivityManager activityManager =

            getApplicationContext().getSystemService(ActivityManager.class);

        return activityManager.getLockTaskModeState() == ActivityManager.LOCK_TASK_MODE_PINNED;

    }



    private boolean isSettingsRunOnTop() {

        final ActivityManager activityManager =

            getApplicationContext().getSystemService(ActivityManager.class);

        final String taskPkgName = activityManager.getRunningTasks(1 /* maxNum */)

            .get(0 /* index */).baseActivity.getPackageName();

        return TextUtils.equals(getPackageName(), taskPkgName);

    }

}