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

Commit ec102212 authored by Malcolm Chen's avatar Malcolm Chen
Browse files

Add strings and carrier config needed network service.

Add resource overlay and carrier config which will determine
which package / network services will be bound to.

Bug: 64132030
Test: regression tests
Change-Id: I5f515ec16b712e7be25f69e0e079d672227542b0
parent 3367c05b
Loading
Loading
Loading
Loading
+1 −0
Original line number Original line Diff line number Diff line
@@ -31,6 +31,7 @@ package android {
    field public static final java.lang.String BIND_RUNTIME_PERMISSION_PRESENTER_SERVICE = "android.permission.BIND_RUNTIME_PERMISSION_PRESENTER_SERVICE";
    field public static final java.lang.String BIND_RUNTIME_PERMISSION_PRESENTER_SERVICE = "android.permission.BIND_RUNTIME_PERMISSION_PRESENTER_SERVICE";
    field public static final java.lang.String BIND_SETTINGS_SUGGESTIONS_SERVICE = "android.permission.BIND_SETTINGS_SUGGESTIONS_SERVICE";
    field public static final java.lang.String BIND_SETTINGS_SUGGESTIONS_SERVICE = "android.permission.BIND_SETTINGS_SUGGESTIONS_SERVICE";
    field public static final java.lang.String BIND_TEXTCLASSIFIER_SERVICE = "android.permission.BIND_TEXTCLASSIFIER_SERVICE";
    field public static final java.lang.String BIND_TEXTCLASSIFIER_SERVICE = "android.permission.BIND_TEXTCLASSIFIER_SERVICE";
    field public static final java.lang.String BIND_TELEPHONY_NETWORK_SERVICE = "android.permission.BIND_TELEPHONY_NETWORK_SERVICE";
    field public static final java.lang.String BIND_TRUST_AGENT = "android.permission.BIND_TRUST_AGENT";
    field public static final java.lang.String BIND_TRUST_AGENT = "android.permission.BIND_TRUST_AGENT";
    field public static final java.lang.String BIND_TV_REMOTE_SERVICE = "android.permission.BIND_TV_REMOTE_SERVICE";
    field public static final java.lang.String BIND_TV_REMOTE_SERVICE = "android.permission.BIND_TV_REMOTE_SERVICE";
    field public static final java.lang.String BLUETOOTH_PRIVILEGED = "android.permission.BLUETOOTH_PRIVILEGED";
    field public static final java.lang.String BLUETOOTH_PRIVILEGED = "android.permission.BLUETOOTH_PRIVILEGED";
+9 −0
Original line number Original line Diff line number Diff line
@@ -1801,6 +1801,15 @@
    <permission android:name="android.permission.BIND_DATA_SERVICE"
    <permission android:name="android.permission.BIND_DATA_SERVICE"
        android:protectionLevel="signature|privileged|vendorPrivileged" />
        android:protectionLevel="signature|privileged|vendorPrivileged" />


    <!-- Must be required by a NetworkService to ensure that only the
         system can bind to it.
         <p>Protection level: signature
         @SystemApi
         @hide
    -->
    <permission android:name="android.permission.BIND_TELEPHONY_NETWORK_SERVICE"
                android:protectionLevel="signature" />

    <!-- Allows an application to manage embedded subscriptions (those on a eUICC) through
    <!-- Allows an application to manage embedded subscriptions (those on a eUICC) through
         EuiccManager APIs.
         EuiccManager APIs.
         <p>Protection level: signature|privileged|development
         <p>Protection level: signature|privileged|development
+7 −0
Original line number Original line Diff line number Diff line
@@ -3271,4 +3271,11 @@
    <bool name="config_supportBluetoothPersistedState">true</bool>
    <bool name="config_supportBluetoothPersistedState">true</bool>


    <bool name="config_keepRestrictedProfilesInBackground">true</bool>
    <bool name="config_keepRestrictedProfilesInBackground">true</bool>

    <!-- Cellular network service package name to bind to by default. -->
    <string name="config_wwan_network_service_package" translatable="false">com.android.phone</string>

    <!-- IWLAN network service package name to bind to by default. If none is specified in an overlay, an
         empty string is passed in -->
    <string name="config_wlan_network_service_package" translatable="false"></string>
</resources>
</resources>
+2 −0
Original line number Original line Diff line number Diff line
@@ -266,6 +266,8 @@
  <java-symbol type="bool" name="config_mms_content_disposition_support" />
  <java-symbol type="bool" name="config_mms_content_disposition_support" />
  <java-symbol type="string" name="config_ims_package" />
  <java-symbol type="string" name="config_ims_package" />
  <java-symbol type="bool" name="config_dynamic_bind_ims" />
  <java-symbol type="bool" name="config_dynamic_bind_ims" />
  <java-symbol type="string" name="config_wwan_network_service_package" />
  <java-symbol type="string" name="config_wlan_network_service_package" />
  <java-symbol type="bool" name="config_networkSamplingWakesDevice" />
  <java-symbol type="bool" name="config_networkSamplingWakesDevice" />
  <java-symbol type="bool" name="config_showMenuShortcutsWhenKeyboardPresent" />
  <java-symbol type="bool" name="config_showMenuShortcutsWhenKeyboardPresent" />
  <java-symbol type="bool" name="config_sip_wifi_only" />
  <java-symbol type="bool" name="config_sip_wifi_only" />
+18 −0
Original line number Original line Diff line number Diff line
@@ -1808,6 +1808,22 @@ public class CarrierConfigManager {
    public static final String KEY_LTE_RSRP_THRESHOLDS_INT_ARRAY =
    public static final String KEY_LTE_RSRP_THRESHOLDS_INT_ARRAY =
            "lte_rsrp_thresholds_int_array";
            "lte_rsrp_thresholds_int_array";


    /**
     * Decides when clients try to bind to iwlan network service, which package name will
     * the binding intent go to.
     * @hide
     */
    public static final String KEY_CARRIER_NETWORK_SERVICE_WLAN_PACKAGE_OVERRIDE_STRING
             = "carrier_network_service_wlan_package_override_string";

    /**
     * Decides when clients try to bind to wwan (cellular) network service, which package name will
     * the binding intent go to.
     * @hide
     */
    public static final String KEY_CARRIER_NETWORK_SERVICE_WWAN_PACKAGE_OVERRIDE_STRING
            = "carrier_network_service_wwan_package_override_string";

    /** The default value for every variable. */
    /** The default value for every variable. */
    private final static PersistableBundle sDefaults;
    private final static PersistableBundle sDefaults;


@@ -1846,6 +1862,8 @@ public class CarrierConfigManager {
        sDefaults.putBoolean(KEY_CARRIER_IMS_GBA_REQUIRED_BOOL, false);
        sDefaults.putBoolean(KEY_CARRIER_IMS_GBA_REQUIRED_BOOL, false);
        sDefaults.putBoolean(KEY_CARRIER_INSTANT_LETTERING_AVAILABLE_BOOL, false);
        sDefaults.putBoolean(KEY_CARRIER_INSTANT_LETTERING_AVAILABLE_BOOL, false);
        sDefaults.putBoolean(KEY_CARRIER_USE_IMS_FIRST_FOR_EMERGENCY_BOOL, true);
        sDefaults.putBoolean(KEY_CARRIER_USE_IMS_FIRST_FOR_EMERGENCY_BOOL, true);
        sDefaults.putString(KEY_CARRIER_NETWORK_SERVICE_WWAN_PACKAGE_OVERRIDE_STRING, "");
        sDefaults.putString(KEY_CARRIER_NETWORK_SERVICE_WLAN_PACKAGE_OVERRIDE_STRING, "");
        sDefaults.putString(KEY_CARRIER_INSTANT_LETTERING_INVALID_CHARS_STRING, "");
        sDefaults.putString(KEY_CARRIER_INSTANT_LETTERING_INVALID_CHARS_STRING, "");
        sDefaults.putString(KEY_CARRIER_INSTANT_LETTERING_ESCAPED_CHARS_STRING, "");
        sDefaults.putString(KEY_CARRIER_INSTANT_LETTERING_ESCAPED_CHARS_STRING, "");
        sDefaults.putString(KEY_CARRIER_INSTANT_LETTERING_ENCODING_STRING, "");
        sDefaults.putString(KEY_CARRIER_INSTANT_LETTERING_ENCODING_STRING, "");
Loading