Commit: b1d3a6f5ca9a5013a6e7f2890353ec437e48523d - packages-apps-Settings (git)

packages/apps/Settings

Commit MetaInfo

• Revision: b1d3a6f5ca9a5013a6e7f2890353ec437e48523d (tree)
• Zeit: 2020-03-16 19:39:20
• Autor: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

Android 8.1.0 release 74
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXl1rCQAKCRDorT+BmrEO
eFCeAJ9UJgfPhmkQJU5Gp0kOdqE9Zy2jaACfSxWjhj5l1kcdjxISYXjVhfRh5nk=
=8xTt
-----END PGP SIGNATURE-----

Merge tag 'android-8.1.0_r74' into oreo-x86

Android 8.1.0 release 74

Ändern Zusammenfassung

• modified: src/com/android/settings/SettingsActivity.java

Diff

--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -254,6 +254,12 @@ public class SettingsActivity extends SettingsDrawerActivity
     @Override
     protected void onCreate(Bundle savedState) {
         super.onCreate(savedState);
+
+        if (isLockTaskModePinned() && !isSettingsRunOnTop()) {
+            Log.w(LOG_TAG, "Devices lock task mode pinned.");
+            finish();
+        }
+
         long startTime = System.currentTimeMillis();
 
         final FeatureFactory factory = FeatureFactory.getFactory(this);
@@ -962,4 +968,18 @@ public class SettingsActivity extends SettingsDrawerActivity
         Intent intent = new Intent(this, SearchActivity.class);
         startActivity(intent);
     }
+
+    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);
+    }
 }