godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-30 16:26:50 +00:00
Code Releases Wiki Activity

Android: Fix another regression with Secure.ANDROID_ID

Browse Source 
Regression from #24145, which was missed in #28146.

(cherry picked from commit 071ebb1e48)
This commit is contained in:
Rémi Verschelde
2019-08-27 13:21:15 +02:00
parent bc31b11fdd
commit 76db2b4dcb
3 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
platform/android/java/src/com/google/android/vending/expansion/downloader/impl/DownloaderService.java
View File

@@ -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));

3
platform/android/java/src/com/google/android/vending/licensing/LicenseChecker.java
View File

@@ -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);