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

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

Snap for 5821595 from 65371b27 to qt-qpr1-release 

Change-Id: I231fcfde5d7e6e73e5b9e34604d6cfda4ff04726
parents b3b8656b 65371b27

core/java/android/hardware/radio/TunerCallbackAdapter.java

+6 −4
Original line number Diff line number Diff line
@@ -211,10 +211,12 @@ class TunerCallbackAdapter extends ITunerCallback.Stub { 


    @Override

    public void onProgramListUpdated(ProgramList.Chunk chunk) {

        mHandler.post(() -> {

            synchronized (mLock) {

                if (mProgramList == null) return;

                mProgramList.apply(Objects.requireNonNull(chunk));

            }

        });

    }



    @Override

core/res/res/values-en-rCA/strings.xml

+0 −1
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ 
    <string name="notification_channel_voice_mail" msgid="3954099424160511919">"Voicemail messages"</string>

    <string name="notification_channel_wfc" msgid="2130802501654254801">"Wi-Fi Calling"</string>

    <string name="notification_channel_sim" msgid="4052095493875188564">"SIM status"</string>

    <string name="notification_channel_sim_high_prio" msgid="1787666807724243207">"High priority SIM status"</string>

    <string name="peerTtyModeFull" msgid="6165351790010341421">"Peer requested TTY Mode FULL"</string>

    <string name="peerTtyModeHco" msgid="5728602160669216784">"Peer requested TTY Mode HCO"</string>

    <string name="peerTtyModeVco" msgid="1742404978686538049">"Peer requested TTY Mode VCO"</string>

core/res/res/values-en-rXC/strings.xml

+0 −1
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ 
    <string name="notification_channel_voice_mail" msgid="3954099424160511919">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‏‏‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‏‏‏‎Voicemail messages‎‏‎‎‏‎"</string>

    <string name="notification_channel_wfc" msgid="2130802501654254801">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‎‏‎‎‎‎‏‏‎‎‏‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‎‏‏‎‎‏‎‏‎‎‏‏‎‏‎‎‎‏‎Wi-Fi calling‎‏‎‎‏‎"</string>

    <string name="notification_channel_sim" msgid="4052095493875188564">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‎‎‏‎‎‎‎‏‏‎‏‎‏‎‏‎‎‎SIM status‎‏‎‎‏‎"</string>

    <string name="notification_channel_sim_high_prio" msgid="1787666807724243207">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‎‏‏‏‏‎‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎‏‏‏‏‏‎‎‏‎‎‎‎‎‏‏‏‎High priority SIM status‎‏‎‎‏‎"</string>

    <string name="peerTtyModeFull" msgid="6165351790010341421">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎‏‎‎‏‏‎‎‏‏‏‏‎‏‏‏‎‎‎‏‎‏‎‎‏‏‎‎‎‎‎‏‎‏‏‎‏‎Peer requested TTY Mode FULL‎‏‎‎‏‎"</string>

    <string name="peerTtyModeHco" msgid="5728602160669216784">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‎‎‎‎‎‎‎‎‏‎‏‎‏‎‏‎‏‎‎‎‎‎‏‎‎‏‏‏‎‎‎‏‏‏‎‎‏‎‏‎‏‎‎‎‎‎‎‎‏‎‎‎‎‎Peer requested TTY Mode HCO‎‏‎‎‏‎"</string>

    <string name="peerTtyModeVco" msgid="1742404978686538049">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‏‎‎‎‏‎‎‎‎‎‏‏‎‎‎‏‎‏‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‎‎‏‎‏‎‎‎‎‎‏‎Peer requested TTY Mode VCO‎‏‎‎‏‎"</string>

packages/SettingsLib/HelpUtils/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ 
-->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.settingslib.helputils">

    package="com.android.settingslib.widget">



</manifest>

packages/SettingsLib/HelpUtils/src/com/android/settingslib/HelpUtils.java

+2 −2
Original line number Diff line number Diff line
@@ -33,11 +33,11 @@ import android.view.Menu; 
import android.view.MenuItem;

import android.view.MenuItem.OnMenuItemClickListener;



import com.android.settingslib.widget.R;



import java.net.URISyntaxException;

import java.util.Locale;



import com.android.settingslib.helputils.R;



/**

 * Functions to easily prepare contextual help menu option items with an intent that opens up the

 * browser to a particular URL, while taking into account the preferred language and app version.