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

Commit 723af485 authored by William Escande's avatar William Escande
Browse files

SystemServer: AutoOn: Add notification support 

Bug: 323060869
Bug: 316946334
Test: m Bluetooth | NotificationHelperService is not tested
Change-Id: I6448b701d2df775563bbdfb5360f6287892e2ecb
parent f0cb7321

android/app/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -256,4 +256,6 @@ 
    <string name="bluetooth_stays_on_message">Your device remembers to keep Bluetooth on in airplane mode. Turn off Bluetooth if you don\'t want it to stay on.</string>

    <string name="bluetooth_and_wifi_stays_on_title">Wi-Fi and Bluetooth stay on</string>

    <string name="bluetooth_and_wifi_stays_on_message">Your device remembers to keep Wi-Fi and Bluetooth on in airplane mode. Turn off Wi-Fi and Bluetooth if you don\'t want them to stay on.</string>

    <string name="bluetooth_enabled_auto_on_title">Bluetooth was restarted automatically</string>

    <string name="bluetooth_enabled_auto_on_message">Bluetooth has been automatically re-enabled. To prevent Bluetooth from re-enabling automatically, go to Bluetooth settings.</string>

</resources>

android/app/src/com/android/bluetooth/notification/NotificationHelperService.java

+25 −15
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ public class NotificationHelperService extends Service { 
    private static final String APM_BT_NOTIFICATION = "apm_bt_notification";

    // Keeps track of whether user enabling bt notification was shown

    private static final String APM_BT_ENABLED_NOTIFICATION = "apm_bt_enabled_notification";

    // Keeps track of whether auto on enabling bt notification was shown

    private static final String AUTO_ON_BT_ENABLED_NOTIFICATION = "auto_on_bt_enabled_notification";



    private static final String NOTIFICATION_TAG = "com.android.bluetooth";

    private static final String NOTIFICATION_CHANNEL = "notification_toggle_channel";
@@ -64,7 +66,11 @@ public class NotificationHelperService extends Service { 
                            APM_BT_ENABLED_NOTIFICATION,

                            Pair.create(

                                    R.string.bluetooth_enabled_apm_title,

                                    R.string.bluetooth_enabled_apm_message));

                                    R.string.bluetooth_enabled_apm_message),

                            AUTO_ON_BT_ENABLED_NOTIFICATION,

                            Pair.create(

                                    R.string.bluetooth_enabled_auto_on_title,

                                    R.string.bluetooth_enabled_auto_on_message));



    @Override

    public IBinder onBind(Intent intent) {
@@ -110,28 +116,32 @@ public class NotificationHelperService extends Service { 


        String title = getString(notificationContent.first);

        String message = getString(notificationContent.second);

        String helpLinkUrl = getString(R.string.config_apmLearnMoreLink);



        notificationManager.notify(

                NOTIFICATION_TAG,

                SystemMessage.ID.NOTE_BT_APM_NOTIFICATION_VALUE,

        Notification.Builder builder =

                new Notification.Builder(this, NOTIFICATION_CHANNEL)

                        .setAutoCancel(true)

                        .setLocalOnly(true)

                        .setContentTitle(title)

                        .setContentText(message)

                        .setContentIntent(

                        .setVisibility(Notification.VISIBILITY_PUBLIC)

                        .setStyle(new Notification.BigTextStyle().bigText(message))

                        .setSmallIcon(android.R.drawable.stat_sys_data_bluetooth);



        if (notificationReason != AUTO_ON_BT_ENABLED_NOTIFICATION) {

            // Do not display airplane link when the notification is due to auto_on feature

            String helpLinkUrl = getString(R.string.config_apmLearnMoreLink);

            builder.setContentIntent(

                    PendingIntent.getActivity(

                            this,

                            PendingIntent.FLAG_UPDATE_CURRENT,

                            new Intent(Intent.ACTION_VIEW)

                                    .setData(Uri.parse(helpLinkUrl))

                                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK),

                                        PendingIntent.FLAG_IMMUTABLE))

                        .setVisibility(Notification.VISIBILITY_PUBLIC)

                        .setStyle(new Notification.BigTextStyle().bigText(message))

                        .setSmallIcon(android.R.drawable.stat_sys_data_bluetooth)

                        .build());

                            PendingIntent.FLAG_IMMUTABLE));

        }



        notificationManager.notify(

                NOTIFICATION_TAG, SystemMessage.ID.NOTE_BT_APM_NOTIFICATION_VALUE, builder.build());

    }



    /** Return whether the notification has been shown */

service/src/com/android/server/bluetooth/BluetoothManagerService.java

+1 −0
Original line number Diff line number Diff line
@@ -1191,6 +1191,7 @@ class BluetoothManagerService { 


    private Unit enableFromAutoOn() {

        Counter.logIncrement("bluetooth.value_auto_on_triggered");

        sendToggleNotification("auto_on_bt_enabled_notification");

        enable("BluetoothSystemServer/AutoOn");

        return Unit.INSTANCE;

    }