From 55337a831aaa9920ed52d3bc41b80c40591222f8 Mon Sep 17 00:00:00 2001 From: Sudheer Shanka Date: Wed, 19 Apr 2017 20:32:14 +0000 Subject: Revert "Add new api Activity.getStartInitiatedTime." This reverts commit bc308988bdcb76d67c80e85183bcfa8128f73890. Change-Id: Ieaca7c9ec8b4affbb8ce98ebbcb663a531904bf8 --- api/current.txt | 1 - api/system-current.txt | 1 - api/test-current.txt | 1 - core/java/android/app/Activity.java | 20 -------------------- core/java/android/app/IActivityManager.aidl | 2 -- .../android/server/am/ActivityManagerService.java | 9 --------- .../java/com/android/server/am/ActivityRecord.java | 8 -------- .../java/com/android/server/am/ActivityStarter.java | 6 ------ 8 files changed, 48 deletions(-) diff --git a/api/current.txt b/api/current.txt index a2588f50b2f9..41e17b7d21d0 100644 --- a/api/current.txt +++ b/api/current.txt @@ -3611,7 +3611,6 @@ package android.app { method public android.net.Uri getReferrer(); method public int getRequestedOrientation(); method public final android.view.SearchEvent getSearchEvent(); - method public long getStartInitiatedTime(); method public int getTaskId(); method public final java.lang.CharSequence getTitle(); method public final int getTitleColor(); diff --git a/api/system-current.txt b/api/system-current.txt index a6a4ab850bfc..489567ec69aa 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -3737,7 +3737,6 @@ package android.app { method public android.net.Uri getReferrer(); method public int getRequestedOrientation(); method public final android.view.SearchEvent getSearchEvent(); - method public long getStartInitiatedTime(); method public int getTaskId(); method public final java.lang.CharSequence getTitle(); method public final int getTitleColor(); diff --git a/api/test-current.txt b/api/test-current.txt index 86592586f9f6..27b266ded7a7 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -3613,7 +3613,6 @@ package android.app { method public android.net.Uri getReferrer(); method public int getRequestedOrientation(); method public final android.view.SearchEvent getSearchEvent(); - method public long getStartInitiatedTime(); method public int getTaskId(); method public final java.lang.CharSequence getTitle(); method public final int getTitleColor(); diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 6019d95ffc7e..06291abb69d4 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -18,7 +18,6 @@ package android.app; import android.metrics.LogMaker; import android.graphics.Rect; -import android.os.SystemClock; import android.view.ViewRootImpl.ActivityConfigCallback; import android.view.autofill.AutofillId; import android.view.autofill.AutofillManager; @@ -7417,25 +7416,6 @@ public class Activity extends ContextThemeWrapper } } - /** - * Return the timestamp at which this activity start was last initiated by the system in the - * {@link SystemClock#uptimeMillis()} time base. - * - * This can be used to understand how much time is taken for an activity to be started and - * displayed to the user. - * - * @return timestamp at which this activity start was initiated by the system - * or {@code 0} if for any reason the timestamp could not be retrieved. - */ - public long getStartInitiatedTime() { - try { - return ActivityManager.getService().getActivityStartInitiatedTime(mToken); - } catch (RemoteException e) { - Log.e(TAG, "Failed to call getActivityStartTime", e); - return 0; - } - } - class HostCallbacks extends FragmentHostCallback { public HostCallbacks() { super(Activity.this /*activity*/); diff --git a/core/java/android/app/IActivityManager.aidl b/core/java/android/app/IActivityManager.aidl index b98cd8565d13..079bbcdd4951 100644 --- a/core/java/android/app/IActivityManager.aidl +++ b/core/java/android/app/IActivityManager.aidl @@ -640,8 +640,6 @@ interface IActivityManager { */ void backgroundWhitelistUid(int uid); - long getActivityStartInitiatedTime(IBinder token); - // WARNING: when these transactions are updated, check if they are any callers on the native // side. If so, make sure they are using the correct transaction ids and arguments. // If a transaction which will also be used on the native side is being inserted, add it diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 05001d529e73..35654d76dee5 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -23809,15 +23809,6 @@ public class ActivityManagerService extends IActivityManager.Stub } } - @Override - public long getActivityStartInitiatedTime(IBinder token) { - final ActivityRecord r = ActivityRecord.forTokenLocked(token); - if (r != null) { - return r.mStartInitiatedTimeMs; - } - return 0; - } - void updateApplicationInfoLocked(@NonNull List packagesToUpdate, int userId) { final PackageManagerInternal packageManager = getPackageManagerInternalLocked(); final boolean updateFrameworkRes = packagesToUpdate.contains("android"); diff --git a/services/core/java/com/android/server/am/ActivityRecord.java b/services/core/java/com/android/server/am/ActivityRecord.java index f621bc4fa6d2..cfbd2b5e28be 100644 --- a/services/core/java/com/android/server/am/ActivityRecord.java +++ b/services/core/java/com/android/server/am/ActivityRecord.java @@ -340,12 +340,6 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo // handle calculating override configuration from the bounds. private final Rect mBounds = new Rect(); - /** - * Denotes the timestamp at which this activity start was last initiated in the - * {@link SystemClock#uptimeMillis()} time base. - */ - long mStartInitiatedTimeMs; - /** * Temp configs used in {@link #ensureActivityConfigurationLocked(int, boolean)} */ @@ -504,8 +498,6 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo pw.print(" forceNewConfig="); pw.println(forceNewConfig); pw.print(prefix); pw.print("mActivityType="); pw.println(activityTypeToString(mActivityType)); - pw.print(prefix); pw.print("mStartInitiatedTimeMs="); - TimeUtils.formatDuration(mStartInitiatedTimeMs, now, pw); if (requestedVrComponent != null) { pw.print(prefix); pw.print("requestedVrComponent="); diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java index 8f1c20330e53..56594d3fdf48 100644 --- a/services/core/java/com/android/server/am/ActivityStarter.java +++ b/services/core/java/com/android/server/am/ActivityStarter.java @@ -244,7 +244,6 @@ class ActivityStarter { ActivityOptions options, boolean ignoreTargetSecurity, boolean componentSpecified, ActivityRecord[] outActivity, ActivityStackSupervisor.ActivityContainer container, TaskRecord inTask) { - final long activityStartTime = SystemClock.uptimeMillis(); int err = ActivityManager.START_SUCCESS; ProcessRecord callerApp = null; @@ -479,7 +478,6 @@ class ActivityStarter { callingPackage, intent, resolvedType, aInfo, mService.getGlobalConfiguration(), resultRecord, resultWho, requestCode, componentSpecified, voiceSession != null, mSupervisor, container, options, sourceRecord); - r.mStartInitiatedTimeMs = activityStartTime; if (outActivity != null) { outActivity[0] = r; } @@ -1031,7 +1029,6 @@ class ActivityStarter { // so make sure the task now has the identity of the new intent. top.getTask().setIntent(mStartActivity); } - top.mStartInitiatedTimeMs = mStartActivity.mStartInitiatedTimeMs; ActivityStack.logStartActivity(AM_NEW_INTENT, mStartActivity, top.getTask()); top.deliverNewIntentLocked(mCallingUid, mStartActivity.intent, mStartActivity.launchedFromPackage); @@ -1055,7 +1052,6 @@ class ActivityStarter { setTaskFromIntentActivity(reusedActivity); if (!mAddingToTask && mReuseTask == null) { - reusedActivity.mStartInitiatedTimeMs = mStartActivity.mStartInitiatedTimeMs; // We didn't do anything... but it was needed (a.k.a., client don't use that // intent!) And for paranoia, make sure we have correctly resumed the top activity. resumeTargetStackIfNeeded(); @@ -1088,7 +1084,6 @@ class ActivityStarter { || mLaunchSingleTop || mLaunchSingleTask); if (dontStart) { ActivityStack.logStartActivity(AM_NEW_INTENT, top, top.getTask()); - top.mStartInitiatedTimeMs = mStartActivity.mStartInitiatedTimeMs; // For paranoia, make sure we have correctly resumed the top activity. topStack.mLastPausedActivity = null; if (mDoResume) { @@ -1669,7 +1664,6 @@ class ActivityStarter { // desires. if (((mLaunchFlags & FLAG_ACTIVITY_SINGLE_TOP) != 0 || mLaunchSingleTop) && intentActivity.realActivity.equals(mStartActivity.realActivity)) { - intentActivity.mStartInitiatedTimeMs = mStartActivity.mStartInitiatedTimeMs; ActivityStack.logStartActivity(AM_NEW_INTENT, mStartActivity, intentActivity.getTask()); if (intentActivity.frontOfTask) { -- cgit v1.2.3-59-g8ed1b