Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d0bd58e authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9465878 from 30783964 to tm-qpr2-release 

Change-Id: I1e8465e635a753efadc8e991c726923f8e9522e3
parents 6e293be0 30783964

src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java

+7 −1
Original line number Diff line number Diff line
@@ -408,7 +408,13 @@ public class AppInfoDashboardFragment extends DashboardFragment 
            return;

        }

        super.onPrepareOptionsMenu(menu);

        menu.findItem(UNINSTALL_ALL_USERS_MENU).setVisible(shouldShowUninstallForAll(mAppEntry));

        final MenuItem uninstallAllUsersItem = menu.findItem(UNINSTALL_ALL_USERS_MENU);

        uninstallAllUsersItem.setVisible(

                shouldShowUninstallForAll(mAppEntry) && !mAppsControlDisallowedBySystem);

        if (uninstallAllUsersItem.isVisible()) {

            RestrictedLockUtilsInternal.setMenuItemAsDisabledByAdmin(getActivity(),

                    uninstallAllUsersItem, mAppsControlDisallowedAdmin);

        }

        menu.findItem(ACCESS_RESTRICTED_SETTINGS).setVisible(shouldShowAccessRestrictedSettings());

        mUpdatedSysApp = (mAppEntry.info.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0;

        final MenuItem uninstallUpdatesItem = menu.findItem(UNINSTALL_UPDATES);

src/com/android/settings/notification/MediaVolumePreferenceController.java

+2 −2
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ public class MediaVolumePreferenceController extends VolumeSeekBarPreferenceCont 
                    getWorker().getActiveLocalMediaController().getPackageName());



            pi = PendingIntent.getBroadcast(context, 0 /* requestCode */, intent,

                    PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE);

                    PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);

        } else {

            final CachedBluetoothDevice bluetoothDevice =

                    ((BluetoothMediaDevice) mMediaDevice).getCachedDevice();
@@ -141,7 +141,7 @@ public class MediaVolumePreferenceController extends VolumeSeekBarPreferenceCont 
                    && getWorker().getActiveLocalMediaController() != null);



            pi = PendingIntent.getActivity(context, 0 /* requestCode */, intent,

                    PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE);

                    PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);

        }



        final IconCompat icon = getBroadcastIcon(context);