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

Commit 42f4f2f2 authored by Petr Sedlacek's avatar Petr Sedlacek Committed by Steve Kondik
Browse files

Frameworks: follow charging notification settings also for wireless charging 

Originally, system would play a fixed notification sound when wireless
charging starts from com.android.server.power.Notifier.java regardless
of the Charging sounds settings. This removes the notification from
Notifier.java which means the system will notify about wireless charging
in the same (configurable) way as for normal wired charging.

Change-Id: I034fc95f8ac3554ef1d463ac94bebd5a448e1a3f
parent 7b32e2b2

services/core/java/com/android/server/power/Notifier.java

+1 −34
Original line number Diff line number Diff line
@@ -29,10 +29,6 @@ import android.content.BroadcastReceiver; 
import android.content.Context;

import android.content.Intent;

import android.hardware.input.InputManagerInternal;

import android.media.AudioManager;

import android.media.Ringtone;

import android.media.RingtoneManager;

import android.net.Uri;

import android.os.BatteryStats;

import android.os.Handler;

import android.os.Looper;
@@ -78,8 +74,7 @@ final class Notifier { 


    private static final int MSG_USER_ACTIVITY = 1;

    private static final int MSG_BROADCAST = 2;

    private static final int MSG_WIRELESS_CHARGING_STARTED = 3;

    private static final int MSG_SCREEN_BRIGHTNESS_BOOST_CHANGED = 4;

    private static final int MSG_SCREEN_BRIGHTNESS_BOOST_CHANGED = 3;



    private final Object mLock = new Object();
@@ -502,11 +497,6 @@ final class Notifier { 
        if (DEBUG) {

            Slog.d(TAG, "onWirelessChargingStarted");

        }



        mSuspendBlocker.acquire();

        Message msg = mHandler.obtainMessage(MSG_WIRELESS_CHARGING_STARTED);

        msg.setAsynchronous(true);

        mHandler.sendMessage(msg);

    }



    private void updatePendingBroadcastLocked() {
@@ -642,25 +632,6 @@ final class Notifier { 
        }

    };



    private void playWirelessChargingStartedSound() {

        final boolean enabled = Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.CHARGING_SOUNDS_ENABLED, 1) != 0;

        final String soundPath = Settings.Global.getString(mContext.getContentResolver(),

                Settings.Global.WIRELESS_CHARGING_STARTED_SOUND);

        if (enabled && soundPath != null) {

            final Uri soundUri = Uri.parse("file://" + soundPath);

            if (soundUri != null) {

                final Ringtone sfx = RingtoneManager.getRingtone(mContext, soundUri);

                if (sfx != null) {

                    sfx.setStreamType(AudioManager.STREAM_SYSTEM);

                    sfx.play();

                }

            }

        }



        mSuspendBlocker.release();

    }



    private final class NotifierHandler extends Handler {

        public NotifierHandler(Looper looper) {

            super(looper, null, true /*async*/);
@@ -676,10 +647,6 @@ final class Notifier { 
                case MSG_BROADCAST:

                    sendNextBroadcast();

                    break;



                case MSG_WIRELESS_CHARGING_STARTED:

                    playWirelessChargingStartedSound();

                    break;

                case MSG_SCREEN_BRIGHTNESS_BOOST_CHANGED:

                    sendBrightnessBoostChangedBroadcast();

                    break;