Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry pick PR #3818: remove android_user_authorizer #3832

Merged
merged 3 commits into from
Jul 15, 2024

Conversation

cobalt-github-releaser-bot
Copy link
Collaborator

Refer to the original PR: #3818

It was used by h5vcc_account_manager.idl

b/352168728

It was used by h5vcc_account_manager.idl

b/352168728

Co-authored-by: Colin Liang <colinliang@google.com>
(cherry picked from commit 353d095)
@cobalt-github-releaser-bot
Copy link
Collaborator Author

Important

There were merge conflicts while cherry picking! Check out cherry-pick-24.lts.1+-3818 and fix the conflicts before proceeding. Check the log at https://github.com/youtube/cobalt/actions/runs/9943168704 for details.

add back import android.content.Intent; because MediaPlaybackService is not removed in Cobalt 24.
@zhongqiliang zhongqiliang marked this pull request as ready for review July 15, 2024 16:41
Copy link
Contributor

@zhongqiliang zhongqiliang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Fix merge conflict, removed enable_account_manager = true
@zhongqiliang zhongqiliang enabled auto-merge (squash) July 15, 2024 17:18
@zhongqiliang zhongqiliang enabled auto-merge (squash) July 15, 2024 17:21
@zhongqiliang zhongqiliang merged commit daea1ae into 24.lts.1+ Jul 15, 2024
323 checks passed
@zhongqiliang zhongqiliang deleted the cherry-pick-24.lts.1+-3818 branch July 15, 2024 17:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants