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

am 6e4ee9d5: Merge "Make onClickHandler in KeyguardHostView a weak reference" into klp-dev

Browse Source 
* commit '6e4ee9d50f59b15a523d6e252b7f3f2dc8b773f5':
  Make onClickHandler in KeyguardHostView a weak reference
This commit is contained in:
Chet Haase
2013-10-01 16:46:40 -07:00
committed by Android Git Automerger
parent 0ba4a29c97 6e4ee9d50f
commit 0d5a9fde7e
1 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java
View File

@@ -57,6 +57,7 @@ import android.view.WindowManager;
import android.widget.RemoteViews.OnClickHandler; import android.widget.RemoteViews.OnClickHandler;
import java.io.File; import java.io.File;
import java.lang.ref.WeakReference;
import java.util.List; import java.util.List;
public class KeyguardHostView extends KeyguardViewBase { public class KeyguardHostView extends KeyguardViewBase {
@@ -124,6 +125,8 @@ public class KeyguardHostView extends KeyguardViewBase {
private final Rect mInsets = new Rect(); private final Rect mInsets = new Rect();
private MyOnClickHandler mOnClickHandler = new MyOnClickHandler(this);
/*package*/ interface UserSwitcherCallback { /*package*/ interface UserSwitcherCallback {
void hideSecurityView(int duration); void hideSecurityView(int duration);
void showSecurityView(); void showSecurityView();
@@ -812,24 +815,39 @@ public class KeyguardHostView extends KeyguardViewBase {
} }
} }
private OnClickHandler mOnClickHandler = new OnClickHandler() { private static class MyOnClickHandler extends OnClickHandler {
// weak reference to the hostView to avoid keeping a live reference
// due to Binder GC linkages to AppWidgetHost. By the same token,
// this click handler should not keep references to any large
// objects.
WeakReference<KeyguardHostView> mThis;
MyOnClickHandler(KeyguardHostView hostView) {
mThis = new WeakReference<KeyguardHostView>(hostView);
}
@Override @Override
public boolean onClickHandler(final View view, public boolean onClickHandler(final View view,
final android.app.PendingIntent pendingIntent, final android.app.PendingIntent pendingIntent,
final Intent fillInIntent) { final Intent fillInIntent) {
KeyguardHostView hostView = mThis.get();
if (hostView == null) {
return false;
}
if (pendingIntent.isActivity()) { if (pendingIntent.isActivity()) {
setOnDismissAction(new OnDismissAction() { hostView.setOnDismissAction(new OnDismissAction() {
public boolean onDismiss() { public boolean onDismiss() {
try { try {
// TODO: Unregister this handler if PendingIntent.FLAG_ONE_SHOT? // TODO: Unregister this handler if PendingIntent.FLAG_ONE_SHOT?
Context context = view.getContext(); Context context = view.getContext();
ActivityOptions opts = ActivityOptions.makeScaleUpAnimation(view, ActivityOptions opts = ActivityOptions.makeScaleUpAnimation(view,
0, 0, 0, 0,
view.getMeasuredWidth(), view.getMeasuredHeight()); view.getMeasuredWidth(), view.getMeasuredHeight());
context.startIntentSender( context.startIntentSender(
pendingIntent.getIntentSender(), fillInIntent, pendingIntent.getIntentSender(), fillInIntent,
Intent.FLAG_ACTIVITY_NEW_TASK, Intent.FLAG_ACTIVITY_NEW_TASK,
Intent.FLAG_ACTIVITY_NEW_TASK, 0, opts.toBundle()); Intent.FLAG_ACTIVITY_NEW_TASK, 0, opts.toBundle());
} catch (IntentSender.SendIntentException e) { } catch (IntentSender.SendIntentException e) {
android.util.Log.e(TAG, "Cannot send pending intent: ", e); android.util.Log.e(TAG, "Cannot send pending intent: ", e);
} catch (Exception e) { } catch (Exception e) {
@@ -840,10 +858,10 @@ public class KeyguardHostView extends KeyguardViewBase {
} }
}); });
if (mViewStateManager.isChallengeShowing()) { if (hostView.mViewStateManager.isChallengeShowing()) {
mViewStateManager.showBouncer(true); hostView.mViewStateManager.showBouncer(true);
} else { } else {
mCallback.dismiss(false); hostView.mCallback.dismiss(false);
} }
return true; return true;
} else { } else {