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

Commit 7129d0a5 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge changes from topics 'am-f4b13b8a7d3047959d28636f972cde03',... 

Merge changes from topics 'am-f4b13b8a7d3047959d28636f972cde03', 'am-709ecf5e9d934415bd2b800c61a87867' into nyc-mr1-dev-plus-aosp

* changes:
  Allow configurable data warning for BillingCyclerPreference am: 70196d84 am: 0060d55f
  Merge "Adds a CNAP filtering field to the CarrierConfig" into nyc-mr1-dev am: fb599587 am: c9457e18
  Adds a CNAP filtering field to the CarrierConfig am: 5ea6b1ec am: 8dc27c8f
  Merge "Fixed the animation of the no notifications view" into nyc-mr1-dev am: a9663254 am: 0a0e5e47
  Fixed the animation of the no notifications view am: a9d3efd1 am: 5e5a78fc
  Merge "Define low latency output stream (formerly primary)" into nyc-mr1-dev am: 46db227b am: 209fabdd
  Define low latency output stream (formerly primary) am: 2ed8f215 am: caea5a68
parents 4797b44d 030d4dba

media/java/android/media/AudioManager.java

+8 −2
Original line number Diff line number Diff line
@@ -3289,7 +3289,10 @@ public class AudioManager { 


    /**

     * Used as a key for {@link #getProperty} to request the native or optimal output sample rate

     * for this device's primary output stream, in decimal Hz.

     * for this device's low latency output stream, in decimal Hz.  Latency-sensitive apps

     * should use this value as a default, and offer the user the option to override it.

     * The low latency output stream is typically either the device's primary output stream,

     * or another output stream with smaller buffers.

     */

    // FIXME Deprecate

    public static final String PROPERTY_OUTPUT_SAMPLE_RATE =
@@ -3297,7 +3300,10 @@ public class AudioManager { 


    /**

     * Used as a key for {@link #getProperty} to request the native or optimal output buffer size

     * for this device's primary output stream, in decimal PCM frames.

     * for this device's low latency output stream, in decimal PCM frames.  Latency-sensitive apps

     * should use this value as a minimum, and offer the user the option to override it.

     * The low latency output stream is typically either the device's primary output stream,

     * or another output stream with smaller buffers.

     */

    // FIXME Deprecate

    public static final String PROPERTY_OUTPUT_FRAMES_PER_BUFFER =

packages/SettingsLib/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -19,4 +19,7 @@ 
<resources>

    <!-- Configuration for automotive -->

    <bool name="enable_pbap_pce_profile">false</bool>



    <!-- Default data warning level in mb -->

    <integer name="default_data_warning_level_mb">2048</integer>

</resources>

packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java

+13 −3
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ import android.text.format.DateUtils; 
import android.text.format.Time;

import android.util.Log;



import com.android.settingslib.R;



import java.util.Date;

import java.util.Locale;
@@ -41,12 +43,12 @@ import static android.net.NetworkStatsHistory.FIELD_TX_BYTES; 
import static android.telephony.TelephonyManager.SIM_STATE_READY;

import static android.text.format.DateUtils.FORMAT_ABBREV_MONTH;

import static android.text.format.DateUtils.FORMAT_SHOW_DATE;

import static android.net.TrafficStats.MB_IN_BYTES;



public class DataUsageController {



    private static final String TAG = "DataUsageController";

    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);



    public static final long DEFAULT_WARNING_LEVEL = 2L * 1024 * 1024 * 1024;

    private static final int FIELDS = FIELD_RX_BYTES | FIELD_TX_BYTES;

    private static final StringBuilder PERIOD_BUILDER = new StringBuilder(50);

    private static final java.util.Formatter PERIOD_FORMATTER = new java.util.Formatter(
@@ -75,6 +77,14 @@ public class DataUsageController { 
        mNetworkController = networkController;

    }



    /**

     * Returns the default warning level in bytes.

     */

    public long getDefaultWarningLevel() {

        return MB_IN_BYTES

                * mContext.getResources().getInteger(R.integer.default_data_warning_level_mb);

    }



    private INetworkStatsSession getSession() {

        if (mSession == null) {

            try {
@@ -169,7 +179,7 @@ public class DataUsageController { 
                usage.limitLevel = policy.limitBytes > 0 ? policy.limitBytes : 0;

                usage.warningLevel = policy.warningBytes > 0 ? policy.warningBytes : 0;

            } else {

                usage.warningLevel = DEFAULT_WARNING_LEVEL;

                usage.warningLevel = getDefaultWarningLevel();

            }

            if (usage != null && mNetworkController != null) {

                usage.carrier = mNetworkController.getMobileDataNetworkName();

packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java

+1 −1
Original line number Diff line number Diff line
@@ -3455,7 +3455,7 @@ public class NotificationStackScrollLayout extends ViewGroup 
                        notifyHeightChangeListener(mEmptyShadeView);

                    }

                };

                if (mAnimationsEnabled) {

                if (mAnimationsEnabled && mIsExpanded) {

                    mEmptyShadeView.setWillBeGone(true);

                    mEmptyShadeView.performVisibilityAnimation(false, onFinishedRunnable);

                } else {

telephony/java/android/telephony/CarrierConfigManager.java

+10 −0
Original line number Diff line number Diff line
@@ -921,6 +921,15 @@ public class CarrierConfigManager { 
    public static final String KEY_NOTIFY_VT_HANDOVER_TO_WIFI_FAILURE_BOOL =

            "notify_vt_handover_to_wifi_failure_bool";



    /**

     * A upper case list of CNAP names that are unhelpful to the user for distinguising calls and

     * should be filtered out of the CNAP information. This includes CNAP names such as "WIRELESS

     * CALLER" or "UNKNOWN NAME". By default, if there are no filtered names for this carrier, null

     * is returned.

     * @hide

     */

    public static final String FILTERED_CNAP_NAMES_STRING_ARRAY = "filtered_cnap_names_string_array";



    /** The default value for every variable. */

    private final static PersistableBundle sDefaults;
@@ -1088,6 +1097,7 @@ public class CarrierConfigManager { 
        sDefaults.putStringArray(KEY_IMS_REASONINFO_MAPPING_STRING_ARRAY, null);

        sDefaults.putBoolean(KEY_ENHANCED_4G_LTE_TITLE_VARIANT_BOOL, false);

        sDefaults.putBoolean(KEY_NOTIFY_VT_HANDOVER_TO_WIFI_FAILURE_BOOL, false);

        sDefaults.putStringArray(FILTERED_CNAP_NAMES_STRING_ARRAY, null);

    }



    /**