diff options
| author | Aaron Whyte <awhyte@google.com> | 2014-05-13 02:27:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-13 02:27:00 +0000 |
| commit | d67fd6428a2bcaedca79fb96f971dd021e08a651 (patch) | |
| tree | 3a1647c77205d150f8084a15bc65dd4299a0cb17 /policy | |
| parent | 30510054a4a04782f0409265fd1791c3faf24601 (diff) | |
| parent | 6af2ef8e25844b740e84dc410ca713361bd6dbcc (diff) | |
| download | frameworks_base-d67fd6428a2bcaedca79fb96f971dd021e08a651.zip frameworks_base-d67fd6428a2bcaedca79fb96f971dd021e08a651.tar.gz frameworks_base-d67fd6428a2bcaedca79fb96f971dd021e08a651.tar.bz2 | |
am 6af2ef8e: Merge "Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859"" into klp-modular-dev
* commit '6af2ef8e25844b740e84dc410ca713361bd6dbcc':
Revert "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, 0 insertions, 5 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java index 0961a33..78020e9 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -278,11 +278,6 @@ 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); } |