summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorMatt Pietal <mpietal@google.com>2021-05-14 13:24:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-05-14 13:24:28 +0000
commit989ea6ebdabdd2991ef71a8e1c78dccc7c79656b (patch)
tree44495ed3b60c15e87809e3e29f552429c16fbe46 /core/java/android
parent66dc0f32ede6e8748564aa5b261cf3ed0d284eaa (diff)
parent8cf1abfd165a013e97a6838e571fc5b65e6f1ce0 (diff)
Merge "Wallet - Listen for setting changes" into sc-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/service/quickaccesswallet/QuickAccessWalletClientImpl.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/service/quickaccesswallet/QuickAccessWalletClientImpl.java b/core/java/android/service/quickaccesswallet/QuickAccessWalletClientImpl.java
index 9d0b582dddc4..2e4af3fad1b5 100644
--- a/core/java/android/service/quickaccesswallet/QuickAccessWalletClientImpl.java
+++ b/core/java/android/service/quickaccesswallet/QuickAccessWalletClientImpl.java
@@ -61,6 +61,7 @@ import java.util.concurrent.Executor;
public class QuickAccessWalletClientImpl implements QuickAccessWalletClient, ServiceConnection {
private static final String TAG = "QAWalletSClient";
+ public static final String SETTING_KEY = "lockscreen_show_wallet";
private final Handler mHandler;
private final Context mContext;
private final Queue<ApiCaller> mRequestQueue;
@@ -96,13 +97,12 @@ public class QuickAccessWalletClientImpl implements QuickAccessWalletClient, Ser
int currentUser = ActivityManager.getCurrentUser();
return currentUser == UserHandle.USER_SYSTEM
&& checkUserSetupComplete()
- && checkSecureSetting(Settings.Secure.GLOBAL_ACTIONS_PANEL_ENABLED)
&& !new LockPatternUtils(mContext).isUserInLockdown(currentUser);
}
@Override
public boolean isWalletFeatureAvailableWhenDeviceLocked() {
- return checkSecureSetting(Settings.Secure.POWER_MENU_LOCKED_SHOW_CONTENT);
+ return checkSecureSetting(SETTING_KEY);
}
@Override