diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-08-27 13:21:15 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2019-08-27 13:44:07 +0200 |
| commit | 071ebb1e4871431e7edf7f679afd02e594ea5af9 (patch) | |
| tree | 0d48614793e758dd5a632fef8f8f24dcb3d25e31 /platform/android/java/src | |
| parent | 6cd00432c39d97f6fc1e23fff59be58c8764c115 (diff) | |
Android: Fix another regression with Secure.ANDROID_ID
Regression from #24145, which was missed in #28146.
Diffstat (limited to 'platform/android/java/src')
2 files changed, 4 insertions, 2 deletions
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 25a561ccd4..219e72c7d6 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 38aab9f4f5..8fc8ae86a2 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); |