diff options
| author | Aaron Whyte <awhyte@google.com> | 2014-05-13 20:41:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-13 20:41:38 +0000 |
| commit | 8f8c7f413fb0d41304d9199f032507cf0651227a (patch) | |
| tree | eca88e5d4bfed8012b44e1e1b107b7f71247826b /policy | |
| parent | 58bfed927de858757e40195c1a77d2a9f385ff91 (diff) | |
| parent | 8452776b950b26f86324636242dd302a596fae1d (diff) | |
| download | frameworks_base-8f8c7f413fb0d41304d9199f032507cf0651227a.zip frameworks_base-8f8c7f413fb0d41304d9199f032507cf0651227a.tar.gz frameworks_base-8f8c7f413fb0d41304d9199f032507cf0651227a.tar.bz2 | |
am 8452776b: am 5ff35f8a: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev
* commit '8452776b950b26f86324636242dd302a596fae1d':
Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindow.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java index b1fea03..6341a0c 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -44,6 +44,7 @@ import android.app.ActivityOptions; import android.app.KeyguardManager; import android.content.Context; import android.content.pm.ActivityInfo; +import android.content.pm.PackageManager; import android.content.res.Configuration; import android.content.res.Resources; import android.content.res.TypedArray; @@ -301,6 +302,11 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { throw new AndroidRuntimeException( "You cannot combine swipe dismissal and the action bar."); } + + if (featureId == FEATURE_INDETERMINATE_PROGRESS && + getContext().getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)) { + throw new AndroidRuntimeException("You cannot use indeterminate progress on a watch."); + } return super.requestFeature(featureId); } |