mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-03-04 15:51:37 +00:00
Bug 738859 - Increment mActivityDepth for all activities launched from GeckoApp. r=blassey
--HG-- extra : rebase_source : f336548259f18347e0592329c2e5e678abbc8c43
This commit is contained in:
parent
1dfcfb5e1f
commit
c103bf247f
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user