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

Unverified Commit 7fb1d73d authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-security-11.0.0_r67' of... 

Merge tag 'android-security-11.0.0_r67' of https://android.googlesource.com/platform/packages/apps/Settings into staging/lineage-18.1_merge_android-security-11.0.0_r67

Android security 11.0.0 release 67

* tag 'android-security-11.0.0_r67' of https://android.googlesource.com/platform/packages/apps/Settings:
  [DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails

Change-Id: I54cd9efea96deeb00ed0027c8d4abf6093ecaf48
parents 7cb89639 0da63ccf

src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java

+40 −0
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


package com.android.settings.applications.specialaccess.notificationaccess;



import static android.content.pm.PackageManager.PERMISSION_GRANTED;



import android.Manifest;

import android.app.Activity;

import android.app.NotificationManager;

import android.app.settings.SettingsEnums;
@@ -30,6 +33,7 @@ import android.os.Bundle; 
import android.os.UserManager;

import android.provider.Settings;

import android.service.notification.NotificationListenerService;

import android.text.TextUtils;

import android.util.IconDrawableFactory;

import android.util.Log;

import android.util.Slog;
@@ -42,6 +46,7 @@ import androidx.preference.SwitchPreference; 
import com.android.settings.R;

import com.android.settings.applications.AppInfoBase;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.password.PasswordUtils;

import com.android.settings.widget.EntityHeaderController;

import com.android.settingslib.applications.AppUtils;
@@ -139,6 +144,41 @@ public class NotificationAccessDetails extends AppInfoBase { 
        return null;

    }



    @Override

    protected String retrieveAppEntry() {

        final Bundle args = getArguments();

        final Intent intent = (args == null) ?

                getIntent() : (Intent) args.getParcelable("intent");

        

        if (intent != null && intent.hasExtra(Intent.EXTRA_USER_HANDLE)) {

            if (!hasInteractAcrossUsersPermission()) {

                finish();

            }

        }



        return super.retrieveAppEntry();

    }



    private boolean hasInteractAcrossUsersPermission() {

        final String callingPackageName = PasswordUtils.getCallingAppPackageName(

                getActivity().getActivityToken());



        if (TextUtils.isEmpty(callingPackageName)) {

            Log.w(TAG, "Not able to get calling package name for permission check");

            return false;

        }



        if (getContext().getPackageManager().checkPermission(

                Manifest.permission.INTERACT_ACROSS_USERS_FULL, callingPackageName)

                != PERMISSION_GRANTED) {

            Log.w(TAG, "Package " + callingPackageName + " does not have required permission "

                    + Manifest.permission.INTERACT_ACROSS_USERS_FULL);

            return false;

        }



        return true;

    }



    public void updatePreference(SwitchPreference preference) {

        final CharSequence label = mPackageInfo.applicationInfo.loadLabel(mPm);

        preference.setChecked(isServiceEnabled(mComponentName));