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

Commit 577ff6d7 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10130956 from 075723ad to udc-qpr1-release

Change-Id: Iafe344ef0251e15ec8701a03ae590dc7482f5557
parents ecb4e73f 075723ad
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -81,8 +81,6 @@ java_library_host {
    name: "platformprotos",
    srcs: [
        ":ipconnectivity-proto-src",
        ":libstats_atom_enum_protos",
        ":libstats_atom_message_protos",
        ":libstats_internal_protos",
        ":statsd_internal_protos",
        "cmds/am/proto/instrumentation_data.proto",
+0 −2
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@
java_library_host {
    name: "platformtestprotos",
    srcs: [
        ":libstats_atom_enum_protos",
        ":libstats_atom_message_protos",
        ":libstats_internal_protos",
        ":statsd_internal_protos",
    ],
+17 −1
Original line number Diff line number Diff line
@@ -3882,7 +3882,9 @@ public class Activity extends ContextThemeWrapper
     * it will set up the dispatch to call {@link #onKeyUp} where the action
     * will be performed; for earlier applications, it will perform the
     * action immediately in on-down, as those versions of the platform
     * behaved.
     * behaved. This implementation will also take care of {@link KeyEvent#KEYCODE_ESCAPE}
     * by finishing the activity if it would be closed by touching outside
     * of it.
     *
     * <p>Other additional default key handling may be performed
     * if configured with {@link #setDefaultKeyMode}.
@@ -3904,6 +3906,11 @@ public class Activity extends ContextThemeWrapper
            return true;
        }

        if (keyCode == KeyEvent.KEYCODE_ESCAPE && mWindow.shouldCloseOnTouchOutside()) {
            event.startTracking();
            return true;
        }

        if (mDefaultKeyMode == DEFAULT_KEYS_DISABLE) {
            return false;
        } else if (mDefaultKeyMode == DEFAULT_KEYS_SHORTCUT) {
@@ -3999,6 +4006,15 @@ public class Activity extends ContextThemeWrapper
                return true;
            }
        }

        if (keyCode == KeyEvent.KEYCODE_ESCAPE
                && mWindow.shouldCloseOnTouchOutside()
                && event.isTracking()
                && !event.isCanceled()) {
            finish();
            return true;
        }

        return false;
    }

+3 −3
Original line number Diff line number Diff line
@@ -147,13 +147,13 @@ interface IActivityManager {
    int checkPermission(in String permission, int pid, int uid);

    /** Logs start of an API call to associate with an FGS, used for FGS Type Metrics */
    void logFgsApiBegin(int apiType, int appUid, int appPid);
    oneway void logFgsApiBegin(int apiType, int appUid, int appPid);

    /** Logs stop of an API call to associate with an FGS, used for FGS Type Metrics */
    void logFgsApiEnd(int apiType, int appUid, int appPid);
    oneway void logFgsApiEnd(int apiType, int appUid, int appPid);

    /** Logs API state change to associate with an FGS, used for FGS Type Metrics */
    void logFgsApiStateChanged(int apiType, int state, int appUid, int appPid);
    oneway void logFgsApiStateChanged(int apiType, int state, int appUid, int appPid);
    // =============== End of transactions used on native side as well ============================

    // Special low-level communication with activity manager.
+265 −0

File changed.

Preview size limit exceeded, changes collapsed.

Loading