Snap for 7796451 from 35e019961b995c6af359f25c2685dedd8b14800b to sc-qpr1-release

Change-Id: I24d2f2c59718b467ce07946eb8d5c03d7a373528

2 files changed, 11 insertions, 13 deletions

diff --git a/Settings/src/com/android/tv/settings/accessories/ConnectedDevicesSliceBroadcastReceiver.java b/Settings/src/com/android/tv/settings/accessories/ConnectedDevicesSliceBroadcastReceiver.java
index 9ce082bbc..59b8a926a 100644
--- a/Settings/src/com/android/tv/settings/accessories/ConnectedDevicesSliceBroadcastReceiver.java
+++ b/Settings/src/com/android/tv/settings/accessories/ConnectedDevicesSliceBroadcastReceiver.java
@@ -16,8 +16,6 @@
 
 package com.android.tv.settings.accessories;
 
-import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
-
 import static com.android.tv.settings.accessories.ConnectedDevicesSliceUtils.DIRECTION_BACK;
 import static com.android.tv.settings.accessories.ConnectedDevicesSliceUtils.EXTRAS_DIRECTION;
 import static com.android.tv.settings.accessories.ConnectedDevicesSliceUtils.EXTRAS_SLICE_URI;
@@ -49,7 +47,6 @@ public class ConnectedDevicesSliceBroadcastReceiver extends BroadcastReceiver {
     public void onReceive(Context context, Intent intent) {
         // Handle CEC control toggle.
         final String action = intent.getAction();
-        final boolean isChecked = intent.getBooleanExtra(EXTRA_TOGGLE_STATE, false);
         if (ACTION_TOGGLE_CHANGED.equals(action)) {
             if (BLUETOOTH_ON.equals(intent.getStringExtra(EXTRA_TOGGLE_TYPE))) {
                 if (AccessoryUtils.getDefaultBluetoothAdapter() != null) {
diff --git a/Settings/src/com/android/tv/settings/accessories/ConnectedDevicesSliceProvider.java b/Settings/src/com/android/tv/settings/accessories/ConnectedDevicesSliceProvider.java
index e457b8d22..d2d927a3b 100644
--- a/Settings/src/com/android/tv/settings/accessories/ConnectedDevicesSliceProvider.java
+++ b/Settings/src/com/android/tv/settings/accessories/ConnectedDevicesSliceProvider.java
@@ -125,7 +125,7 @@ public class ConnectedDevicesSliceProvider extends SliceProvider implements
     public PendingIntent onCreatePermissionRequest(Uri sliceUri, String callingPackage) {
         final Intent settingsIntent = new Intent(Settings.ACTION_SETTINGS);
         final PendingIntent noOpIntent = PendingIntent.getActivity(
-                getContext(), 0, settingsIntent, PendingIntent.FLAG_MUTABLE);
+                getContext(), 0, settingsIntent, PendingIntent.FLAG_IMMUTABLE);
         return noOpIntent;
     }
 
@@ -253,13 +253,14 @@ public class ConnectedDevicesSliceProvider extends SliceProvider implements
             i.putExtras(extras);
             i.putExtra(KEY_EXTRAS_DEVICE, device);
             PendingIntent pendingIntent = PendingIntent.getActivity(
-                    context, 3, i, PendingIntent.FLAG_MUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);
+                    context, 3, i,
+                    PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);
             Intent followUpIntent =
                     new Intent(context, ConnectedDevicesSliceBroadcastReceiver.class);
             followUpIntent.putExtra(EXTRAS_SLICE_URI, sliceUri.toString());
             PendingIntent followupIntent = PendingIntent.getBroadcast(
                     context, 4, followUpIntent,
-                    PendingIntent.FLAG_MUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);
+                    PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);
             connectionActionPref.setPendingIntent(pendingIntent);
             connectionActionPref.setFollowupPendingIntent(followupIntent);
             psb.addPreference(connectionActionPref);
@@ -285,13 +286,13 @@ public class ConnectedDevicesSliceProvider extends SliceProvider implements
         i.putExtra(KEY_EXTRAS_DEVICE, device);
         i.putExtras(extras);
         PendingIntent renamePendingIntent = PendingIntent.getActivity(
-                context, 5, i, PendingIntent.FLAG_MUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);
+                context, 5, i, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);
 
         Intent followUpIntent = new Intent(context, ConnectedDevicesSliceBroadcastReceiver.class);
         followUpIntent.putExtra(EXTRAS_SLICE_URI, sliceUri.toString());
         PendingIntent renameFollowupIntent = PendingIntent.getBroadcast(
                 context, 6, followUpIntent,
-                PendingIntent.FLAG_MUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);
+                PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);
         renamePref.setFollowupPendingIntent(renameFollowupIntent);
         renamePref.setPendingIntent(renamePendingIntent);
         psb.addPreference(renamePref);
@@ -316,12 +317,12 @@ public class ConnectedDevicesSliceProvider extends SliceProvider implements
         i.putExtras(extras);
         i.putExtra(KEY_EXTRAS_DEVICE, device);
         PendingIntent disconnectPendingIntent = PendingIntent.getActivity(
-                context, 7, i, PendingIntent.FLAG_MUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);
+                context, 7, i, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);
         followUpIntent = new Intent(context, ConnectedDevicesSliceBroadcastReceiver.class);
         followUpIntent.putExtra(EXTRAS_SLICE_URI, sliceUri.toString());
         PendingIntent forgetFollowupIntent = PendingIntent.getBroadcast(
                 context, 8, followUpIntent,
-                PendingIntent.FLAG_MUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);
+                PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);
         forgetPref.setPendingIntent(disconnectPendingIntent);
         forgetPref.setFollowupPendingIntent(forgetFollowupIntent);
         psb.addPreference(forgetPref);
@@ -370,10 +371,10 @@ public class ConnectedDevicesSliceProvider extends SliceProvider implements
                                     AccessoryUtils.isBluetoothEnabled()
                                             ? PendingIntent.getActivity(
                                                     getContext(), 1, bluetoothToggleIntent,
-                                                    PendingIntent.FLAG_MUTABLE)
+                                                    PendingIntent.FLAG_IMMUTABLE)
                                             : PendingIntent.getBroadcast(
                                                     getContext(), 2, bluetoothToggleIntent,
-                                                    PendingIntent.FLAG_MUTABLE),
+                                                    PendingIntent.FLAG_IMMUTABLE),
                                     AccessoryUtils.isBluetoothEnabled())
             );
         }
@@ -388,7 +389,7 @@ public class ConnectedDevicesSliceProvider extends SliceProvider implements
             if (admin == null) {
                 Intent i = new Intent(ACTION_CONNECT_INPUT).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 pendingIntent = PendingIntent
-                        .getActivity(getContext(), 3, i, PendingIntent.FLAG_MUTABLE);
+                        .getActivity(getContext(), 3, i, PendingIntent.FLAG_IMMUTABLE);
             } else {
                 Intent intent = RestrictedLockUtils.getShowAdminSupportDetailsIntent(getContext(),
                         admin);