Skip to content

Commit

Permalink
Revert tracking limit inside codeless and suggested events
Browse files Browse the repository at this point in the history
Summary: Revert D22421953 (facebook@6dd47c6) and D22422973 (facebook@2b1ef46) . Will not ship with sdk v8

Reviewed By: YOUDAN, dreamolight

Differential Revision: D23945227

fbshipit-source-id: c2b3d213a45658f938d2753674927fd334dcacc4
  • Loading branch information
Cecily Jiang authored and facebook-github-bot committed Sep 26, 2020
1 parent 1a9090b commit 3555042
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 28 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.os.SystemClock;
import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
Expand All @@ -38,7 +37,6 @@
import androidx.annotation.UiThread;
import com.facebook.FacebookException;
import com.facebook.FacebookSdk;
import com.facebook.appevents.PerformanceGuardian;
import com.facebook.appevents.codeless.internal.Constants;
import com.facebook.appevents.codeless.internal.EventBinding;
import com.facebook.appevents.codeless.internal.ParameterComponent;
Expand Down Expand Up @@ -186,13 +184,9 @@ public void run() {

private void matchViews() {
for (Activity activity : this.activitiesSet) {
if (activity == null) {
continue;
}
final String activityName = activity.getClass().getSimpleName();
if (!PerformanceGuardian.isBannedActivity(
activityName, PerformanceGuardian.UseCase.CODELESS)) {
if (null != activity) {
final View rootView = AppEventUtility.getRootView(activity);
final String activityName = activity.getClass().getSimpleName();
ViewMatcher matcher = new ViewMatcher(rootView, uiThreadHandler, listenerSet, activityName);
this.viewMatchers.add(matcher);
}
Expand Down Expand Up @@ -259,13 +253,7 @@ public void run() {
observer.addOnGlobalLayoutListener(this);
observer.addOnScrollChangedListener(this);
}
long startTimeStamp = SystemClock.elapsedRealtime();
startMatch();
PerformanceGuardian.limitProcessTime(
activityName,
PerformanceGuardian.UseCase.CODELESS,
startTimeStamp,
SystemClock.elapsedRealtime());
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,8 @@
import android.os.Build;
import android.os.Handler;
import android.os.Looper;
import android.os.SystemClock;
import android.view.View;
import android.view.ViewTreeObserver;
import com.facebook.appevents.PerformanceGuardian;
import com.facebook.appevents.codeless.internal.SensitiveUserDataUtils;
import com.facebook.appevents.internal.AppEventUtility;
import com.facebook.internal.instrument.crashshield.AutoHandleExceptions;
Expand All @@ -49,10 +47,6 @@ final class ViewObserver implements ViewTreeObserver.OnGlobalLayoutListener {
private static final int MAX_TEXT_LENGTH = 300;

static void startTrackingActivity(final Activity activity) {
if (PerformanceGuardian.isBannedActivity(
activity.getClass().getSimpleName(), PerformanceGuardian.UseCase.SUGGESTED_EVENT)) {
return;
}
int key = activity.hashCode();
if (!observers.containsKey(key)) {
ViewObserver observer = new ViewObserver(activity);
Expand Down Expand Up @@ -87,16 +81,8 @@ private void startTracking() {
ViewTreeObserver observer = rootView.getViewTreeObserver();
if (observer.isAlive()) {
observer.addOnGlobalLayoutListener(this);
long startTimeStamp = SystemClock.elapsedRealtime();
process();
Activity activity = activityWeakReference.get();
if (activity != null) {
PerformanceGuardian.limitProcessTime(
activity.getClass().getSimpleName(),
PerformanceGuardian.UseCase.SUGGESTED_EVENT,
startTimeStamp,
SystemClock.elapsedRealtime());
}
}
}

Expand Down

0 comments on commit 3555042

Please sign in to comment.