[Realtek][STB][Settings] Avoid getting stuck on the unpair page
When the user unpair the remote, UnpairConfirmFragment will stop itself.
However, it also receive BluetoothDevice.BOND_NONE Intent to navigateBack.
In this moment, it check UnpairConfirmFragment is in the resume lifecycle.
Therefore, it need to popback first.
Test: Manual test
Bug: 376195762
Change-Id: Ia9ddeaacacf816237788786df2bea6be28ecf6c2
diff --git a/Settings/src/com/android/tv/settings/accessories/BluetoothAccessoryFragment.java b/Settings/src/com/android/tv/settings/accessories/BluetoothAccessoryFragment.java
index 808350e..ba0fade 100644
--- a/Settings/src/com/android/tv/settings/accessories/BluetoothAccessoryFragment.java
+++ b/Settings/src/com/android/tv/settings/accessories/BluetoothAccessoryFragment.java
@@ -90,7 +90,7 @@
private Runnable mBailoutRunnable = new Runnable() {
@Override
public void run() {
- if (isResumed() && !getFragmentManager().popBackStackImmediate()) {
+ if (!getFragmentManager().popBackStackImmediate() && isResumed()) {
getActivity().onBackPressed();
}
}
@@ -404,7 +404,7 @@
private Runnable mBailoutRunnable = new Runnable() {
@Override
public void run() {
- if (isResumed() && !getFragmentManager().popBackStackImmediate()) {
+ if (!getFragmentManager().popBackStackImmediate() && isResumed()) {
getActivity().onBackPressed();
}
}
