PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-qpr-dev am: 2b80fa789a am: 8d0365e100

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21073703

Change-Id: Ic4e70342299f3b8e1e7b4417201695831ffeff71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-01-23 17:43:22 +00:00
committed by Automerger Merge Worker
parent d263d6c9ee 8d0365e100
commit b6b0209c9a
1 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java
View File

@@ -16,14 +16,14 @@
package com.android.settings.applications.specialaccess.notificationaccess;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import static com.android.settings.applications.AppInfoBase.ARG_PACKAGE_NAME;
import android.app.Activity;
import android.Manifest;
import android.app.NotificationManager;
import android.app.settings.SettingsEnums;
import android.companion.ICompanionDeviceManager;
import android.compat.annotation.ChangeId;
import android.compat.annotation.EnabledAfter;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -37,8 +37,8 @@ import android.os.ServiceManager;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
import android.service.notification.NotificationListenerFilter;
import android.service.notification.NotificationListenerService;
import android.text.TextUtils;
import android.util.Log;
import android.util.Slog;
@@ -48,7 +48,6 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.applications.manageapplications.ManageApplications;
import com.android.settings.bluetooth.Utils;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.DashboardFragment;
@@ -211,8 +210,12 @@ public class NotificationAccessDetails extends DashboardFragment {
}
}
if (intent != null && intent.hasExtra(Intent.EXTRA_USER_HANDLE)) {
if (hasInteractAcrossUsersPermission()) {
mUserId = ((UserHandle) intent.getParcelableExtra(
Intent.EXTRA_USER_HANDLE)).getIdentifier();
} else {
finish();
}
} else {
mUserId = UserHandle.myUserId();
}
@@ -227,6 +230,26 @@ public class NotificationAccessDetails extends DashboardFragment {
}
}
private boolean hasInteractAcrossUsersPermission() {
final String callingPackageName =
((SettingsActivity) getActivity()).getInitialCallingPackage();
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;
}
// Dialogs only have access to the parent fragment, not the controller, so pass the information
// along to keep business logic out of this file
public void disable(final ComponentName cn) {