Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7ad27288: am c00c89b1: am f4c909bc: Fix ActivityView lifecycle

Browse Source 
* commit '7ad27288f1b66733a4fcb2bdcb17dd5db6c6423d':
  Fix ActivityView lifecycle
This commit is contained in:
Craig Mautner
2014-04-22 13:39:20 +00:00
committed by Android Git Automerger
parent 3b0579a256 7ad27288f1
commit 26f31dccfd
6 changed files with 263 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

172
core/java/android/app/ActivityView.java
View File

@@ -33,15 +33,18 @@ import android.view.MotionEvent;
import android.view.Surface;
import android.view.TextureView;
import android.view.TextureView.SurfaceTextureListener;
import android.view.View;
import android.view.ViewGroup;
import android.view.WindowManager;
import dalvik.system.CloseGuard;
import java.lang.ref.WeakReference;
/** @hide */
public class ActivityView extends ViewGroup {
private final String TAG = "ActivityView";
private final boolean DEBUG = false;
private static final String TAG = "ActivityView";
private static final boolean DEBUG = false;
DisplayMetrics mMetrics;
private final TextureView mTextureView;
private IActivityContainer mActivityContainer;
private Activity mActivity;
@@ -53,6 +56,8 @@ public class ActivityView extends ViewGroup {
IIntentSender mQueuedPendingIntent;
Intent mQueuedIntent;
private final CloseGuard mGuard = CloseGuard.get();
public ActivityView(Context context) {
this(context, null);
}
@@ -75,9 +80,24 @@ public class ActivityView extends ViewGroup {
throw new IllegalStateException("The ActivityView's Context is not an Activity.");
}
try {
mActivityContainer = ActivityManagerNative.getDefault().createActivityContainer(
mActivity.getActivityToken(), new ActivityContainerCallback(this));
} catch (RemoteException e) {
throw new IllegalStateException("ActivityView: Unable to create ActivityContainer. "
+ e);
}
mTextureView = new TextureView(context);
mTextureView.setSurfaceTextureListener(new ActivityViewSurfaceTextureListener());
addView(mTextureView);
WindowManager wm = (WindowManager)mActivity.getSystemService(Context.WINDOW_SERVICE);
mMetrics = new DisplayMetrics();
wm.getDefaultDisplay().getMetrics(mMetrics);
mGuard.open("release");
if (DEBUG) Log.v(TAG, "ctor()");
}
@@ -86,51 +106,6 @@ public class ActivityView extends ViewGroup {
mTextureView.layout(0, 0, r - l, b - t);
}
@Override
protected void onAttachedToWindow() {
if (DEBUG) Log.v(TAG, "onAttachedToWindow()");
super.onAttachedToWindow();
try {
final IBinder token = mActivity.getActivityToken();
mActivityContainer = ActivityManagerNative.getDefault().createActivityContainer(token,
new ActivityContainerCallback());
} catch (RemoteException e) {
throw new IllegalStateException("ActivityView: Unable to create ActivityContainer. "
+ e);
}
attachToSurfaceWhenReady();
}
@Override
protected void onDetachedFromWindow() {
if (DEBUG) Log.v(TAG, "onDetachedFromWindow(): mActivityContainer=" + mActivityContainer);
super.onDetachedFromWindow();
if (mActivityContainer != null) {
detach();
try {
ActivityManagerNative.getDefault().deleteActivityContainer(mActivityContainer);
} catch (RemoteException e) {
}
mActivityContainer = null;
}
}
@Override
protected void onWindowVisibilityChanged(int visibility) {
if (DEBUG) Log.v(TAG, "onWindowVisibilityChanged(): visibility=" + visibility);
super.onWindowVisibilityChanged(visibility);
switch (visibility) {
case View.VISIBLE:
attachToSurfaceWhenReady();
break;
case View.INVISIBLE:
break;
case View.GONE:
break;
}
}
private boolean injectInputEvent(InputEvent event) {
try {
return mActivityContainer != null && mActivityContainer.injectEvent(event);
@@ -159,6 +134,9 @@ public class ActivityView extends ViewGroup {
}
public void startActivity(Intent intent) {
if (mActivityContainer == null) {
throw new IllegalStateException("Attempt to call startActivity after release");
}
if (DEBUG) Log.v(TAG, "startActivity(): intent=" + intent + " " +
(isAttachedToDisplay() ? "" : "not") + " attached");
if (mSurface != null) {
@@ -183,6 +161,9 @@ public class ActivityView extends ViewGroup {
}
public void startActivity(IntentSender intentSender) {
if (mActivityContainer == null) {
throw new IllegalStateException("Attempt to call startActivity after release");
}
if (DEBUG) Log.v(TAG, "startActivityIntentSender(): intentSender=" + intentSender + " " +
(isAttachedToDisplay() ? "" : "not") + " attached");
final IIntentSender iIntentSender = intentSender.getTarget();
@@ -195,6 +176,9 @@ public class ActivityView extends ViewGroup {
}
public void startActivity(PendingIntent pendingIntent) {
if (mActivityContainer == null) {
throw new IllegalStateException("Attempt to call startActivity after release");
}
if (DEBUG) Log.v(TAG, "startActivityPendingIntent(): PendingIntent=" + pendingIntent + " "
+ (isAttachedToDisplay() ? "" : "not") + " attached");
final IIntentSender iIntentSender = pendingIntent.getTarget();
@@ -206,24 +190,54 @@ public class ActivityView extends ViewGroup {
}
}
public void release() {
if (DEBUG) Log.v(TAG, "release()");
if (mActivityContainer == null) {
Log.e(TAG, "Duplicate call to release");
return;
}
try {
mActivityContainer.release();
} catch (RemoteException e) {
}
mActivityContainer = null;
if (mSurface != null) {
mSurface.release();
mSurface = null;
}
mTextureView.setSurfaceTextureListener(null);
mGuard.close();
}
@Override
protected void finalize() throws Throwable {
try {
if (mGuard != null) {
mGuard.warnIfOpen();
release();
}
} finally {
super.finalize();
}
}
private void attachToSurfaceWhenReady() {
final SurfaceTexture surfaceTexture = mTextureView.getSurfaceTexture();
if (mActivityContainer == null || surfaceTexture == null || mSurface != null) {
if (surfaceTexture == null || mSurface != null) {
// Either not ready to attach, or already attached.
return;
}
WindowManager wm = (WindowManager)mActivity.getSystemService(Context.WINDOW_SERVICE);
DisplayMetrics metrics = new DisplayMetrics();
wm.getDefaultDisplay().getMetrics(metrics);
mSurface = new Surface(surfaceTexture);
try {
mActivityContainer.attachToSurface(mSurface, mWidth, mHeight, metrics.densityDpi);
mActivityContainer.setSurface(mSurface, mWidth, mHeight, mMetrics.densityDpi);
} catch (RemoteException e) {
mSurface.release();
mSurface = null;
throw new IllegalStateException(
throw new RuntimeException(
"ActivityView: Unable to create ActivityContainer. " + e);
}
@@ -238,41 +252,43 @@ public class ActivityView extends ViewGroup {
}
}
private void detach() {
if (DEBUG) Log.d(TAG, "detach: attached=" + isAttachedToDisplay());
if (mSurface != null) {
try {
mActivityContainer.detachFromDisplay();
} catch (RemoteException e) {
}
mSurface.release();
mSurface = null;
}
}
private class ActivityViewSurfaceTextureListener implements SurfaceTextureListener {
@Override
public void onSurfaceTextureAvailable(SurfaceTexture surfaceTexture, int width,
int height) {
if (mActivityContainer == null) {
return;
}
if (DEBUG) Log.d(TAG, "onSurfaceTextureAvailable: width=" + width + " height="
+ height);
mWidth = width;
mHeight = height;
if (mActivityContainer != null) {
attachToSurfaceWhenReady();
}
attachToSurfaceWhenReady();
}
@Override
public void onSurfaceTextureSizeChanged(SurfaceTexture surfaceTexture, int width,
int height) {
if (mActivityContainer == null) {
return;
}
if (DEBUG) Log.d(TAG, "onSurfaceTextureSizeChanged: w=" + width + " h=" + height);
}
@Override
public boolean onSurfaceTextureDestroyed(SurfaceTexture surfaceTexture) {
if (mActivityContainer == null) {
return true;
}
if (DEBUG) Log.d(TAG, "onSurfaceTextureDestroyed");
detach();
mSurface.release();
mSurface = null;
try {
mActivityContainer.setSurface(null, mWidth, mHeight, mMetrics.densityDpi);
} catch (RemoteException e) {
throw new RuntimeException(
"ActivityView: Unable to set surface of ActivityContainer. " + e);
}
return true;
}
@@ -283,13 +299,17 @@ public class ActivityView extends ViewGroup {
}
private class ActivityContainerCallback extends IActivityContainerCallback.Stub {
private static class ActivityContainerCallback extends IActivityContainerCallback.Stub {
private final WeakReference<ActivityView> mActivityViewWeakReference;
ActivityContainerCallback(ActivityView activityView) {
mActivityViewWeakReference = new WeakReference<ActivityView>(activityView);
}
@Override
public void setVisible(IBinder container, boolean visible) {
if (DEBUG) Log.v(TAG, "setVisible(): container=" + container + " visible=" + visible);
if (visible) {
} else {
}
if (DEBUG) Log.v(TAG, "setVisible(): container=" + container + " visible=" + visible +
" ActivityView=" + mActivityViewWeakReference.get());
}
}
}

4
core/java/android/app/IActivityContainer.aidl
View File

@@ -26,10 +26,10 @@ import android.view.Surface;
/** @hide */
interface IActivityContainer {
void attachToDisplay(int displayId);
void attachToSurface(in Surface surface, int width, int height, int density);
void detachFromDisplay();
void setSurface(in Surface surface, int width, int height, int density);
int startActivity(in Intent intent);
int startActivityIntentSender(in IIntentSender intentSender);
int getDisplayId();
boolean injectEvent(in InputEvent event);
void release();
}