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

Merge "Fix SystemUI crash for work challenge" into nyc-dev

Browse Source 
am: b00ff01

* commit 'b00ff01f7b732eb0b3fb6bacd4597cd6b157e681':
  Fix SystemUI crash for work challenge

Change-Id: Ideae53ce87ec6ffeabb0757719e3e8ed2f74245a
This commit is contained in:
Ricky Wai
2016-04-05 17:51:45 +00:00
committed by android-build-merger
parent 5f2be085d2 b00ff01f7b
commit 6547a24282
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
View File

@@ -1847,11 +1847,12 @@ public abstract class BaseStatusBar extends SystemUI implements
.getIdentifier();
if (mLockPatternUtils.isSeparateProfileChallengeEnabled(userId)
&& mKeyguardManager.isDeviceLocked(userId)) {
// Show work challenge, do not run pendingintent and
// remove notification
startWorkChallenge(userId, intent.getIntentSender(),
notificationKey);
return;
if (startWorkChallengeIfNecessary(userId,
intent.getIntentSender(), notificationKey)) {
// Show work challenge, do not run pendingintent and
// remove notification
return;
}
}
}
try {
@@ -1889,21 +1890,25 @@ public abstract class BaseStatusBar extends SystemUI implements
}, afterKeyguardGone);
}
public void startWorkChallenge(int userId, IntentSender intendSender,
public boolean startWorkChallengeIfNecessary(int userId, IntentSender intendSender,
String notificationKey) {
final Intent newIntent = mKeyguardManager.createConfirmDeviceCredentialIntent(null,
null, userId);
if (newIntent == null) {
return false;
}
final Intent callBackIntent = new Intent(
WORK_CHALLENGE_UNLOCKED_NOTIFICATION_ACTION);
callBackIntent.putExtra(Intent.EXTRA_INTENT, intendSender);
callBackIntent.putExtra(Intent.EXTRA_INDEX, notificationKey);
callBackIntent.setPackage(mContext.getPackageName());
final Intent newIntent = mKeyguardManager.createConfirmDeviceCredentialIntent(null,
null, userId);
newIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
| Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS | Intent.FLAG_ACTIVITY_CLEAR_TASK);
newIntent.putExtra(Intent.EXTRA_INTENT, PendingIntent
.getBroadcast(mContext, 0, callBackIntent, 0).getIntentSender());
mContext.startActivity(newIntent);
return true;
}
public void register(ExpandableNotificationRow row, StatusBarNotification sbn) {