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

Commit cccd566a authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'gingerbread' of git://git.omapzoom.org/platform/frameworks/base into 237 

Conflicts:
	core/java/android/app/ContextImpl.java
	core/java/android/bluetooth/BluetoothDeviceProfileState.java
	core/java/android/content/pm/IPackageManager.aidl
	core/res/res/values-de/strings.xml
	core/res/res/values-sk/strings.xml
	core/res/res/values-sv/strings.xml
	core/res/res/values-zh-rTW/strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java
	services/java/com/android/server/NativeDaemonConnector.java
	services/java/com/android/server/PackageManagerService.java
	services/java/com/android/server/WifiService.java
	telephony/java/com/android/internal/telephony/gsm/GSMPhone.java
	tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
	tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeInflater.java
	tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeResources.java
	tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeTypedArray.java
	tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeXmlBlockParser.java
	tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomBar.java
	tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/ResourceHelper.java
	tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/android/BridgeXmlBlockParserTest.java
	wifi/java/android/net/wifi/WifiStateTracker.java

Change-Id: Ia721284ebd8ed7741ab55105d89f2e3f366604d7
parents 0a648ad3 d51ecafa

core/java/android/app/ContextImpl.java

+1 −0
Original line number Diff line number Diff line
@@ -2079,6 +2079,7 @@ class ContextImpl extends Context { 
            }

        }



        @SuppressWarnings("unchecked")

        @Override

        public List<ApplicationInfo> getInstalledApplications(int flags) {

            try {

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

+2 −0
Original line number Diff line number Diff line
@@ -183,6 +183,8 @@ 
    <string name="permdesc_receiveSms" msgid="6298292335965966117">"للسماح للتطبيق بتلقي الرسائل القصيرة SMS ومعالجتها. قد تراقب بعض التطبيقات الضارة رسائلك أو تحذفها بدون عرضها لك."</string>

    <string name="permlab_receiveMms" msgid="8894700916188083287">"استلام رسالة وسائط متعددة (MMS)"</string>

    <string name="permdesc_receiveMms" msgid="4563346832000174373">"للسماح للتطبيق بتلقي رسائل الوسائط المتعددة (MMS) ومعالجتها. قد تراقب بعض التطبيقات الضارة رسائلك أو تحذفها بدون عرضها لك."</string>

    <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"تلقي بث الطوارئ"</string>

    <string name="permdesc_receiveEmergencyBroadcast" msgid="7118393393716546131">"للسماح للتطبيق بتلقي رسائل بث الطوارئ ومعالجتها. يتاح هذا الإذن لتطبيقات النظام فقط."</string>

    <string name="permlab_sendSms" msgid="5600830612147671529">"إرسال رسائل قصيرة SMS"</string>

    <string name="permdesc_sendSms" msgid="1946540351763502120">"للسماح للتطبيق بإرسال رسائل قصيرة SMS. قد تكلفك التطبيقات الضارة المال من خلال إرسال رسائل بدون تأكيدك."</string>

    <string name="permlab_readSms" msgid="4085333708122372256">"قراءة الرسائل القصيرة SMS أو رسائل الوسائط المتعددة"</string>

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

+2 −0
Original line number Diff line number Diff line
@@ -183,6 +183,8 @@ 
    <string name="permdesc_receiveSms" msgid="6298292335965966117">"Разрешава на приложението да получава и обработва SMS съобщения. Злонамерените приложения могат да наблюдават съобщенията ви или да ги изтрият, без да ви ги покажат."</string>

    <string name="permlab_receiveMms" msgid="8894700916188083287">"получаване на MMS"</string>

    <string name="permdesc_receiveMms" msgid="4563346832000174373">"Разрешава на приложението да получава и обработва MMS съобщения. Злонамерените приложения могат да наблюдават съобщенията ви или да ги изтрият, без да ви ги покажат."</string>

    <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"получаване на спешни излъчвания"</string>

    <string name="permdesc_receiveEmergencyBroadcast" msgid="7118393393716546131">"Разрешава на приложението да получава и обработва спешни съобщения за излъчване. Това разрешение е налице само за системни приложения."</string>

    <string name="permlab_sendSms" msgid="5600830612147671529">"изпращане на SMS съобщения"</string>

    <string name="permdesc_sendSms" msgid="1946540351763502120">"Разрешава на приложението да изпраща SMS съобщения. Злонамерените приложения могат да ви въвлекат в разходи, като изпращат съобщения без потвърждение от ваша страна."</string>

    <string name="permlab_readSms" msgid="4085333708122372256">"четене на SMS или MMS"</string>

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

+3 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
    <string name="needPuk2" msgid="4526033371987193070">"Escriviu el PUK2 per desbloquejar la targeta SIM."</string>

    <string name="ClipMmi" msgid="6952821216480289285">"Identificació de trucada entrant"</string>

    <string name="ClirMmi" msgid="7784673673446833091">"Identificació de trucada de sortida"</string>

    <string name="CfMmi" msgid="5123218989141573515">"Desviament de trucades"</string>

    <string name="CfMmi" msgid="5123218989141573515">"Desviació de trucades"</string>

    <string name="CwMmi" msgid="9129678056795016867">"Trucada en espera"</string>

    <string name="BaMmi" msgid="455193067926770581">"Restricció de trucades"</string>

    <string name="PwdMmi" msgid="7043715687905254199">"Canvi de contrasenya"</string>
@@ -183,6 +183,8 @@ 
    <string name="permdesc_receiveSms" msgid="6298292335965966117">"Permet a l\'aplicació rebre i processar missatges SMS. Les aplicacions malicioses poden supervisar els missatges o suprimir-los sense mostrar-vos-els."</string>

    <string name="permlab_receiveMms" msgid="8894700916188083287">"rebre MMS"</string>

    <string name="permdesc_receiveMms" msgid="4563346832000174373">"Permet a l\'aplicació rebre i processar missatges MMS. Les aplicacions malicioses poden supervisar els missatges o suprimir-los sense mostrar-vos-els."</string>

    <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"recepció d\'emissions d\'emergència"</string>

    <string name="permdesc_receiveEmergencyBroadcast" msgid="7118393393716546131">"Permet que l\'aplicació rebi i processi missatges de difusió d\'emergència. Aquest permís només està disponible per a les aplicacions del sistema."</string>

    <string name="permlab_sendSms" msgid="5600830612147671529">"enviar missatges SMS"</string>

    <string name="permdesc_sendSms" msgid="1946540351763502120">"Permet a l\'aplicació enviar missatges SMS. Les aplicacions malicioses poden costar-vos diners en enviar missatges sense la vostra confirmació."</string>

    <string name="permlab_readSms" msgid="4085333708122372256">"llegir SMS o MMS"</string>

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

+2 −0
Original line number Diff line number Diff line
@@ -183,6 +183,8 @@ 
    <string name="permdesc_receiveSms" msgid="6298292335965966117">"Umožňuje aplikaci přijímat a zpracovávat zprávy SMS. Škodlivé aplikace mohou sledovat vaše zprávy nebo je smazat, aniž by vám byly zobrazeny."</string>

    <string name="permlab_receiveMms" msgid="8894700916188083287">"příjem zpráv MMS"</string>

    <string name="permdesc_receiveMms" msgid="4563346832000174373">"Umožňuje aplikaci přijímat a zpracovávat zprávy MMS. Škodlivé aplikace mohou sledovat vaše zprávy nebo je smazat, aniž by vám byly zobrazeny."</string>

    <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"příjem nouzového vysílání"</string>

    <string name="permdesc_receiveEmergencyBroadcast" msgid="7118393393716546131">"Umožňuje aplikaci přijímat a zpracovávat zprávy nouzového vysílání. Toto oprávnění je dostupné jen pro systémové aplikace."</string>

    <string name="permlab_sendSms" msgid="5600830612147671529">"odesílaní zpráv SMS"</string>

    <string name="permdesc_sendSms" msgid="1946540351763502120">"Umožňuje aplikaci odesílat zprávy SMS. Škodlivé aplikace mohou bez vašeho potvrzení odesílat zpoplatněné zprávy."</string>

    <string name="permlab_readSms" msgid="4085333708122372256">"čtení zpráv SMS a MMS"</string>