Bug 738859 - Increment mActivityDepth for all activities launched from GeckoApp. r=blassey

--HG--
extra : rebase_source : f336548259f18347e0592329c2e5e678abbc8c43
This commit is contained in:
Brian Nicholson 2012-03-27 12:25:26 -07:00
parent 1dfcfb5e1f
commit c103bf247f

View File

@ -151,7 +151,7 @@ abstract public class GeckoApp
public String mLastSnapshotUri;
public String mLastViewport;
public byte[] mLastScreen;
public int mOwnActivityDepth = 0;
private int mOwnActivityDepth = 0;
private boolean mRestoreSession = false;
private boolean mInitialized = false;
@ -2560,7 +2560,6 @@ abstract public class GeckoApp
}
}
}
mOwnActivityDepth++;
startActivityForResult(intent, AWESOMEBAR_REQUEST);
return true;
}
@ -2851,6 +2850,18 @@ abstract public class GeckoApp
}
}
}
@Override
public void startActivity(Intent intent) {
mOwnActivityDepth++;
super.startActivity(intent);
}
@Override
public void startActivityForResult(Intent intent, int request) {
mOwnActivityDepth++;
super.startActivityForResult(intent, request);
}
}
class PluginLayoutParams extends AbsoluteLayout.LayoutParams