Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Verified Commit 7f32119d authored by Marvin W.'s avatar Marvin W. 🐿️
Browse files

Fix various linker warnings

parent 50d788a2
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ buildscript {
allprojects {
    apply plugin: 'idea'
    ext.androidBuildVersionTools = "29.0.2"
    ext.supportLibraryVersion = "28.0.0"
}

def androidCompileSdk() { return 29 }
+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ android {
}

dependencies {
    api 'com.android.support:support-v4:25.3.1'
    api "com.android.support:support-v4:$supportLibraryVersion"
    api 'org.microg:safe-parcel:1.5.0'
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ public class DataHolder extends AutoSafeParcelable implements Closeable {
    }

    @SuppressWarnings("deprecation")
    @SuppressLint("NewApi")
    @SuppressLint({"NewApi", "ObsoleteSdkInt"})
    static int getCursorType(Cursor cursor, int i) {
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
            return cursor.getType(i);
+4 −2
Original line number Diff line number Diff line
/*
 * Copyright (C) 2013-2017 microG Project Team
 * Copyright (C) 2013-2019 microG Project Team
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@

package com.google.android.gms.common.images;

import java.util.Locale;

import android.net.Uri;

import org.microg.safeparcel.AutoSafeParcelable;
@@ -57,6 +59,6 @@ public class WebImage extends AutoSafeParcelable {
    }

    public String toString() {
        return String.format("Image %dx%d %s", new Object[]{Integer.valueOf(width), Integer.valueOf(height), uri.toString()});
        return String.format(Locale.getDefault(), "Image %dx%d %s", new Object[]{Integer.valueOf(width), Integer.valueOf(height), uri.toString()});
    }
}