diff options
| author | Aaron Whyte <awhyte@google.com> | 2014-05-13 01:49:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-13 01:49:16 +0000 |
| commit | 064789efc1cd7ff96edc57f2a72fe7ad6fa8d24e (patch) | |
| tree | 642deca0c435d74d809be0855bc4dae14f11637e /policy | |
| parent | f230061b383f3e5fa63a266d84477963dc5f226c (diff) | |
| parent | 24f3d0915e55d490b7537b20aeadbfa2e6a780a9 (diff) | |
| download | frameworks_base-064789efc1cd7ff96edc57f2a72fe7ad6fa8d24e.zip frameworks_base-064789efc1cd7ff96edc57f2a72fe7ad6fa8d24e.tar.gz frameworks_base-064789efc1cd7ff96edc57f2a72fe7ad6fa8d24e.tar.bz2 | |
am 24f3d091: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev
* commit '24f3d0915e55d490b7537b20aeadbfa2e6a780a9':
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 | 5 |
1 files changed, 5 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 78020e9..0961a33 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -278,6 +278,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); } |