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

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

Snap for 6313343 from de809123 to qt-qpr3-release 

Change-Id: Ifa3803e3a84977d007eb9100c6e2d8ca27577f56
parents 7da33779 de809123

core/java/android/net/INetworkPolicyListener.aidl

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */



package android.net;

import android.telephony.SubscriptionPlan;



/** {@hide} */

oneway interface INetworkPolicyListener {
@@ -23,4 +24,5 @@ oneway interface INetworkPolicyListener { 
    void onRestrictBackgroundChanged(boolean restrictBackground);

    void onUidPoliciesChanged(int uid, int uidPolicies);

    void onSubscriptionOverride(int subId, int overrideMask, int overrideValue);

    void onSubscriptionPlansChanged(int subId, in SubscriptionPlan[] plans);

}

core/java/android/net/NetworkPolicyManager.java

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.net.wifi.WifiInfo; 
import android.os.Build;

import android.os.RemoteException;

import android.os.UserHandle;

import android.telephony.SubscriptionPlan;

import android.util.DebugUtils;

import android.util.Pair;

import android.util.Range;
@@ -381,5 +382,6 @@ public class NetworkPolicyManager { 
        @Override public void onRestrictBackgroundChanged(boolean restrictBackground) { }

        @Override public void onUidPoliciesChanged(int uid, int uidPolicies) { }

        @Override public void onSubscriptionOverride(int subId, int overrideMask, int overrideValue) { }

        @Override public void onSubscriptionPlansChanged(int subId, SubscriptionPlan[] plans) { }

    }

}

core/res/res/values/config.xml

+6 −0
Original line number Diff line number Diff line
@@ -2571,6 +2571,12 @@ 
         rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max -->

    <string name="config_wifi_tcp_buffers" translatable="false">524288,1048576,2097152,262144,524288,1048576</string>



    <!-- What source to use to estimate link upstream and downstream bandwidth capacities.

         Default is carrier_config, but it should be set to modem if the modem is returning

         predictive (instead of instantaneous) bandwidth estimate.

         Values are carrier_config and modem. -->

    <string name="config_bandwidthEstimateSource">carrier_config</string>



    <!-- Whether WiFi display is supported by this device.

         There are many prerequisites for this feature to work correctly.

         Here are a few of them:

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -518,6 +518,7 @@ 
  <java-symbol type="string" name="config_deviceSpecificDevicePolicyManagerService" />

  <java-symbol type="string" name="config_deviceSpecificAudioService" />

  <java-symbol type="integer" name="config_num_physical_slots" />

  <java-symbol type="string" name="config_bandwidthEstimateSource" />



  <java-symbol type="color" name="tab_indicator_text_v4" />

packages/PrintSpooler/res/values-ar/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ 
    <string name="cannot_add_printer" msgid="7840348733668023106">"تعذرت إضافة طابعات"</string>

    <string name="select_to_add_printers" msgid="3800709038689830974">"اختر لإضافة طابعة"</string>

    <string name="enable_print_service" msgid="3482815747043533842">"حدد للتمكين"</string>

    <string name="enabled_services_title" msgid="7036986099096582296">"الخدمات الممكنة"</string>

    <string name="enabled_services_title" msgid="7036986099096582296">"الخدمات المفعّلة"</string>

    <string name="recommended_services_title" msgid="3799434882937956924">"الخدمات الموصى بها"</string>

    <string name="disabled_services_title" msgid="7313253167968363211">"الخدمات غير المفعّلة"</string>

    <string name="all_services_title" msgid="5578662754874906455">"جميع الخدمات"</string>