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

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

Snap for 4388906 from 43aca9cd to oc-mr1-release 

Change-Id: I2859436803d5e9f87ec3d686776836fd5171d3bb
parents 216e314d 43aca9cd

core/java/android/app/Activity.java

+2 −2
Original line number Diff line number Diff line
@@ -542,9 +542,9 @@ import java.util.List; 
 * <ul>

 *     <li> <p>When creating a new document, the backing database entry or file for

 *             it is created immediately.  For example, if the user chooses to write

 *             a new e-mail, a new entry for that e-mail is created as soon as they

 *             a new email, a new entry for that email is created as soon as they

 *             start entering data, so that if they go to any other activity after

 *             that point this e-mail will now appear in the list of drafts.</p>

 *             that point this email will now appear in the list of drafts.</p>

 *     <li> <p>When an activity's <code>onPause()</code> method is called, it should

 *             commit to the backing content provider or file any changes the user

 *             has made.  This ensures that those changes will be seen by any other

core/java/android/content/res/ResourcesImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -796,7 +796,7 @@ public class ResourcesImpl { 
                dr = Drawable.createFromResourceStream(wrapper, value, is, file, null);

                is.close();

            }

        } catch (Exception e) {

        } catch (Exception | StackOverflowError e) {

            Trace.traceEnd(Trace.TRACE_TAG_RESOURCES);

            final NotFoundException rnf = new NotFoundException(

                    "File " + file + " from drawable resource ID #0x" + Integer.toHexString(id));

packages/SystemUI/src/com/android/keyguard/KeyguardSimPinView.java

+5 −1
Original line number Diff line number Diff line
@@ -66,7 +66,11 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView { 
                // again when the PUK locked SIM is re-entered.

                case ABSENT: {

                    KeyguardUpdateMonitor.getInstance(getContext()).reportSimUnlocked(mSubId);

                    // onSimStateChanged callback can fire when the SIM PIN lock is not currently

                    // active and mCallback is null.

                    if (mCallback != null) {

                        mCallback.dismiss(true, KeyguardUpdateMonitor.getCurrentUser());

                    }

                    break;

                }

                default:

packages/SystemUI/src/com/android/keyguard/KeyguardSimPukView.java

+5 −1
Original line number Diff line number Diff line
@@ -72,7 +72,11 @@ public class KeyguardSimPukView extends KeyguardPinBasedInputView { 
                // move into the READY state and the PUK lock keyguard should be removed.

                case READY: {

                    KeyguardUpdateMonitor.getInstance(getContext()).reportSimUnlocked(mSubId);

                    // mCallback can be null if onSimStateChanged callback is called when keyguard

                    // isn't active.

                    if (mCallback != null) {

                        mCallback.dismiss(true, KeyguardUpdateMonitor.getCurrentUser());

                    }

                    break;

                }

                default:

packages/SystemUI/src/com/android/systemui/doze/DozeUi.java

+0 −3
Original line number Diff line number Diff line
@@ -84,9 +84,6 @@ public class DozeUi implements DozeMachine.Part { 
            case DOZE_REQUEST_PULSE:

                pulseWhileDozing(mMachine.getPulseReason());

                break;

            case DOZE_PULSE_DONE:

                mHost.abortPulsing();

                break;

            case INITIALIZED:

                mHost.startDozing();

                break;