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

Commit e49cf107 authored by Ed Heyl's avatar Ed Heyl
Browse files

merge ics-mr0 

Change-Id: I4f0b2bb1b1136c9467e9d55f57f5333153cae65d
parents 1bfe6e95 a6d2e6b9

core/java/android/accounts/AccountManagerService.java

+19 −5
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ public class AccountManagerService 
            if (response != null) {

                try {

                    if (result == null) {

                        onError(AccountManager.ERROR_CODE_INVALID_RESPONSE, "null bundle");

                        response.onError(AccountManager.ERROR_CODE_INVALID_RESPONSE, "null bundle");

                        return;

                    }

                    if (Log.isLoggable(TAG, Log.VERBOSE)) {
@@ -1541,8 +1541,15 @@ public class AccountManagerService 
            mAuthenticator = null;

            IAccountManagerResponse response = getResponseAndClose();

            if (response != null) {

                onError(AccountManager.ERROR_CODE_REMOTE_EXCEPTION,

                try {

                    response.onError(AccountManager.ERROR_CODE_REMOTE_EXCEPTION,

                            "disconnected");

                } catch (RemoteException e) {

                    if (Log.isLoggable(TAG, Log.VERBOSE)) {

                        Log.v(TAG, "Session.onServiceDisconnected: "

                                + "caught RemoteException while responding", e);

                    }

                }

            }

        }
@@ -1551,8 +1558,15 @@ public class AccountManagerService 
        public void onTimedOut() {

            IAccountManagerResponse response = getResponseAndClose();

            if (response != null) {

                onError(AccountManager.ERROR_CODE_REMOTE_EXCEPTION,

                try {

                    response.onError(AccountManager.ERROR_CODE_REMOTE_EXCEPTION,

                            "timeout");

                } catch (RemoteException e) {

                    if (Log.isLoggable(TAG, Log.VERBOSE)) {

                        Log.v(TAG, "Session.onTimedOut: caught RemoteException while responding",

                                e);

                    }

                }

            }

        }

core/java/com/android/internal/policy/IFaceLockCallback.aidl

+1 −0
Original line number Diff line number Diff line
@@ -22,5 +22,6 @@ oneway interface IFaceLockCallback { 
    void unlock();

    void cancel();

    void reportFailedAttempt();

    void exposeFallback();

    void pokeWakelock();

}

core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ 
                android:textAppearance="?android:attr/textAppearanceMedium"

                android:background="@drawable/lockscreen_password_field_dark"

                android:textColor="#ffffffff"

                android:privateImeOptions="com.google.android.inputmethod.latin.forceAscii"

                />



            <!-- Numeric keyboard -->

core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
            android:textAppearance="?android:attr/textAppearanceMedium"

            android:background="@drawable/lockscreen_password_field_dark"

            android:textColor="#ffffffff"

            android:privateImeOptions="com.google.android.inputmethod.latin.forceAscii"

            />



        <View

core/res/res/layout/keyguard_screen_password_landscape.xml

+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ 
            android:background="@null"

            android:textColor="?android:attr/textColorPrimary"

            android:imeOptions="flagNoFullscreen|actionDone"

            android:privateImeOptions="com.google.android.inputmethod.latin.forceAscii"

            />



        <!-- This delete button is only visible for numeric PIN entry -->