diff options
| author | Anthony Hugh <ahugh@google.com> | 2015-08-21 20:25:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-21 20:25:49 +0000 |
| commit | f774b080f65337079a851249533c8dcca112e5aa (patch) | |
| tree | fe1903a9657c7008973604c586e9b55d0ba8c61f /src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java | |
| parent | 6f2af71a7206cf66ff41664fbf8529a429aa1911 (diff) | |
| parent | b7da1f5f9886ff8a4ad81b0d617d442c461ca1e5 (diff) | |
| download | android_packages_apps_PackageInstaller-f774b080f65337079a851249533c8dcca112e5aa.tar.gz android_packages_apps_PackageInstaller-f774b080f65337079a851249533c8dcca112e5aa.tar.bz2 android_packages_apps_PackageInstaller-f774b080f65337079a851249533c8dcca112e5aa.zip | |
Merge "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, 7 insertions, 0 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java index 0c087350..c1597f16 100644 --- a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java +++ b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java @@ -73,6 +73,8 @@ 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); } @@ -368,6 +370,11 @@ 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; |