Merge "Fixing activity leak via alarm in SecondaryDropTarget" into ub-launcher3-master (2fe6fb96) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/SecondaryDropTarget.java

+19 −0

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList
		private final ArrayMap<UserHandle, Boolean> mUninstallDisabledCache = new ArrayMap<>(1);

		private final Alarm mCacheExpireAlarm;
		private boolean mHadPendingAlarm;

		protected int mCurrentAccessibilityAction = -1;
		public SecondaryDropTarget(Context context, AttributeSet attrs) {
		@@ -69,6 +70,24 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList
		mCacheExpireAlarm.setOnAlarmListener(this);
		}

		@Override
		protected void onAttachedToWindow() {
		super.onAttachedToWindow();
		if (mHadPendingAlarm) {
		mCacheExpireAlarm.setAlarm(CACHE_EXPIRE_TIMEOUT);
		mHadPendingAlarm = false;
		}
		}

		@Override
		protected void onDetachedFromWindow() {
		super.onDetachedFromWindow();
		if (mCacheExpireAlarm.alarmPending()) {
		mCacheExpireAlarm.cancelAlarm();
		mHadPendingAlarm = true;
		}
		}

		@Override
		protected void onFinishInflate() {
		super.onFinishInflate();