v115 to be checked
This commit is contained in:
@@ -5,11 +5,11 @@ Subject: Remove SMS integration
|
||||
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
---
|
||||
.../browser/language/AppLocaleUtils.java | 42 -----------------
|
||||
.../content/browser/sms/SmsProviderGms.java | 27 ++---------
|
||||
.../content/browser/sms/SmsProviderGms.java | 25 +---------
|
||||
.../browser/sms/SmsUserConsentReceiver.java | 47 ++-----------------
|
||||
.../browser/sms/SmsVerificationReceiver.java | 43 ++++-------------
|
||||
.../content/browser/sms/Wrappers.java | 27 +----------
|
||||
5 files changed, 16 insertions(+), 170 deletions(-)
|
||||
5 files changed, 15 insertions(+), 169 deletions(-)
|
||||
|
||||
diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java
|
||||
--- a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java
|
||||
@@ -76,7 +76,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/sms/Sm
|
||||
import org.chromium.base.ContextUtils;
|
||||
import org.chromium.base.Log;
|
||||
import org.chromium.base.annotations.CalledByNative;
|
||||
@@ -45,17 +42,11 @@ public class SmsProviderGms {
|
||||
@@ -43,17 +40,11 @@ public class SmsProviderGms {
|
||||
|
||||
@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
|
||||
public SmsProviderGms(long smsProviderGmsAndroid, @GmsBackend int backend,
|
||||
@@ -95,7 +95,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/sms/Sm
|
||||
if (mBackend == GmsBackend.AUTO || mBackend == GmsBackend.USER_CONSENT) {
|
||||
mUserConsentReceiver = new SmsUserConsentReceiver(this, mContext);
|
||||
}
|
||||
@@ -87,12 +78,7 @@ public class SmsProviderGms {
|
||||
@@ -85,12 +76,7 @@ public class SmsProviderGms {
|
||||
@CalledByNative
|
||||
private static SmsProviderGms create(long smsProviderGmsAndroid, @GmsBackend int backend) {
|
||||
Log.d(TAG, "Creating SmsProviderGms");
|
||||
@@ -109,7 +109,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/sms/Sm
|
||||
}
|
||||
|
||||
@CalledByNative
|
||||
@@ -181,13 +167,6 @@ public class SmsProviderGms {
|
||||
@@ -179,13 +165,6 @@ public class SmsProviderGms {
|
||||
}
|
||||
|
||||
public Wrappers.SmsRetrieverClientWrapper getClient() {
|
||||
@@ -123,13 +123,6 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/sms/Sm
|
||||
return mClient;
|
||||
}
|
||||
|
||||
@@ -209,4 +188,4 @@ public class SmsProviderGms {
|
||||
void onCancel(long nativeSmsProviderGms);
|
||||
void onNotAvailable(long nativeSmsProviderGms);
|
||||
}
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff --git a/content/public/android/java/src/org/chromium/content/browser/sms/SmsUserConsentReceiver.java b/content/public/android/java/src/org/chromium/content/browser/sms/SmsUserConsentReceiver.java
|
||||
--- a/content/public/android/java/src/org/chromium/content/browser/sms/SmsUserConsentReceiver.java
|
||||
+++ b/content/public/android/java/src/org/chromium/content/browser/sms/SmsUserConsentReceiver.java
|
||||
|
||||
Reference in New Issue
Block a user