diff options
| author | George Mount <mount@google.com> | 2014-07-02 14:24:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-02 05:06:31 +0000 |
| commit | 5acf640dfab01a525b832c92ce63eacf2e2146b4 (patch) | |
| tree | cb0b81285f12d52d5a92a7c9ebc9e284fe04adbe /policy | |
| parent | 4cce48e63fe9d63bac1f5a3b43ebb3ec6a1a730b (diff) | |
| parent | 7e20884d85a68d0f22f2b0a37b8164497b146010 (diff) | |
| download | frameworks_base-5acf640dfab01a525b832c92ce63eacf2e2146b4.zip frameworks_base-5acf640dfab01a525b832c92ce63eacf2e2146b4.tar.gz frameworks_base-5acf640dfab01a525b832c92ce63eacf2e2146b4.tar.bz2 | |
Merge "Reapply fix after bad merge."
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindow.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java index 0f3f1fe..adfa1f2 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -392,8 +392,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { } if (hasFeature(FEATURE_CONTENT_TRANSITIONS)) { // TODO Augment the scenes/transitions API to support this. - throw new UnsupportedOperationException( - "addContentView does not support content transitions"); + Log.v(TAG, "addContentView does not support content transitions"); } mContentParent.addView(view, params); final Callback cb = getCallback(); |