Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0313408 authored by Cole Faust's avatar Cole Faust
Browse files

Remove showing the "allow" button for "allow one time" on automotive 

There appears to be cases where permission dialogs show
"Allow one time", "Allow while in foreground", and "deny".
The current code, since we don't want to show one time
permissions on automotive, would change that to
"Allow", "Allow while in foreground", and "deny",
where "Allow" and "Allow while in foreground" do the
same thing. It should really just have "Allow while in
foreground" and "deny".

Test: m cts, cts-tradefed,
      run cts -m CtsPermission3TestCases
      run cts -m CtsPermissionTestCases
      run cts -m CtsOsTestCases -t android.os.cts.AutoRevokeTest#testUnusedApp_getsPermissionRevoked
Bug: 169797619
Change-Id: I6d24c0708576239fd6f58c9e38ae60c6e3472631
parent 021e29ab

src/com/android/permissioncontroller/permission/ui/auto/GrantPermissionsAutoViewHandler.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.permissioncontroller.permission.ui.auto; 
import static com.android.permissioncontroller.permission.ui.GrantPermissionsActivity.ALLOW_ALWAYS_BUTTON;

import static com.android.permissioncontroller.permission.ui.GrantPermissionsActivity.ALLOW_ALWAYS_BUTTON;

import static com.android.permissioncontroller.permission.ui.GrantPermissionsActivity.ALLOW_BUTTON;

import static com.android.permissioncontroller.permission.ui.GrantPermissionsActivity.ALLOW_BUTTON;

import static com.android.permissioncontroller.permission.ui.GrantPermissionsActivity.ALLOW_FOREGROUND_BUTTON;

import static com.android.permissioncontroller.permission.ui.GrantPermissionsActivity.ALLOW_FOREGROUND_BUTTON;

import static com.android.permissioncontroller.permission.ui.GrantPermissionsActivity.ALLOW_ONE_TIME_BUTTON;

import static com.android.permissioncontroller.permission.ui.GrantPermissionsActivity.DENY_AND_DONT_ASK_AGAIN_BUTTON;

import static com.android.permissioncontroller.permission.ui.GrantPermissionsActivity.DENY_AND_DONT_ASK_AGAIN_BUTTON;

import static com.android.permissioncontroller.permission.ui.GrantPermissionsActivity.DENY_BUTTON;

import static com.android.permissioncontroller.permission.ui.GrantPermissionsActivity.DENY_BUTTON;

import static com.android.permissioncontroller.permission.ui.GrantPermissionsActivity.NO_UPGRADE_AND_DONT_ASK_AGAIN_BUTTON;

import static com.android.permissioncontroller.permission.ui.GrantPermissionsActivity.NO_UPGRADE_AND_DONT_ASK_AGAIN_BUTTON;
@@ -128,7 +127,7 @@ public class GrantPermissionsAutoViewHandler implements GrantPermissionsViewHand 




        // Don't show the allow one time button as per automotive design decisions

        // Don't show the allow one time button as per automotive design decisions

        createListItem(itemList, R.string.grant_dialog_button_allow,

        createListItem(itemList, R.string.grant_dialog_button_allow,

                GRANTED_ALWAYS, ALLOW_BUTTON, ALLOW_ONE_TIME_BUTTON);

                GRANTED_ALWAYS, ALLOW_BUTTON);

        createListItem(itemList, R.string.grant_dialog_button_allow_always,

        createListItem(itemList, R.string.grant_dialog_button_allow_always,

                GRANTED_ALWAYS, ALLOW_ALWAYS_BUTTON);

                GRANTED_ALWAYS, ALLOW_ALWAYS_BUTTON);

        createListItem(itemList, R.string.grant_dialog_button_allow_foreground,

        createListItem(itemList, R.string.grant_dialog_button_allow_foreground,