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

Commit 03ea3114 authored by Jessica Wagantall's avatar Jessica Wagantall
Browse files

Merge tag 'android-6.0.1_r46' into HEAD 

Android 6.0.1 release 46

# gpg: Signature made Mon 06 Jun 2016 10:38:22 AM PDT using DSA key ID 9AB10E78
# gpg: Can't check signature: public key not found
parents 423a82e0 9878bb99

core/java/android/view/MotionEvent.java

+15 −0
Original line number Diff line number Diff line
@@ -416,6 +416,21 @@ public final class MotionEvent extends InputEvent implements Parcelable { 
     */

    public static final int FLAG_WINDOW_IS_OBSCURED = 0x1;



    /**

     * This flag indicates that the window that received this motion event is partly

     * or wholly obscured by another visible window above it.  This flag is set to true

     * even if the event did not directly pass through the obscured area.

     * A security sensitive application can check this flag to identify situations in which

     * a malicious application may have covered up part of its content for the purpose

     * of misleading the user or hijacking touches.  An appropriate response might be

     * to drop the suspect touches or to take additional precautions to confirm the user's

     * actual intent.

     *

     * Unlike FLAG_WINDOW_IS_OBSCURED, this is actually true.

     * @hide

     */

    public static final int FLAG_WINDOW_IS_PARTIALLY_OBSCURED = 0x2;



    /**

     * Private flag that indicates when the system has detected that this motion event

     * may be inconsistent with respect to the sequence of previously delivered motion events,

services/core/java/com/android/server/am/ActivityManagerService.java

+3 −3
Original line number Diff line number Diff line
@@ -3018,7 +3018,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
            if (!app.killed) {

                Slog.wtfStack(TAG, "Removing process that hasn't been killed: " + app);

                Process.killProcessQuiet(app.pid);

                killProcessGroup(app.info.uid, app.pid);

                killProcessGroup(app.uid, app.pid);

            }

            if (lrui <= mLruProcessActivityStart) {

                mLruProcessActivityStart--;
@@ -3393,7 +3393,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
            // clean it up now.

            if (DEBUG_PROCESSES || DEBUG_CLEANUP) Slog.v(TAG_PROCESSES, "App died: " + app);

            checkTime(startTime, "startProcess: bad proc running, killing");

            killProcessGroup(app.info.uid, app.pid);

            killProcessGroup(app.uid, app.pid);

            handleAppDiedLocked(app, true, true);

            checkTime(startTime, "startProcess: done killing old proc");

        }
@@ -4943,7 +4943,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
            if (!fromBinderDied) {

                Process.killProcessQuiet(pid);

            }

            killProcessGroup(app.info.uid, pid);

            killProcessGroup(app.uid, pid);

            app.killed = true;

        }

































services/core/java/com/android/server/am/ProcessRecord.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -578,7 +578,7 @@ final class ProcessRecord {













            }















            EventLog.writeEvent(EventLogTags.AM_KILL, userId, pid, processName, setAdj, reason);















            Process.killProcessQuiet(pid);













            Process.killProcessGroup(info.uid, pid);













            Process.killProcessGroup(uid, pid);















            if (!persistent) {















                killed = true;















                killedByAm = true;