From 76db2b4dcb7451d5eb06b8a9065da83d9b55c490 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Tue, 27 Aug 2019 13:21:15 +0200 Subject: [PATCH] Android: Fix another regression with Secure.ANDROID_ID Regression from #24145, which was missed in #28146. (cherry picked from commit 071ebb1e4871431e7edf7f679afd02e594ea5af9) --- .../android/java/{README.md => THIRDPARTY.md} | 26 ++++++++----------- .../downloader/impl/DownloaderService.java | 3 ++- .../vending/licensing/LicenseChecker.java | 3 ++- 3 files changed, 15 insertions(+), 17 deletions(-) rename platform/android/java/{README.md => THIRDPARTY.md} (63%) diff --git a/platform/android/java/README.md b/platform/android/java/THIRDPARTY.md similarity index 63% rename from platform/android/java/README.md rename to platform/android/java/THIRDPARTY.md index 58d2b107068..74ef24839b8 100644 --- a/platform/android/java/README.md +++ b/platform/android/java/THIRDPARTY.md @@ -1,5 +1,7 @@ -# Third party libraries +# Third-party libraries +This file list third-party libraries used in the Android source folder, +with their provenance and, when relevant, modifications made to those files. ## Google's vending library @@ -7,12 +9,13 @@ - Version: git (eb57657, 2018) with modifications - License: Apache 2.0 -Overwrite all files under `com/google/android/vending` +Overwrite all files under `com/google/android/vending`. -### Modify some files to avoid compile error and lint warning +Modify those files to avoid compile error and lint warning: -#### com/google/android/vending/licensing/util/Base64.java -``` +- `com/google/android/vending/licensing/util/Base64.java` + +```diff @@ -338,7 +338,8 @@ public class Base64 { e += 4; } @@ -24,8 +27,9 @@ Overwrite all files under `com/google/android/vending` } ``` -#### com/google/android/vending/licensing/LicenseChecker.java -``` +- `com/google/android/vending/licensing/LicenseChecker.java` + +```diff @@ -29,8 +29,8 @@ import android.os.RemoteException; import android.provider.Settings.Secure; import android.util.Log; @@ -37,11 +41,3 @@ Overwrite all files under `com/google/android/vending` import com.google.android.vending.licensing.util.Base64; import com.google.android.vending.licensing.util.Base64DecoderException; ``` -``` -@@ -287,13 +287,15 @@ public class LicenseChecker implements ServiceConnection { - if (logResponse) { -- String android_id = Secure.getString(mContext.getContentResolver(), -- Secure.ANDROID_ID); -+ String android_id = Secure.ANDROID_ID; - Date date = new Date(); -``` diff --git a/platform/android/java/src/com/google/android/vending/expansion/downloader/impl/DownloaderService.java b/platform/android/java/src/com/google/android/vending/expansion/downloader/impl/DownloaderService.java index 25a561ccd42..219e72c7d64 100644 --- a/platform/android/java/src/com/google/android/vending/expansion/downloader/impl/DownloaderService.java +++ b/platform/android/java/src/com/google/android/vending/expansion/downloader/impl/DownloaderService.java @@ -746,7 +746,8 @@ public abstract class DownloaderService extends CustomIntentService implements I public void run() { setServiceRunning(true); mNotification.onDownloadStateChanged(IDownloaderClient.STATE_FETCHING_URL); - String deviceId = Secure.ANDROID_ID; + String deviceId = Secure.getString(mContext.getContentResolver(), + Secure.ANDROID_ID); final APKExpansionPolicy aep = new APKExpansionPolicy(mContext, new AESObfuscator(getSALT(), mContext.getPackageName(), deviceId)); diff --git a/platform/android/java/src/com/google/android/vending/licensing/LicenseChecker.java b/platform/android/java/src/com/google/android/vending/licensing/LicenseChecker.java index 38aab9f4f52..8fc8ae86a29 100644 --- a/platform/android/java/src/com/google/android/vending/licensing/LicenseChecker.java +++ b/platform/android/java/src/com/google/android/vending/licensing/LicenseChecker.java @@ -287,7 +287,8 @@ public class LicenseChecker implements ServiceConnection { } if (logResponse) { - String android_id = Secure.ANDROID_ID; + String android_id = Secure.getString(mContext.getContentResolver(), + Secure.ANDROID_ID); Date date = new Date(); Log.d(TAG, "Server Failure: " + stringError); Log.d(TAG, "Android ID: " + android_id);