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

Merge \"Add non-parcelable extras to notification to make sure it does not crash the app.\" into nyc-dev

Browse Source 
am: c72edd7a89

Change-Id: Icc8449c663d6fd97c8f8aff13afad936534a39a1
This commit is contained in:
Felipe Leme
2016-06-16 18:35:13 +00:00
committed by android-build-merger
parent d1970e861b c3a9008e3d
commit 5d53b301dc
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/cts/hostside/app2/src/com/android/cts/net/hostside/app2/MyBroadcastReceiver.java
View File

@@ -31,6 +31,7 @@ import static com.android.cts.net.hostside.app2.Common.TAG;
import static com.android.cts.net.hostside.app2.Common.getUid; import static com.android.cts.net.hostside.app2.Common.getUid;
import android.app.Notification; import android.app.Notification;
import android.app.Notification.Action;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
@@ -39,6 +40,7 @@ import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.NetworkInfo; import android.net.NetworkInfo;
import android.os.Bundle;
import android.util.Log; import android.util.Log;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
@@ -230,12 +232,18 @@ public class MyBroadcastReceiver extends BroadcastReceiver {
final int notificationId = intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1); final int notificationId = intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1);
final Intent serviceIntent = new Intent(context, MyService.class); final Intent serviceIntent = new Intent(context, MyService.class);
final PendingIntent pendingIntent = PendingIntent.getService(context, 0, serviceIntent, 0); final PendingIntent pendingIntent = PendingIntent.getService(context, 0, serviceIntent, 0);
final Bundle badBundle = new Bundle();
badBundle.putCharSequence("parcelable", "I am not");
final Action action = new Action.Builder(
R.drawable.ic_notification, "ACTION", pendingIntent)
.addExtras(badBundle)
.build();
final Notification notification = new Notification.Builder(context) final Notification notification = new Notification.Builder(context)
.setSmallIcon(R.drawable.ic_notification) .setSmallIcon(R.drawable.ic_notification)
.setContentTitle("Light, Cameras...") .setContentTitle("Light, Cameras...")
.setContentIntent(pendingIntent) .setContentIntent(pendingIntent)
.addAction(R.drawable.ic_notification, "ACTION", pendingIntent) .addAction(action)
.build(); .build();
((NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE)) ((NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE))
.notify(notificationId, notification); .notify(notificationId, notification);