diff options
author | Hai Zhang <zhanghai@google.com> | 2019-04-18 13:32:21 +0800 |
---|---|---|
committer | Hai Zhang <zhanghai@google.com> | 2019-04-18 13:40:48 +0800 |
commit | 9844e24a9e453bf1a8df5f0e10f820d9cbe97b36 (patch) | |
tree | ec938a66874a3741b252a4797df4e4970571315c /src/com/android/packageinstaller/role/ui/RequestRoleActivity.java | |
parent | 11b877d75458605ea2aa6cd7e5947c2de9697986 (diff) | |
download | android_packages_apps_PackageInstaller-9844e24a9e453bf1a8df5f0e10f820d9cbe97b36.tar.gz android_packages_apps_PackageInstaller-9844e24a9e453bf1a8df5f0e10f820d9cbe97b36.tar.bz2 android_packages_apps_PackageInstaller-9844e24a9e453bf1a8df5f0e10f820d9cbe97b36.zip |
Don't allow requesting the assistant role.
By adding a requestable attribute for roles and set it to false for
assistant.
Bug: 130735926
Test: atest RoleManagerTest#requestAssistantRoleThenDeniedAutomatically
Change-Id: I66b4e203f2922645e3a357ca0f628faefadfe344
Diffstat (limited to 'src/com/android/packageinstaller/role/ui/RequestRoleActivity.java')
-rw-r--r-- | src/com/android/packageinstaller/role/ui/RequestRoleActivity.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/packageinstaller/role/ui/RequestRoleActivity.java b/src/com/android/packageinstaller/role/ui/RequestRoleActivity.java index 9b06c422..913cceae 100644 --- a/src/com/android/packageinstaller/role/ui/RequestRoleActivity.java +++ b/src/com/android/packageinstaller/role/ui/RequestRoleActivity.java @@ -90,6 +90,12 @@ public class RequestRoleActivity extends FragmentActivity { return; } + if (!role.isRequestable()) { + Log.e(LOG_TAG, "Role is not requestable: " + mRoleName); + finish(); + return; + } + if (!role.isExclusive()) { Log.e(LOG_TAG, "Role is not exclusive: " + mRoleName); finish(); |