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

Commit e36dedd6 authored by Maryam Dehaini's avatar Maryam Dehaini Committed by Android (Google) Code Review
Browse files

Merge "Introduce proto to test Activity#requestOpenInBrowserEducation API" into main

parents 01f247a7 72a6fccb

core/proto/android/server/windowmanagerservice.proto

+1 −0
Original line number Diff line number Diff line
@@ -399,6 +399,7 @@ message ActivityRecordProto { 
    optional bool should_override_force_resize_app = 44;

    optional bool should_enable_user_aspect_ratio_settings = 45;

    optional bool is_user_fullscreen_override_enabled = 46;

    optional int64 request_open_in_browser_education_timestamp = 47;

}



/* represents WindowToken */

services/core/java/com/android/server/wm/ActivityRecord.java

+3 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ import static com.android.server.wm.ActivityRecordProto.PROC_ID; 
import static com.android.server.wm.ActivityRecordProto.PROVIDES_MAX_BOUNDS;

import static com.android.server.wm.ActivityRecordProto.REPORTED_DRAWN;

import static com.android.server.wm.ActivityRecordProto.REPORTED_VISIBLE;

import static com.android.server.wm.ActivityRecordProto.REQUEST_OPEN_IN_BROWSER_EDUCATION_TIMESTAMP;

import static com.android.server.wm.ActivityRecordProto.SHOULD_ENABLE_USER_ASPECT_RATIO_SETTINGS;

import static com.android.server.wm.ActivityRecordProto.SHOULD_FORCE_ROTATE_FOR_CAMERA_COMPAT;

import static com.android.server.wm.ActivityRecordProto.SHOULD_IGNORE_ORIENTATION_REQUEST_LOOP;
@@ -9961,6 +9962,8 @@ final class ActivityRecord extends WindowToken { 
                aspectRatioOverrides.shouldEnableUserAspectRatioSettings());

        proto.write(IS_USER_FULLSCREEN_OVERRIDE_ENABLED,

                aspectRatioOverrides.isUserFullscreenOverrideEnabled());

        proto.write(REQUEST_OPEN_IN_BROWSER_EDUCATION_TIMESTAMP,

                mRequestOpenInBrowserEducationTimestamp);

    }



    @Override