diff options
| author | Anthony Hugh <ahugh@google.com> | 2015-08-21 20:58:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-21 20:58:32 +0000 |
| commit | 24938647726a06f636dc8c9f1195a378ebb07995 (patch) | |
| tree | e7578e1fa251bc67e3bdffdd142c03c5fcbac47d /src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java | |
| parent | f774b080f65337079a851249533c8dcca112e5aa (diff) | |
| parent | 70d651e904e16723f4e55879f2e356e403fff61a (diff) | |
| download | android_packages_apps_PackageInstaller-24938647726a06f636dc8c9f1195a378ebb07995.tar.gz android_packages_apps_PackageInstaller-24938647726a06f636dc8c9f1195a378ebb07995.tar.bz2 android_packages_apps_PackageInstaller-24938647726a06f636dc8c9f1195a378ebb07995.zip | |
Merge "Revert "Implement base version of GrantPermissions dialog"" into cw-e-dev
Diffstat (limited to 'src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java')
| -rw-r--r-- | src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java index c1597f16..0c087350 100644 --- a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java +++ b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java @@ -73,8 +73,6 @@ public class GrantPermissionsActivity extends OverlayTouchActivity if (Utils.isTelevision(this)) { mViewHandler = new GrantPermissionsTvViewHandler(this).setResultListener(this); - } else if (isWatch()) { - mViewHandler = new GrantPermissionsWatchViewHandler(this).setResultListener(this); } else { mViewHandler = new GrantPermissionsDefaultViewHandler(this).setResultListener(this); } @@ -370,11 +368,6 @@ public class GrantPermissionsActivity extends OverlayTouchActivity SafetyNetLogger.logPermissionsRequested(mAppPermissions.getPackageInfo(), groups); } - private boolean isWatch() { - PackageManager pm = getPackageManager(); - return pm.hasSystemFeature(pm.FEATURE_WATCH); - } - private static final class GroupState { static final int STATE_UNKNOWN = 0; static final int STATE_ALLOWED = 1; |