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

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

Snap for 4407597 from 7bd96d32 to oc-mr1-release 

Change-Id: I9e76506b991d8147e5b6a5a3dbcc3e16ed825def
parents cb9d472e 7bd96d32

core/java/android/service/carrier/CarrierService.java

+3 −23
Original line number Diff line number Diff line
@@ -17,13 +17,10 @@ package android.service.carrier; 
import android.annotation.CallSuper;

import android.app.Service;

import android.content.Intent;

import android.os.Bundle;

import android.os.IBinder;

import android.os.PersistableBundle;

import android.os.RemoteException;

import android.os.ResultReceiver;

import android.os.ServiceManager;

import android.util.Log;



import com.android.internal.telephony.ITelephonyRegistry;
@@ -51,8 +48,6 @@ import com.android.internal.telephony.ITelephonyRegistry; 
 */

public abstract class CarrierService extends Service {



    private static final String LOG_TAG = "CarrierService";



    public static final String CARRIER_SERVICE_INTERFACE = "android.service.carrier.CarrierService";



    private static ITelephonyRegistry sRegistry;
@@ -138,26 +133,11 @@ public abstract class CarrierService extends Service { 
    /**

     * A wrapper around ICarrierService that forwards calls to implementations of

     * {@link CarrierService}.

     * @hide

     */

    public class ICarrierServiceWrapper extends ICarrierService.Stub {

        /** @hide */

        public static final int RESULT_OK = 0;

        /** @hide */

        public static final int RESULT_ERROR = 1;

        /** @hide */

        public static final String KEY_CONFIG_BUNDLE = "config_bundle";



    private class ICarrierServiceWrapper extends ICarrierService.Stub {

        @Override

        public void getCarrierConfig(CarrierIdentifier id, ResultReceiver result) {

            try {

                Bundle data = new Bundle();

                data.putParcelable(KEY_CONFIG_BUNDLE, CarrierService.this.onLoadConfig(id));

                result.send(RESULT_OK, data);

            } catch (Exception e) {

                Log.e(LOG_TAG, "Error in onLoadConfig: " + e.getMessage(), e);

                result.send(RESULT_ERROR, null);

            }

        public PersistableBundle getCarrierConfig(CarrierIdentifier id) {

            return CarrierService.this.onLoadConfig(id);

        }

    }

}

core/java/android/service/carrier/ICarrierService.aidl

+1 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package android.service.carrier;



import android.os.PersistableBundle;

import android.os.ResultReceiver;

import android.service.carrier.CarrierIdentifier;



/**
@@ -29,5 +28,5 @@ import android.service.carrier.CarrierIdentifier; 
interface ICarrierService {



    /** @see android.service.carrier.CarrierService#onLoadConfig */

    oneway void getCarrierConfig(in CarrierIdentifier id, in ResultReceiver result);

    PersistableBundle getCarrierConfig(in CarrierIdentifier id);

}

core/res/res/values-af/strings.xml

+0 −3
Original line number Diff line number Diff line
@@ -979,7 +979,6 @@ 
    <string name="cancel" msgid="6442560571259935130">"Kanselleer"</string>

    <string name="yes" msgid="5362982303337969312">"OK"</string>

    <string name="no" msgid="5141531044935541497">"Kanselleer"</string>

    <string name="close" msgid="2318214661230355730">"MAAK TOE"</string>

    <string name="dialog_alert_title" msgid="2049658708609043103">"Aandag"</string>

    <string name="loading" msgid="7933681260296021180">"Laai tans..."</string>

    <string name="capital_on" msgid="1544682755514494298">"AAN"</string>
@@ -1036,8 +1035,6 @@ 
    <string name="screen_compat_mode_scale" msgid="3202955667675944499">"Skaal"</string>

    <string name="screen_compat_mode_show" msgid="4013878876486655892">"Wys altyd"</string>

    <string name="screen_compat_mode_hint" msgid="1064524084543304459">"Heraktiveer hierdie in Stelselinstellings &gt; Programme &gt; Afgelaai."</string>

    <string name="top_app_killed_title" msgid="6814231368167994497">"Program reageer nie"</string>

    <string name="top_app_killed_message" msgid="3487519022191609844">"<xliff:g id="APP_NAME">%1$s</xliff:g> gebruik dalk te veel berging."</string>

    <string name="unsupported_display_size_message" msgid="6545327290756295232">"<xliff:g id="APP_NAME">%1$s</xliff:g> steun nie die huidige skermgrootte-instelling nie en sal dalk onverwags reageer."</string>

    <string name="unsupported_display_size_show" msgid="7969129195360353041">"Wys altyd"</string>

    <string name="smv_application" msgid="3307209192155442829">"Die program <xliff:g id="APPLICATION">%1$s</xliff:g> (proses <xliff:g id="PROCESS">%2$s</xliff:g>) het sy selfopgelegde StrictMode-beleid oortree."</string>

core/res/res/values-am/strings.xml

+0 −3
Original line number Diff line number Diff line
@@ -979,7 +979,6 @@ 
    <string name="cancel" msgid="6442560571259935130">"ይቅር"</string>

    <string name="yes" msgid="5362982303337969312">"እሺ"</string>

    <string name="no" msgid="5141531044935541497">"ይቅር"</string>

    <string name="close" msgid="2318214661230355730">"ዝጋ"</string>

    <string name="dialog_alert_title" msgid="2049658708609043103">"ትኩረት"</string>

    <string name="loading" msgid="7933681260296021180">"በመጫን ላይ…"</string>

    <string name="capital_on" msgid="1544682755514494298">"በ"</string>
@@ -1036,8 +1035,6 @@ 
    <string name="screen_compat_mode_scale" msgid="3202955667675944499">"የልኬት ለውጥ"</string>

    <string name="screen_compat_mode_show" msgid="4013878876486655892">"ሁልጊዜ አሳይ"</string>

    <string name="screen_compat_mode_hint" msgid="1064524084543304459">"በስርዓት ቅንብሮች  ውስጥ ይሄንን ዳግም አንቃ&gt; Apps &amp;gt፤ወርዷል፡፡"</string>

    <string name="top_app_killed_title" msgid="6814231368167994497">"መተግበሪያው ምላሽ እየሰጠ አይደለም"</string>

    <string name="top_app_killed_message" msgid="3487519022191609844">"<xliff:g id="APP_NAME">%1$s</xliff:g> በጣም ብዙ ማህደረ ትውስታ እየተጠቀመ ሊሆን ይችላል።"</string>

    <string name="unsupported_display_size_message" msgid="6545327290756295232">"<xliff:g id="APP_NAME">%1$s</xliff:g> አሁን ያለውን የማሳያ መጠን ቅንብር አይደግፍም እና ያልተጠብቀ ባሕሪ ሊያሳይ ይችላል።"</string>

    <string name="unsupported_display_size_show" msgid="7969129195360353041">"ሁልጊዜ አሳይ"</string>

    <string name="smv_application" msgid="3307209192155442829">"መተግበሪያው <xliff:g id="APPLICATION">%1$s</xliff:g>( ሂደት<xliff:g id="PROCESS">%2$s</xliff:g>) በራስ ተነሳሺ StrictMode ደንብን ይተላለፋል።"</string>

core/res/res/values-ar/strings.xml

+0 −3
Original line number Diff line number Diff line
@@ -1059,7 +1059,6 @@ 
    <string name="cancel" msgid="6442560571259935130">"إلغاء"</string>

    <string name="yes" msgid="5362982303337969312">"حسنًا"</string>

    <string name="no" msgid="5141531044935541497">"إلغاء"</string>

    <string name="close" msgid="2318214661230355730">"إغلاق"</string>

    <string name="dialog_alert_title" msgid="2049658708609043103">"تنبيه"</string>

    <string name="loading" msgid="7933681260296021180">"جارٍ التحميل…"</string>

    <string name="capital_on" msgid="1544682755514494298">"تشغيل"</string>
@@ -1116,8 +1115,6 @@ 
    <string name="screen_compat_mode_scale" msgid="3202955667675944499">"تدرج"</string>

    <string name="screen_compat_mode_show" msgid="4013878876486655892">"الإظهار دائمًا"</string>

    <string name="screen_compat_mode_hint" msgid="1064524084543304459">"‏يمكنك إعادة تمكين هذا في إعدادات النظام &gt; التطبيقات &gt; ما تم تنزيله."</string>

    <string name="top_app_killed_title" msgid="6814231368167994497">"التطبيق لا يستجيب"</string>

    <string name="top_app_killed_message" msgid="3487519022191609844">"ربما يشغل <xliff:g id="APP_NAME">%1$s</xliff:g> مساحة كبيرة جدًا من الذاكرة."</string>

    <string name="unsupported_display_size_message" msgid="6545327290756295232">"<xliff:g id="APP_NAME">%1$s</xliff:g> غير متوافق مع الإعداد الحالي لحجم شاشة العرض وربما يعمل بطريقة غير متوقعة."</string>

    <string name="unsupported_display_size_show" msgid="7969129195360353041">"العرض دائمًا"</string>

    <string name="smv_application" msgid="3307209192155442829">"‏انتهك التطبيق <xliff:g id="APPLICATION">%1$s</xliff:g> (العملية <xliff:g id="PROCESS">%2$s</xliff:g>) سياسة StrictMode المفروضة ذاتيًا."</string>