Skip to content

revert Android14 fix #13

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.

Sign up for GitHub

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

Open
ShrutikaGirme wants to merge 26 commits into
base: rn_upgrade_68-jsi
Choose a base branch
from
Open

revert Android14 fix #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
ef0e164
revert Android 14 support
ShrutikaGirme May 9, 2024
a24fe91
Revert "Android 14 support"
ShrutikaGirme May 9, 2024
a818871
Revert "Android 14 support"
ShrutikaGirme May 9, 2024
dbb5af2
Android 14 support
ShrutikaGirme May 10, 2024
2953341
revert Android 14 support
ShrutikaGirme May 10, 2024
3a29ef8
compile 33
ShrutikaGirme May 10, 2024
bee5360
test log
ShrutikaGirme May 10, 2024
1219095
receiver exported
ShrutikaGirme May 10, 2024
5b91691
revert
ShrutikaGirme May 13, 2024
e255680
revert
ShrutikaGirme May 13, 2024
c750780
revert compilesdk
ShrutikaGirme May 13, 2024
26f2e1e
Remerging android 14 support
ShrutikaGirme May 14, 2024
a2557d4
Android 14 support
ShrutikaGirme May 10, 2024
770a12d
revert Android 14 support
ShrutikaGirme May 10, 2024
0f98f68
compile 33
ShrutikaGirme May 10, 2024
2c2fa38
test log
ShrutikaGirme May 10, 2024
240f354
receiver exported
ShrutikaGirme May 10, 2024
847a9c8
revert
ShrutikaGirme May 13, 2024
b79f070
revert
ShrutikaGirme May 13, 2024
6a98dc4
revert compilesdk
ShrutikaGirme May 13, 2024
bbcd26d
Remerging android 14 support
ShrutikaGirme May 14, 2024
04a689a
merge latest
ShrutikaGirme May 14, 2024
b044ca9
Merge remote-tracking branch 'origin/android14Fix' into android14Fix
ShrutikaGirme May 14, 2024
8c07537
remove log
ShrutikaGirme May 14, 2024
2824573
test log
ShrutikaGirme May 30, 2024
dde96eb
test comment
ShrutikaGirme May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import android.graphics.Color;
import android.graphics.Typeface;
import android.hardware.SensorManager;
import android.os.Build;
import android.util.Pair;
import android.view.Gravity;
import android.view.View;
Expand Down Expand Up @@ -63,7 +64,6 @@
import java.util.List;
import java.util.Locale;
import java.util.Map;
import android.os.Build;

public abstract class DevSupportManagerBase implements DevSupportManager {

Expand Down Expand Up @@ -1108,6 +1108,7 @@ private void reload() {
if (!mIsReceiverRegistered) {
IntentFilter filter = new IntentFilter();
filter.addAction(getReloadAppAction(mApplicationContext));
// Required for Android 14 migration issue
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
mApplicationContext.registerReceiver(mReloadAppBroadcastReceiver, filter, Context.RECEIVER_EXPORTED);
} else {
Expand Down
Binary file modified android/com/facebook/react/react-native/0.68.5/react-native-0.68.5-sources.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion android/com/facebook/react/react-native/0.68.5/react-native-0.68.5-sources.jar.md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
90adc2b3b939808eb04a093816177712
2c15d9cb0d833dbcf1f01e294b7871de
2 changes: 1 addition & 1 deletion android/com/facebook/react/react-native/0.68.5/react-native-0.68.5-sources.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
49e447969431f9264ed68b529deaf34cbd8ee7d2
1891306a2eb33f52fe6cf3ca867fe761b9450b62
2 changes: 1 addition & 1 deletion android/com/facebook/react/react-native/0.68.5/react-native-0.68.5-sources.jar.sha256
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
637c6c93193094b9ef23fb0da8e0f1822ef57b7b3eddeaad8925a4a1262ac746
2b9092f2f47d7a5933c102fa07f49048d5250b93bac06098b7e4596b52a46b41
2 changes: 1 addition & 1 deletion android/com/facebook/react/react-native/0.68.5/react-native-0.68.5-sources.jar.sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
31a7889bf4c477d1efa052a987a3951d63b3d7a686635b4b9e3128e46629c21df2207fbba06ca4db3db390c6484e7c9d093847337e260a8144992c14632bc483
f61575fcdbfc487b8b020ad7cb3676c8a5e9c64561d9ef6e44c2d43f8b0f73df7be5edbfdf1291f2e926aa02d81c6b8f04c2c9cfe78c2463419d24cf83f3ef2f
2 changes: 1 addition & 1 deletion android/com/facebook/react/react-native/maven-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
<versions>
<version>0.68.5</version>
</versions>
<lastUpdated>20240508125440</lastUpdated>
<lastUpdated>20240514072548</lastUpdated>
</versioning>
</metadata>
2 changes: 1 addition & 1 deletion android/com/facebook/react/react-native/maven-metadata.xml.md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3631f164f5b9a79e1d7295d48b9061ee
f966382d5bcfeb10fc9577103989be2d
2 changes: 1 addition & 1 deletion android/com/facebook/react/react-native/maven-metadata.xml.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6c20c7c6b62935effd235d7eb6ec7a75ea501ba0
7cdab65db6a64de8ac63a58ac79a70b0f9a3a902
2 changes: 1 addition & 1 deletion android/com/facebook/react/react-native/maven-metadata.xml.sha256
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
77439efc51944104eeef6f81f59cccac11cc4bdf5c05fea719d843ec5b4b941c
10902b1bab8675afb9bced89ed296f5ea5743c9dad69110401e8c445eaa85e31
2 changes: 1 addition & 1 deletion android/com/facebook/react/react-native/maven-metadata.xml.sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9ff2e1914b7546f7427db82c398bd5b799c5252c5fbb875235cbf902da31157893b486c960c337d083c8e33c143ef41cf8967a12e19c93e4105e3d1e41293b04
cd8bce2d30fa062903f6dffe4fd582fda1725a5842d5c024a8dae1ae76a64ea31407fa06b636c12f3765382bc6acae28fbda7fbff76b6539d3e1c45ef89a2574