diff options
| author | Aaron Whyte <awhyte@google.com> | 2014-05-13 02:19:10 +0000 |
|---|---|---|
| committer | Aaron Whyte <awhyte@google.com> | 2014-05-13 02:19:10 +0000 |
| commit | d5f010e4e7fdcd6ba3959f1e148d9b4dad057017 (patch) | |
| tree | fae6a62888dca75c6ad7213fef87c22c97966b11 /policy | |
| parent | 3f3e3e87e2a8f899d896c0c54441a37a23fdba3b (diff) | |
| download | frameworks_base-d5f010e4e7fdcd6ba3959f1e148d9b4dad057017.zip frameworks_base-d5f010e4e7fdcd6ba3959f1e148d9b4dad057017.tar.gz frameworks_base-d5f010e4e7fdcd6ba3959f1e148d9b4dad057017.tar.bz2 | |
Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859"
This reverts commit 3f3e3e87e2a8f899d896c0c54441a37a23fdba3b.
Change-Id: I799d9a2b0eeb708f57127be60780c7a005b792b5
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); } |