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

Commit 1ee97e0e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I30579090,I7a725647 into tm-dev am: fb0f8533 am: c351acab 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21253698



Change-Id: I607bd07ba0b3b024423e5f840399da2a2a3eb9b3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8dbe8a24 c351acab

services/core/java/com/android/server/pm/permission/OneTimePermissionUserManager.java

+5 −6
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.server.pm.permission; 


import android.annotation.NonNull;

import android.app.ActivityManager;

import android.app.ActivityManagerInternal;

import android.app.AlarmManager;

import android.app.IActivityManager;

import android.app.IUidObserver;
@@ -34,6 +35,7 @@ import android.util.Log; 
import android.util.SparseArray;



import com.android.internal.annotations.GuardedBy;

import com.android.server.LocalServices;



/**

 * Class that handles one-time permissions for a user
@@ -49,6 +51,7 @@ public class OneTimePermissionUserManager { 


    private final @NonNull Context mContext;

    private final @NonNull IActivityManager mIActivityManager;

    private final @NonNull ActivityManagerInternal mActivityManagerInternal;

    private final @NonNull AlarmManager mAlarmManager;

    private final @NonNull PermissionControllerManager mPermissionControllerManager;
@@ -79,6 +82,7 @@ public class OneTimePermissionUserManager { 
    OneTimePermissionUserManager(@NonNull Context context) {

        mContext = context;

        mIActivityManager = ActivityManager.getService();

        mActivityManagerInternal = LocalServices.getService(ActivityManagerInternal.class);

        mAlarmManager = context.getSystemService(AlarmManager.class);

        mPermissionControllerManager = context.getSystemService(PermissionControllerManager.class);

        mHandler = context.getMainThreadHandler();
@@ -241,12 +245,7 @@ public class OneTimePermissionUserManager { 
        }



        private int getCurrentState() {

            try {

                return getStateFromProcState(mIActivityManager.getUidProcessState(mUid, null));

            } catch (RemoteException e) {

                Log.e(LOG_TAG, "Couldn't check uid proc state", e);

            }

            return STATE_GONE;

            return getStateFromProcState(mActivityManagerInternal.getUidProcessState(mUid));

        }



        private int getStateFromProcState(int procState) {