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

Commit a6680831 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-fbba21d1-17b5-4752-9864-95770e5db190-for-git_oc-mr1-release-41... 

release-request-fbba21d1-17b5-4752-9864-95770e5db190-for-git_oc-mr1-release-4144771 snap-temp-L10300000078657232

Change-Id: I9c64cc6570bce066874753a793a650acf232e9d0
parents 89044c47 cb44628e

res/values-pt-rBR/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ 
    <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Apps"</string>

    <string name="app_permissions" msgid="3146758905824597178">"Permissões do app"</string>

    <string name="never_ask_again" msgid="1089938738199748687">"Não perguntar novamente"</string>

    <string name="no_permissions" msgid="3210542466245591574">"Sem permissão"</string>

    <string name="no_permissions" msgid="3210542466245591574">"Sem permissões"</string>

    <string name="additional_permissions" msgid="6667573114240111763">"Permissões adicionais"</string>

    <plurals name="additional_permissions_more" formatted="false" msgid="945127158155064388">

      <item quantity="one">Mais <xliff:g id="COUNT_1">%1$d</xliff:g></item>

res/values-pt/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ 
    <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Apps"</string>

    <string name="app_permissions" msgid="3146758905824597178">"Permissões do app"</string>

    <string name="never_ask_again" msgid="1089938738199748687">"Não perguntar novamente"</string>

    <string name="no_permissions" msgid="3210542466245591574">"Sem permissão"</string>

    <string name="no_permissions" msgid="3210542466245591574">"Sem permissões"</string>

    <string name="additional_permissions" msgid="6667573114240111763">"Permissões adicionais"</string>

    <plurals name="additional_permissions_more" formatted="false" msgid="945127158155064388">

      <item quantity="one">Mais <xliff:g id="COUNT_1">%1$d</xliff:g></item>

src/com/android/packageinstaller/permission/service/RuntimePermissionPresenterServiceImpl.java

+20 −3
Original line number Diff line number Diff line
@@ -16,13 +16,12 @@ 


package com.android.packageinstaller.permission.service;



import android.content.pm.ApplicationInfo;

import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;

import android.content.pm.permission.RuntimePermissionPresentationInfo;

import android.permissionpresenterservice.RuntimePermissionPresenterService;

import android.util.ArraySet;

import android.util.Log;



import com.android.packageinstaller.permission.model.AppPermissionGroup;

import com.android.packageinstaller.permission.model.AppPermissions;

import com.android.packageinstaller.permission.utils.Utils;
@@ -63,4 +62,22 @@ public final class RuntimePermissionPresenterServiceImpl extends RuntimePermissi 


        return permissions;

    }



    @Override

    public void onRevokeRuntimePermission(String packageName, String permissionName) {

        try {

            final PackageInfo packageInfo = getPackageManager().getPackageInfo(packageName,

                    PackageManager.GET_PERMISSIONS);

            final AppPermissions appPermissions = new AppPermissions(this, packageInfo, null, false,

                    null);

            final AppPermissionGroup appPermissionGroup = appPermissions.getPermissionGroup(

                    permissionName);



            if (appPermissionGroup != null) {

                appPermissionGroup.revokeRuntimePermissions(false);

            }

        } catch (PackageManager.NameNotFoundException e) {

            Log.e(LOG_TAG, "Error getting package:" + packageName, e);

        }

    }

}

src/com/android/packageinstaller/permission/ui/OverlayTouchActivity.java

+5 −4
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import android.app.Activity; 
import android.app.AppOpsManager;

import android.os.Binder;

import android.os.IBinder;

import android.os.UserHandle;



public class OverlayTouchActivity extends Activity {

    private final IBinder mToken = new Binder();
@@ -38,10 +39,10 @@ public class OverlayTouchActivity extends Activity { 
    private void setOverlayAllowed(boolean allowed) {

        AppOpsManager appOpsManager = getSystemService(AppOpsManager.class);

        if (appOpsManager != null) {

            appOpsManager.setUserRestriction(AppOpsManager.OP_SYSTEM_ALERT_WINDOW,

                    !allowed, mToken);

            appOpsManager.setUserRestriction(AppOpsManager.OP_TOAST_WINDOW,

                    !allowed, mToken);

            appOpsManager.setUserRestrictionForUser(AppOpsManager.OP_SYSTEM_ALERT_WINDOW, !allowed,

                    mToken, null, UserHandle.USER_ALL);

            appOpsManager.setUserRestrictionForUser(AppOpsManager.OP_TOAST_WINDOW, !allowed,

                    mToken, null, UserHandle.USER_ALL);

        }

    }

}