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

Commit 15a45929 authored by ctso's avatar ctso
Browse files

Merge branch 'eclair' of git://github.com/cyanogen/android_frameworks_base into HEAD

parents 862401f3 6882974a

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

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ 
    <string name="global_action_silent_mode_off_status" msgid="1506046579177066419">"Audio attivo"</string>

    <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Modalità aereo"</string>

    <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Disattiva modalità aereo"</string>

    <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Disattiva modalità aereo"</string>

    <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Attiva modalità aereo"</string>

    <string name="global_action_reboot">Riavvia</string>

    <string name="safeMode" msgid="2788228061547930246">"Modalità provvisoria"</string>

    <string name="android_system_label" msgid="6577375335728551336">"Sistema Android"</string>

services/java/com/android/server/WindowManagerService.java

+4 −0
Original line number Diff line number Diff line
@@ -5672,6 +5672,10 @@ public class WindowManagerService extends IWindowManager.Stub 
                        //dump();

                        if (targetWin != null) {

                            at = targetWin.getAppToken();

                            if (at == null) {

                               removeWindowInnerLocked(targetWin.mSession, targetWin);

                               return null;

                            }

                        } else if (targetApp != null) {

                            at = targetApp.appToken;

                        }