Skip to content

Upstream sync 2026-08-30 — manual merge needed #11

Description

@github-actions

An automatic merge of upstream/master conflicts with this fork's master.

New upstream commits since last merge

489953341 BufferingDetector: fix negative durations
101b7599f upd MediaServiceCore
18ccff9f5 bump 32.34
d742d755e player error fixer: fix hang at start when using custom DNS; upd SharedModules
ee7e1282a upd MediaServiceCore

Latest upstream tag: notification2

Conflicting paths

SharedModules

Next steps

Follow docs/upstream-merge.md for manual resolution. The 3 integration points from the rebase runbook (stmobile flavor block in smarttubetv/build.gradle and common/build.gradle, plus the protected setupViewManager widening in MainApplication) are the most likely conflict surfaces.

Generated by .github/workflows/upstream-sync.yml

Activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    conflictRequires manual conflict resolutionupstream-syncAutomated upstream synchronization

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions