Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use KeyguardStateController in GlobalActionsDialog" into rvc-dev am: 26e248664d

Browse Source 
Change-Id: I559423f49ff1bc7a2ce4f31e73886d3df3dc5faa
This commit is contained in:
Automerger Merge Worker
2020-02-25 14:18:45 +00:00
parent ebe4eedfdd 26e248664d
commit f08ba60985
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
View File

@@ -25,7 +25,6 @@ import android.annotation.Nullable;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.app.Dialog; import android.app.Dialog;
import android.app.IActivityManager; import android.app.IActivityManager;
import android.app.KeyguardManager;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.app.StatusBarManager; import android.app.StatusBarManager;
import android.app.WallpaperManager; import android.app.WallpaperManager;
@@ -152,7 +151,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
private final IDreamManager mDreamManager; private final IDreamManager mDreamManager;
private final DevicePolicyManager mDevicePolicyManager; private final DevicePolicyManager mDevicePolicyManager;
private final LockPatternUtils mLockPatternUtils; private final LockPatternUtils mLockPatternUtils;
private final KeyguardManager mKeyguardManager; private final KeyguardStateController mKeyguardStateController;
private final BroadcastDispatcher mBroadcastDispatcher; private final BroadcastDispatcher mBroadcastDispatcher;
private final ContentResolver mContentResolver; private final ContentResolver mContentResolver;
private final Resources mResources; private final Resources mResources;
@@ -198,7 +197,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
public GlobalActionsDialog(Context context, GlobalActionsManager windowManagerFuncs, public GlobalActionsDialog(Context context, GlobalActionsManager windowManagerFuncs,
AudioManager audioManager, IDreamManager iDreamManager, AudioManager audioManager, IDreamManager iDreamManager,
DevicePolicyManager devicePolicyManager, LockPatternUtils lockPatternUtils, DevicePolicyManager devicePolicyManager, LockPatternUtils lockPatternUtils,
KeyguardManager keyguardManager, BroadcastDispatcher broadcastDispatcher, BroadcastDispatcher broadcastDispatcher,
ConnectivityManager connectivityManager, TelephonyManager telephonyManager, ConnectivityManager connectivityManager, TelephonyManager telephonyManager,
ContentResolver contentResolver, @Nullable Vibrator vibrator, @Main Resources resources, ContentResolver contentResolver, @Nullable Vibrator vibrator, @Main Resources resources,
ConfigurationController configurationController, ActivityStarter activityStarter, ConfigurationController configurationController, ActivityStarter activityStarter,
@@ -216,7 +215,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
mDreamManager = iDreamManager; mDreamManager = iDreamManager;
mDevicePolicyManager = devicePolicyManager; mDevicePolicyManager = devicePolicyManager;
mLockPatternUtils = lockPatternUtils; mLockPatternUtils = lockPatternUtils;
mKeyguardManager = keyguardManager; mKeyguardStateController = keyguardStateController;
mBroadcastDispatcher = broadcastDispatcher; mBroadcastDispatcher = broadcastDispatcher;
mContentResolver = contentResolver; mContentResolver = contentResolver;
mResources = resources; mResources = resources;
@@ -427,7 +426,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
.startPendingIntentDismissingKeyguard(intent); .startPendingIntentDismissingKeyguard(intent);
} }
}, },
mKeyguardManager.isDeviceLocked()) !mKeyguardStateController.isUnlocked())
: null; : null;
ActionsDialog dialog = new ActionsDialog(mContext, mAdapter, panelViewController, ActionsDialog dialog = new ActionsDialog(mContext, mAdapter, panelViewController,
@@ -444,12 +443,12 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
} }
private boolean shouldDisplayLockdown() { private boolean shouldDisplayLockdown() {
int userId = getCurrentUser().id;
// Lockdown is meaningless without a place to go. // Lockdown is meaningless without a place to go.
if (!mKeyguardManager.isDeviceSecure(userId)) { if (!mKeyguardStateController.isMethodSecure()) {
return false; return false;
} }
int userId = getCurrentUser().id;
// Only show the lockdown button if the device isn't locked down (for whatever reason). // Only show the lockdown button if the device isn't locked down (for whatever reason).
int state = mLockPatternUtils.getStrongAuthForUser(userId); int state = mLockPatternUtils.getStrongAuthForUser(userId);
return (state == STRONG_AUTH_NOT_REQUIRED return (state == STRONG_AUTH_NOT_REQUIRED
@@ -1914,7 +1913,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
} }
private boolean shouldShowControls() { private boolean shouldShowControls() {
return !mKeyguardManager.isDeviceLocked() return mKeyguardStateController.isUnlocked()
&& mControlsUiController.getAvailable(); && mControlsUiController.getAvailable();
} }
} }