Commit ff42027c authored by Peter Wen's avatar Peter Wen Committed by Commit Bot

Android: Use new play core API for activity

Built locally @265454220 and uploaded to CIPD. Updated ModuleInstaller
to use the new SplitCompat API. Add new play core activity to expected
manifest file.

Changes from original CL: Includes fix from play core for NPE.

Reland of original CL: https://crrev.com/c/1764804

Tbr: Reland with no chrome changes
Bug: 996212
Change-Id: I9de3a3c54beea64fc526a9b380eef2bd608a26c7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1771737Reviewed-by: default avatarPeter Wen <wnwen@chromium.org>
Commit-Queue: Peter Wen <wnwen@chromium.org>
Auto-Submit: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#690429}
parent 555b9616
...@@ -1455,7 +1455,7 @@ deps = { ...@@ -1455,7 +1455,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': '4hAx_nDBLvvQHfRMqLEB4ot_jERn_Wpuwxuap5Ii4PsC', 'version': '0z_scbnHbcGHs7fem6R48_Cfgf7n-46yI7DEXkpkZcwC',
}, },
], ],
'condition': 'checkout_android', 'condition': 'checkout_android',
......
...@@ -887,6 +887,13 @@ ...@@ -887,6 +887,13 @@
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.install(activity); SplitCompat.installActivity(activity);
} }
@Override @Override
......
...@@ -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 = [ ] resources = [ "res/values/styles.xml" ]
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