LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Add FLAG_IMMUTABLE to PendingIntents" am: a3aa817aa5 am: b119c3792c am: fc609be986 am: 37b0cb3495 am: c597652305

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/development/+/2229375

Change-Id: I85d6e2d4503367a5bdcc166caaff6a7e82ea4f32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-09-24 02:53:56 +00:00
committed by Automerger Merge Worker
parent bbb8d54c02 c597652305
commit f6bc6e9561
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/Development/src/com/android/development/SyncAdapterDriver.java
View File

@@ -299,7 +299,7 @@ public class SyncAdapterDriver extends Activity
intent.putExtra(Intent.EXTRA_CLIENT_LABEL,
com.android.internal.R.string.sync_binding_label);
intent.putExtra(Intent.EXTRA_CLIENT_INTENT, PendingIntent.getActivity(
this, 0, new Intent(Settings.ACTION_SYNC_SETTINGS), 0));
this, 0, new Intent(Settings.ACTION_SYNC_SETTINGS), PendingIntent.FLAG_IMMUTABLE));
if (!bindService(intent, mActiveServiceConnection, Context.BIND_AUTO_CREATE)) {
mBoundAdapterTextView.setText(getString(R.string.binding_bind_failed));
mActiveServiceConnection = null;

2
samples/SipDemo/src/com/example/android/sip/WalkieTalkieActivity.java
View File

@@ -137,7 +137,7 @@ public class WalkieTalkieActivity extends Activity implements View.OnTouchListen
Intent i = new Intent();
i.setAction("android.SipDemo.INCOMING_CALL");
PendingIntent pi = PendingIntent.getBroadcast(this, 0, i, Intent.FILL_IN_DATA);
PendingIntent pi = PendingIntent.getBroadcast(this, 0, i, Intent.FILL_IN_DATA | PendingIntent.FLAG_IMMUTABLE);
manager.open(me, pi, null);