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

Commit c6d39b15 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6859016 from 19843031 to rvc-qpr1-release 

Change-Id: I3f201714ebfa3396ae3a359ba1b288fbc3147cbc
parents 855ebad2 19843031

AndroidManifest.xml

+5 −0
Original line number Diff line number Diff line
@@ -3258,6 +3258,11 @@ 
            android:permission="android.permission.MANAGE_SLICE_PERMISSIONS"

            android:exported="true" />



        <receiver

            android:name=".slices.VolumeSliceRelayReceiver"

            android:permission="android.permission.MANAGE_SLICE_PERMISSIONS"

            android:exported="true" />



        <!-- Couldn't be triggered from outside of settings. Statsd can trigger it because we send

             PendingIntent to it-->

        <receiver android:name=".fuelgauge.batterytip.AnomalyDetectionReceiver"

res/xml/battery_saver_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
        settings:controller="com.android.settings.fuelgauge.batterysaver.BatterySaverStickyPreferenceController"/>



    <com.android.settings.widget.TwoStateButtonPreference

        android:key="battery_saver_button"

        android:key="battery_saver"

        android:title="@string/battery_saver"

        android:selectable="false"

        android:summary="@string/battery_saver_turn_on_summary"

src/com/android/settings/bluetooth/DevicePickerFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settings.bluetooth; 


import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH;



import android.Manifest;

import android.app.settings.SettingsEnums;

import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothDevice;
@@ -192,6 +193,6 @@ public final class DevicePickerFragment extends DeviceListPreferenceFragment { 
        if (mLaunchPackage != null && mLaunchClass != null) {

            intent.setClassName(mLaunchPackage, mLaunchClass);

        }

        getActivity().sendBroadcast(intent);

        getActivity().sendBroadcast(intent, Manifest.permission.BLUETOOTH_ADMIN);

    }

}

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

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ public abstract class AdjustVolumeRestrictedPreferenceController extends 
        filter.addAction(AudioManager.VOLUME_CHANGED_ACTION);

        filter.addAction(AudioManager.STREAM_MUTE_CHANGED_ACTION);

        filter.addAction(AudioManager.MASTER_MUTE_CHANGED_ACTION);

        filter.addAction(AudioManager.STREAM_DEVICES_CHANGED_ACTION);

        return filter;

    }

}

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

+4 −1
Original line number Diff line number Diff line
@@ -107,7 +107,10 @@ public abstract class VolumeSeekBarPreferenceController extends 
        return mHelper.getMinVolume(getAudioStream());

    }



    protected abstract int getAudioStream();

    /**

     * @return the audio stream type

     */

    public abstract int getAudioStream();



    protected abstract int getMuteIcon();