DO NOT MERGE: Revert "Merge "Disable PendingIntent background activity launch" into tm-dev am: 05494c71f8"
This reverts commit b072d3914ecd6ec109c7a19a0244747eefd061ff.
Reason for revert: <Need to algin with the schedule with Security Bulletin release>
Change-Id: Ifaaa68dd59cf52e4f0ba9c08509291730d675aea
diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java
index 638e8ec..c806c62 100644
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -8348,15 +8348,7 @@
mPendingIntentWakeLock.acquire();
try {
if (DBG) log("Sending " + pendingIntent);
- final BroadcastOptions options = BroadcastOptions.makeBasic();
- if (SdkLevel.isAtLeastT()) {
- // Explicitly disallow the receiver from starting activities, to prevent apps from
- // utilizing the PendingIntent as a backdoor to do this.
- options.setPendingIntentBackgroundActivityLaunchAllowed(false);
- }
- pendingIntent.send(mContext, 0, intent, this /* onFinished */, null /* Handler */,
- null /* requiredPermission */,
- SdkLevel.isAtLeastT() ? options.toBundle() : null);
+ pendingIntent.send(mContext, 0, intent, this /* onFinished */, null /* Handler */);
} catch (PendingIntent.CanceledException e) {
if (DBG) log(pendingIntent + " was not sent, it had been canceled.");
mPendingIntentWakeLock.release();