Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove package title from notification access confirmation intent" into tm-dev am: 75577e9421 am: dda407577f

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

Change-Id: Ia8a65b07c566d2a7d88a39ca47c9f5a9b95d9b15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Raphael Kim
2022-05-09 20:46:08 +00:00
committed by Automerger Merge Worker
parent 0f484b4539 dda407577f
commit c2ad2674b0
2 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/com/android/internal/notification/NotificationAccessConfirmationActivityContract.java
View File

@@ -28,18 +28,15 @@ import com.android.internal.R;
public final class NotificationAccessConfirmationActivityContract { public final class NotificationAccessConfirmationActivityContract {
public static final String EXTRA_USER_ID = "user_id"; public static final String EXTRA_USER_ID = "user_id";
public static final String EXTRA_COMPONENT_NAME = "component_name"; public static final String EXTRA_COMPONENT_NAME = "component_name";
public static final String EXTRA_PACKAGE_TITLE = "package_title";
/** /**
* Creates a launcher intent for NotificationAccessConfirmationActivity. * Creates a launcher intent for NotificationAccessConfirmationActivity.
*/ */
public static Intent launcherIntent(Context context, int userId, ComponentName component, public static Intent launcherIntent(Context context, int userId, ComponentName component) {
String packageTitle) {
return new Intent() return new Intent()
.setComponent(ComponentName.unflattenFromString(context.getString( .setComponent(ComponentName.unflattenFromString(context.getString(
R.string.config_notificationAccessConfirmationActivity))) R.string.config_notificationAccessConfirmationActivity)))
.putExtra(EXTRA_USER_ID, userId) .putExtra(EXTRA_USER_ID, userId)
.putExtra(EXTRA_COMPONENT_NAME, component) .putExtra(EXTRA_COMPONENT_NAME, component);
.putExtra(EXTRA_PACKAGE_TITLE, packageTitle);
} }
} }

12
services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
View File

@@ -62,7 +62,6 @@ import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.content.pm.PackageItemInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PackageManagerInternal; import android.content.pm.PackageManagerInternal;
import android.content.pm.UserInfo; import android.content.pm.UserInfo;
@@ -81,7 +80,6 @@ import android.os.ServiceManager;
import android.os.ShellCallback; import android.os.ShellCallback;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.text.BidiFormatter;
import android.util.ArraySet; import android.util.ArraySet;
import android.util.ExceptionUtils; import android.util.ExceptionUtils;
import android.util.Log; import android.util.Log;
@@ -538,20 +536,12 @@ public class CompanionDeviceManagerService extends SystemService {
String callingPackage = component.getPackageName(); String callingPackage = component.getPackageName();
checkCanCallNotificationApi(callingPackage); checkCanCallNotificationApi(callingPackage);
// TODO: check userId. // TODO: check userId.
String packageTitle = BidiFormatter.getInstance().unicodeWrap(
getPackageInfo(getContext(), userId, callingPackage)
.applicationInfo
.loadSafeLabel(getContext().getPackageManager(),
PackageItemInfo.DEFAULT_MAX_LABEL_SIZE_PX,
PackageItemInfo.SAFE_LABEL_FLAG_TRIM
| PackageItemInfo.SAFE_LABEL_FLAG_FIRST_LINE)
.toString());
final long identity = Binder.clearCallingIdentity(); final long identity = Binder.clearCallingIdentity();
try { try {
return PendingIntent.getActivityAsUser(getContext(), return PendingIntent.getActivityAsUser(getContext(),
0 /* request code */, 0 /* request code */,
NotificationAccessConfirmationActivityContract.launcherIntent( NotificationAccessConfirmationActivityContract.launcherIntent(
getContext(), userId, component, packageTitle), getContext(), userId, component),
PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_ONE_SHOT PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_ONE_SHOT
| PendingIntent.FLAG_CANCEL_CURRENT, | PendingIntent.FLAG_CANCEL_CURRENT,
null /* options */, null /* options */,