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

Commit e8ffebf2 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge 3e656914 on remote branch"

parents af339a61 5bbd1ca5

core/java/android/app/ActivityManagerNative.java

+10 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import android.os.Parcelable; 
import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.StrictMode;

import android.os.SystemClock;

import android.text.TextUtils;

import android.util.Log;

import android.util.Singleton;
@@ -2070,6 +2071,13 @@ class ActivityManagerProxy implements IActivityManager 
            ParcelFileDescriptor profileFd, Bundle options) throws RemoteException {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();



        if (intent.getComponent() != null) {

            Log.i("ActivityManager", "Timeline: Activity_launch_request id:"

                    + intent.getComponent().getPackageName() + " time:"

                    + SystemClock.uptimeMillis());

        }



        data.writeInterfaceToken(IActivityManager.descriptor);

        data.writeStrongBinder(caller != null ? caller.asBinder() : null);

        data.writeString(callingPackage);
@@ -2419,6 +2427,8 @@ class ActivityManagerProxy implements IActivityManager 
    public void activityIdle(IBinder token, Configuration config, boolean stopProfiling)

            throws RemoteException

    {

        Log.i("ActivityManager", "Timeline: Activity_idle id: " + token + " time:"

                + SystemClock.uptimeMillis());

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);

core/res/res/values-zh-rCN/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -861,6 +861,7 @@ 
    <string name="lockscreen_sim_puk_locked_instructions" msgid="8127916255245181063">"请参阅《用户指南》或与客服人员联系。"</string>

    <string name="lockscreen_sim_locked_message" msgid="8066660129206001039">"SIM 卡被锁定"</string>

    <string name="lockscreen_sim_unlock_progress_dialog_message" msgid="595323214052881264">"正在解锁 SIM 卡..."</string>

    <string name="lockscreen_airplane_mode_on">"飞行模式"</string>

    <string name="lockscreen_too_many_failed_attempts_dialog_message" msgid="6481623830344107222">"您已经 <xliff:g id="NUMBER_0">%d</xliff:g> 次错误地绘制了解锁图案。\n\n请在 <xliff:g id="NUMBER_1">%d</xliff:g> 秒后重试。"</string>

    <string name="lockscreen_too_many_failed_password_attempts_dialog_message" msgid="2725973286239344555">"您已经 <xliff:g id="NUMBER_0">%d</xliff:g> 次错误地输入了密码。\n\n请在 <xliff:g id="NUMBER_1">%d</xliff:g> 秒后重试。"</string>

    <string name="lockscreen_too_many_failed_pin_attempts_dialog_message" msgid="6216672706545696955">"您已经 <xliff:g id="NUMBER_0">%d</xliff:g> 次错误地输入了 PIN。\n\n请在 <xliff:g id="NUMBER_1">%d</xliff:g> 秒后重试。"</string>

services/java/com/android/server/am/ActivityRecord.java

+2 −0
Original line number Diff line number Diff line
@@ -929,6 +929,8 @@ final class ActivityRecord { 
                service.scheduleAppGcsLocked();

            }

        }

        Log.i(ActivityManagerService.TAG, "Timeline: Activity_windows_visible id: "

                + this + " time:" + SystemClock.uptimeMillis());

    }



    public void windowsGone() {