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

packages/apps/Settings

Commit MetaInfo

• Revision: afdfe99117dbb6481d349b79d3c55dc2f343e9d0 (tree)
• Zeit: 2020-03-13 05:34:30
• Autor: Mill Chen <millchen@goog...>
• Commiter: Anis Assi

Log Message

RESTRICT AUTOMERGE
Allow LockScreenPattern to be launched in the pinning screen

If work profile lock is enabled and work app is pinned, users will get a
black/white screen on the phone. That's because Settings is prevented
from other apps launch any pages of Settings in the pinning mode.

In order to launch some pages of Settings from other apps, we add a
condition to the preventive mechanism and allow the activity inherited
from SettingsBaseActivity to override the condition to have the activity
to be launched from other apps in the pinning mode.

Bug: 137015265
Bug: 135604684
Test: manual test
Change-Id: I8070de79a83350d1658efcb19e983669dad0e673
Merged-In: I8070de79a83350d1658efcb19e983669dad0e673
(cherry picked from commit 101c9be6c1f7f89cb1b8a788b8e6e62358684d94)

Ändern Zusammenfassung

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

Diff

--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -255,7 +255,7 @@ public class SettingsActivity extends SettingsDrawerActivity
     protected void onCreate(Bundle savedState) {
         super.onCreate(savedState);
 
-        if (isLockTaskModePinned() && !isSettingsRunOnTop()) {
+        if (isLockTaskModePinned() && !isSettingsRunOnTop() && !isLaunchableInTaskModePinned()) {
             Log.w(LOG_TAG, "Devices lock task mode pinned.");
             finish();
         }
@@ -964,6 +964,13 @@ public class SettingsActivity extends SettingsDrawerActivity
         startActivity(intent);
     }
 
+    /**
+     * @return whether or not the activity can be launched from other apps in the pinning screen.
+     */
+    public boolean isLaunchableInTaskModePinned() {
+        return false;
+    }
+
     private boolean isLockTaskModePinned() {
         final ActivityManager activityManager =
             getApplicationContext().getSystemService(ActivityManager.class);

--- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
@@ -134,6 +134,11 @@ public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivi
         }
     }
 
+    @Override
+    public boolean isLaunchableInTaskModePinned() {
+        return true;
+    }
+
     public void prepareEnterAnimation() {
         getFragment().prepareEnterAnimation();
     }