summaryrefslogtreecommitdiffstats
path: root/core/java/android/app/IActivityContainer.aidl
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2015-02-26 20:40:19 -0800
committerCraig Mautner <cmautner@google.com>2015-03-03 10:15:21 -0800
commitb916836e8dcd4aa3564479be508d7a9d73dcbce8 (patch)
treee9c6750c951f515919737afe67852f4c74845d84 /core/java/android/app/IActivityContainer.aidl
parent654a473bfea9a4197868ae81091812505da8ca87 (diff)
downloadframeworks_base-b916836e8dcd4aa3564479be508d7a9d73dcbce8.zip
frameworks_base-b916836e8dcd4aa3564479be508d7a9d73dcbce8.tar.gz
frameworks_base-b916836e8dcd4aa3564479be508d7a9d73dcbce8.tar.bz2
Change ActivityView startActivity state sequence
Problems arise if an activity is started in an ActivityView when the parent activity is not resumed. In particular the ActivityView can be brought to the front in front of other activities that have been started by the parent. This change checks the state of the parent when the ActivityView is starting and if it is not resumed, throws an Exception. This change also removes the queueing up of Intents if the surface does not exist when startActivity is called. Now, the owner of the ActivityView is notified when the surface becomes available. If startActivity is called before that notification an Exception will be thrown. Fixes bug 19147472. Change-Id: I6712cf1929fe65c4238ce7f3feb4e8511ed97244
Diffstat (limited to 'core/java/android/app/IActivityContainer.aidl')
-rw-r--r--core/java/android/app/IActivityContainer.aidl2
1 files changed, 0 insertions, 2 deletions
diff --git a/core/java/android/app/IActivityContainer.aidl b/core/java/android/app/IActivityContainer.aidl
index 52884f7..cc3b10c 100644
--- a/core/java/android/app/IActivityContainer.aidl
+++ b/core/java/android/app/IActivityContainer.aidl
@@ -29,8 +29,6 @@ interface IActivityContainer {
void setSurface(in Surface surface, int width, int height, int density);
int startActivity(in Intent intent);
int startActivityIntentSender(in IIntentSender intentSender);
- void checkEmbeddedAllowed(in Intent intent);
- void checkEmbeddedAllowedIntentSender(in IIntentSender intentSender);
int getDisplayId();
boolean injectEvent(in InputEvent event);
void release();