am cfc32485: am f4f36166: am 45f64af8: am 9c5896b8: Merge "Always execute... (25cfac62) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+19 −15

Original line number	Original line	Diff line number	Diff line
	@@ -266,6 +266,14 @@ public abstract class BaseStatusBar extends SystemUI implements
	if (DEBUG) {		if (DEBUG) {
	Log.v(TAG, "Notification click handler invoked for intent: " + pendingIntent);		Log.v(TAG, "Notification click handler invoked for intent: " + pendingIntent);
	}		}
			// The intent we are sending is for the application, which
			// won't have permission to immediately start an activity after
			// the user switches to home. We know it is safe to do at this
			// point, so make sure new activity switches are now allowed.
			try {
			ActivityManagerNative.getDefault().resumeAppSwitches();
			} catch (RemoteException e) {
			}
	final boolean isActivity = pendingIntent.isActivity();		final boolean isActivity = pendingIntent.isActivity();
	if (isActivity) {		if (isActivity) {
	final boolean keyguardShowing = mStatusBarKeyguardViewManager.isShowing();		final boolean keyguardShowing = mStatusBarKeyguardViewManager.isShowing();
	@@ -278,11 +286,6 @@ public abstract class BaseStatusBar extends SystemUI implements
	try {		try {
	ActivityManagerNative.getDefault()		ActivityManagerNative.getDefault()
	.keyguardWaitingForActivityDrawn();		.keyguardWaitingForActivityDrawn();
	// The intent we are sending is for the application, which
	// won't have permission to immediately start an activity after
	// the user switches to home. We know it is safe to do at this
	// point, so make sure new activity switches are now allowed.
	ActivityManagerNative.getDefault().resumeAppSwitches();
	} catch (RemoteException e) {		} catch (RemoteException e) {
	}		}
	}		}
	@@ -1486,13 +1489,15 @@ public abstract class BaseStatusBar extends SystemUI implements
	if (mIsHeadsUp) {		if (mIsHeadsUp) {
	mHeadsUpNotificationView.clear();		mHeadsUpNotificationView.clear();
	}		}
	AsyncTask.execute(new Runnable() {		new Thread() {
	@Override		@Override
	public void run() {		public void run() {
	if (keyguardShowing && !afterKeyguardGone) {
	try {		try {
			if (keyguardShowing && !afterKeyguardGone) {
	ActivityManagerNative.getDefault()		ActivityManagerNative.getDefault()
	.keyguardWaitingForActivityDrawn();		.keyguardWaitingForActivityDrawn();
			}

	// The intent we are sending is for the application, which		// The intent we are sending is for the application, which
	// won't have permission to immediately start an activity after		// won't have permission to immediately start an activity after
	// the user switches to home. We know it is safe to do at this		// the user switches to home. We know it is safe to do at this
	@@ -1500,7 +1505,6 @@ public abstract class BaseStatusBar extends SystemUI implements
	ActivityManagerNative.getDefault().resumeAppSwitches();		ActivityManagerNative.getDefault().resumeAppSwitches();
	} catch (RemoteException e) {		} catch (RemoteException e) {
	}		}
	}

	if (mIntent != null) {		if (mIntent != null) {
	try {		try {
	@@ -1524,7 +1528,7 @@ public abstract class BaseStatusBar extends SystemUI implements
	// system process is dead if we're here.		// system process is dead if we're here.
	}		}
	}		}
	});		}.start();

	// close the shade if it was open		// close the shade if it was open
	animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */);		animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */);