Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Added trace points for ContentCapture."

Browse Source
This commit is contained in:
TreeHugger Robot
2019-01-22 23:05:27 +00:00
committed by Android (Google) Code Review
parent afad518955 b337e1c5dd
commit 9a8406418d
2 changed files with 66 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
core/java/android/app/Activity.java
View File

@@ -74,6 +74,7 @@ import android.os.RemoteException;
import android.os.ServiceManager.ServiceNotFoundException;
import android.os.StrictMode;
import android.os.SystemProperties;
import android.os.Trace;
import android.os.UserHandle;
import android.text.Selection;
import android.text.SpannableStringBuilder;
@@ -1049,33 +1050,56 @@ public class Activity extends ContextThemeWrapper
@Retention(RetentionPolicy.SOURCE)
@interface ContentCaptureNotificationType{}
private void notifyContentCaptureManagerIfNeeded(@ContentCaptureNotificationType int type) {
final ContentCaptureManager cm = getContentCaptureManager();
if (cm == null) return;
private String getContentCaptureTypeAsString(@ContentCaptureNotificationType int type) {
switch (type) {
case CONTENT_CAPTURE_START:
//TODO(b/111276913): decide whether the InteractionSessionId should be
// saved / restored in the activity bundle - probably not
int flags = 0;
if ((getWindow().getAttributes().flags
& WindowManager.LayoutParams.FLAG_SECURE) != 0) {
flags |= ContentCaptureContext.FLAG_DISABLED_BY_FLAG_SECURE;
}
cm.onActivityStarted(mToken, getComponentName(), flags);
break;
return "START";
case CONTENT_CAPTURE_PAUSE:
cm.flush(ContentCaptureSession.FLUSH_REASON_ACTIVITY_PAUSED);
break;
return "PAUSE";
case CONTENT_CAPTURE_RESUME:
cm.flush(ContentCaptureSession.FLUSH_REASON_ACTIVITY_RESUMED);
break;
return "RESUME";
case CONTENT_CAPTURE_STOP:
cm.onActivityStopped();
break;
return "STOP";
default:
Log.wtf(TAG, "Invalid @ContentCaptureNotificationType: " + type);
return "UNKNOW-" + type;
}
}
private void notifyContentCaptureManagerIfNeeded(@ContentCaptureNotificationType int type) {
if (Trace.isTagEnabled(Trace.TRACE_TAG_ACTIVITY_MANAGER)) {
Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER,
"notifyContentCapture(" + getContentCaptureTypeAsString(type) + ") for "
+ mComponent.toShortString());
}
try {
final ContentCaptureManager cm = getContentCaptureManager();
if (cm == null) return;
switch (type) {
case CONTENT_CAPTURE_START:
//TODO(b/111276913): decide whether the InteractionSessionId should be
// saved / restored in the activity bundle - probably not
int flags = 0;
if ((getWindow().getAttributes().flags
& WindowManager.LayoutParams.FLAG_SECURE) != 0) {
flags |= ContentCaptureContext.FLAG_DISABLED_BY_FLAG_SECURE;
}
cm.onActivityStarted(mToken, getComponentName(), flags);
break;
case CONTENT_CAPTURE_PAUSE:
cm.flush(ContentCaptureSession.FLUSH_REASON_ACTIVITY_PAUSED);
break;
case CONTENT_CAPTURE_RESUME:
cm.flush(ContentCaptureSession.FLUSH_REASON_ACTIVITY_RESUMED);
break;
case CONTENT_CAPTURE_STOP:
cm.onActivityStopped();
break;
default:
Log.wtf(TAG, "Invalid @ContentCaptureNotificationType: " + type);
}
} finally {
Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
}
}

22
core/java/android/view/View.java
View File

@@ -8227,7 +8227,15 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* </ul>
*/
public void onProvideContentCaptureStructure(@NonNull ViewStructure structure, int flags) {
onProvideStructure(structure, VIEW_STRUCTURE_FOR_CONTENT_CAPTURE, flags);
if (Trace.isTagEnabled(Trace.TRACE_TAG_VIEW)) {
Trace.traceBegin(Trace.TRACE_TAG_VIEW,
"onProvideContentCaptureStructure() for " + getClass().getSimpleName());
}
try {
onProvideStructure(structure, VIEW_STRUCTURE_FOR_CONTENT_CAPTURE, flags);
} finally {
Trace.traceEnd(Trace.TRACE_TAG_VIEW);
}
}
/** @hide */
@@ -9017,6 +9025,18 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* </ol>
*/
private void notifyAppearedOrDisappearedForContentCaptureIfNeeded(boolean appeared) {
if (Trace.isTagEnabled(Trace.TRACE_TAG_VIEW)) {
Trace.traceBegin(Trace.TRACE_TAG_VIEW,
"notifyContentCapture(" + appeared + ") for " + getClass().getSimpleName());
}
try {
notifyAppearedOrDisappearedForContentCaptureIfNeededNoTrace(appeared);
} finally {
Trace.traceEnd(Trace.TRACE_TAG_VIEW);
}
}
private void notifyAppearedOrDisappearedForContentCaptureIfNeededNoTrace(boolean appeared) {
// First check if context has client, so it saves a service lookup when it doesn't
if (!mContext.isContentCaptureSupported()) return;