diff options
| -rw-r--r-- | core/java/android/app/ActivityTransitionCoordinator.java | 7 | ||||
| -rw-r--r-- | telecomm/java/android/telecomm/TelecommManager.java | 12 |
2 files changed, 7 insertions, 12 deletions
diff --git a/core/java/android/app/ActivityTransitionCoordinator.java b/core/java/android/app/ActivityTransitionCoordinator.java index c7030b0a4b0a..fa9b1e3f9230 100644 --- a/core/java/android/app/ActivityTransitionCoordinator.java +++ b/core/java/android/app/ActivityTransitionCoordinator.java @@ -233,6 +233,13 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver { if (getViewsTransition() != null) { getDecor().captureTransitioningViews(mTransitioningViews); mTransitioningViews.removeAll(mSharedElements); + Rect r = new Rect(); + for (int i = mTransitioningViews.size() - 1; i >= 0; i--) { + View view = mTransitioningViews.get(i); + if (!view.getGlobalVisibleRect(r)) { + mTransitioningViews.remove(i); + } + } } setEpicenter(); } diff --git a/telecomm/java/android/telecomm/TelecommManager.java b/telecomm/java/android/telecomm/TelecommManager.java index 989c2cd0b19e..a97e7e499f5f 100644 --- a/telecomm/java/android/telecomm/TelecommManager.java +++ b/telecomm/java/android/telecomm/TelecommManager.java @@ -16,9 +16,7 @@ package android.telecomm; -import android.content.ComponentName; import android.content.Context; -import android.os.RemoteException; import com.android.internal.telecomm.ITelecommService; @@ -47,14 +45,4 @@ public class TelecommManager { public static TelecommManager from(Context context) { return (TelecommManager) context.getSystemService(Context.TELECOMM_SERVICE); } - - /** {@hide} */ - public ComponentName getSystemPhoneApplication() { - try { - return mService.getSystemPhoneApplication(); - } catch (RemoteException e) { - Log.e(TAG, e, "Error calling ITelecommService#getSystemPhoneApplication"); - return null; - } - } } |