Commit 5afdcbdb authored by Peter Wen's avatar Peter Wen Committed by Commit Bot

Revert "Android: Use new play core API for activity"

This reverts commit f9be5898.

Reason for revert: Crash on startup for bundle targets, see https://crbug.com/996886

Original change's description:
> Android: Use new play core API for activity
> 
> Add myself to OWNERS for //third_party/google_android_play_core.
> 
> Built locally @264816199 and uploaded to CIPD. Updated ModuleInstaller
> to use the new SplitCompat API. Add new play core activity to expected
> manifest file.
> 
> Bug: 996212
> Change-Id: I0aba37897048cc554330eb933b2687d37e9343e0
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1764804
> Commit-Queue: Peter Wen <wnwen@chromium.org>
> Auto-Submit: Peter Wen <wnwen@chromium.org>
> Reviewed-by: Tibor Goldschwendt <tiborg@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#689477}

TBR=wnwen@chromium.org,tiborg@chromium.org,fredmello@chromium.org

Change-Id: I633f9f1b3652fc4a28c6042144a9075166cff228
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 996212
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1766428Reviewed-by: default avatarPeter Wen <wnwen@chromium.org>
Commit-Queue: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#689655}
parent b6341f36
...@@ -1442,7 +1442,7 @@ deps = { ...@@ -1442,7 +1442,7 @@ deps = {
'packages': [ 'packages': [
{ {
'package': 'chromium/third_party/android_deps/libs/com_google_android_play_core_verification', 'package': 'chromium/third_party/android_deps/libs/com_google_android_play_core_verification',
'version': 'ChOHiHFQ3o_P5MM8cwwTLbhrmwIqP2enCn2f6a-3M54C', 'version': '4hAx_nDBLvvQHfRMqLEB4ot_jERn_Wpuwxuap5Ii4PsC',
}, },
], ],
'condition': 'checkout_android', 'condition': 'checkout_android',
......
...@@ -887,13 +887,6 @@ ...@@ -887,13 +887,6 @@
android:name="com.google.android.play.core.missingsplits.PlayCoreMissingSplitsActivity" android:name="com.google.android.play.core.missingsplits.PlayCoreMissingSplitsActivity"
android:process=":playcore_missing_splits_activity" android:process=":playcore_missing_splits_activity"
android:stateNotNeeded="true"/> android:stateNotNeeded="true"/>
<activity
android:enabled="false"
android:exported="false"
android:name="com.google.android.play.core.common.PlayCoreDialogWrapperActivity"
android:process=":playcore_dialog_wrapper_activity"
android:stateNotNeeded="true"
android:theme="@style/Theme.PlayCore.Transparent"/>
<activity <activity
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:exported="false" android:exported="false"
......
...@@ -68,7 +68,7 @@ import java.util.TreeSet; ...@@ -68,7 +68,7 @@ import java.util.TreeSet;
// SplitCompat#install should always be run for the application first before it is run for // SplitCompat#install should always be run for the application first before it is run for
// any activities. // any activities.
init(); init();
SplitCompat.installActivity(activity); SplitCompat.install(activity);
} }
@Override @Override
......
agrieve@chromium.org agrieve@chromium.org
tiborg@chromium.org tiborg@chromium.org
wnwen@chromium.org
# COMPONENT: Mobile>FeatureModules # COMPONENT: Mobile>FeatureModules
# TEAM: chromium-reviews@chromium.org # TEAM: chromium-reviews@chromium.org
...@@ -7,7 +7,7 @@ License File: LICENSE ...@@ -7,7 +7,7 @@ License File: LICENSE
Security Critical: yes Security Critical: yes
Description: Description:
- Built from @264816199
Local Modifications: Local Modifications:
- Unproguarded verification API. - Unproguarded verification API.
......
...@@ -8,6 +8,6 @@ has_native_libraries = false ...@@ -8,6 +8,6 @@ has_native_libraries = false
has_proguard_flags = false has_proguard_flags = false
has_r_text_file = false has_r_text_file = false
is_manifest_empty = false is_manifest_empty = false
resources = [ "res/values/styles.xml" ] resources = [ ]
subjar_tuples = [ ] subjar_tuples = [ ]
subjars = [ ] subjars = [ ]
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment