Merge remote-tracking branch 'origin/lineage-16.0' into v1-pie (f6ebf148) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/SettingsActivity.java

+20 −0

Original line number	Diff line number	Diff line
		@@ -235,6 +235,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);
		@@ -812,4 +818,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);
		}
		}