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

Remove package title from notification access confirmation intent am: 51d47ec7c8 am: c1b4cacc66

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

Change-Id: I3af28be0359c45814aacf66a6952292894fac72b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Raphael Kim
2022-06-05 02:32:27 +00:00
committed by Automerger Merge Worker
parent c543f70e3d c1b4cacc66
commit 963c9f8bc8
2 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,7 @@
package com.android.internal.notification; package com.android.internal.notification;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
public final class NotificationAccessConfirmationActivityContract { public final class NotificationAccessConfirmationActivityContract {
@@ -25,13 +26,14 @@ public final class NotificationAccessConfirmationActivityContract {
"com.android.settings.notification.NotificationAccessConfirmationActivity"); "com.android.settings.notification.NotificationAccessConfirmationActivity");
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";
public static Intent launcherIntent(int userId, ComponentName component, String packageTitle) { /**
* Creates a launcher intent for NotificationAccessConfirmationActivity.
*/
public static Intent launcherIntent(Context context, int userId, ComponentName component) {
return new Intent() return new Intent()
.setComponent(COMPONENT_NAME) .setComponent(COMPONENT_NAME)
.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);
} }
} }

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

@@ -43,7 +43,6 @@ import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.FeatureInfo; import android.content.pm.FeatureInfo;
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.net.NetworkPolicyManager; import android.net.NetworkPolicyManager;
import android.os.Binder; import android.os.Binder;
@@ -384,20 +383,12 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
String callingPackage = component.getPackageName(); String callingPackage = component.getPackageName();
checkCanCallNotificationApi(callingPackage); checkCanCallNotificationApi(callingPackage);
int userId = getCallingUserId(); int userId = getCallingUserId();
String packageTitle = BidiFormatter.getInstance().unicodeWrap( final long identity = Binder.clearCallingIdentity();
getPackageInfo(callingPackage, userId)
.applicationInfo
.loadSafeLabel(getContext().getPackageManager(),
PackageItemInfo.DEFAULT_MAX_LABEL_SIZE_PX,
PackageItemInfo.SAFE_LABEL_FLAG_TRIM
| PackageItemInfo.SAFE_LABEL_FLAG_FIRST_LINE)
.toString());
long identity = Binder.clearCallingIdentity();
try { try {
return PendingIntent.getActivity(getContext(), return PendingIntent.getActivity(getContext(),
0 /* request code */, 0 /* request code */,
NotificationAccessConfirmationActivityContract.launcherIntent( NotificationAccessConfirmationActivityContract.launcherIntent(
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);
} finally { } finally {