diff options
| author | Aaron Whyte <awhyte@google.com> | 2014-05-13 01:55:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-13 01:55:26 +0000 |
| commit | 71dfd44c9b605ef4a5467a35573b1a13ab57e707 (patch) | |
| tree | ef301d7620972ac352a97df4e5b22f39642cbee8 /policy | |
| parent | 5152c0987db69dad24259a8316fb819755bfda77 (diff) | |
| parent | 064789efc1cd7ff96edc57f2a72fe7ad6fa8d24e (diff) | |
| download | frameworks_base-71dfd44c9b605ef4a5467a35573b1a13ab57e707.zip frameworks_base-71dfd44c9b605ef4a5467a35573b1a13ab57e707.tar.gz frameworks_base-71dfd44c9b605ef4a5467a35573b1a13ab57e707.tar.bz2 | |
am 064789ef: am 24f3d091: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev
* commit '064789efc1cd7ff96edc57f2a72fe7ad6fa8d24e':
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 b1fea03..cd9f26f 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -301,6 +301,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); } |