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

Commit 777d919f authored by Jonathan Klee's avatar Jonathan Klee
Browse files

Merge remote-tracking branch 'fynn/basic-workspace' into main-2.5-beta

parents 63c00f45 ea108d7e

play-services-base/core/src/main/java/org/microg/gms/common/DeviceConfiguration.java

+5 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import static android.os.Build.VERSION.SDK_INT; 
public class DeviceConfiguration {

    public List<String> availableFeatures;

    public int densityDpi;

    public double diagonalInch;

    public int glEsVersion;

    public List<String> glExtensions;

    public boolean hasFiveWayNavigation;
@@ -92,6 +93,10 @@ public class DeviceConfiguration { 
        this.nativePlatforms = getNativePlatforms();

        widthPixels = displayMetrics.widthPixels;

        heightPixels = displayMetrics.heightPixels;

        diagonalInch = Math.sqrt(

                Math.pow(widthPixels / displayMetrics.xdpi, 2) +

                        Math.pow(heightPixels / displayMetrics.ydpi, 2)

        );

        locales = getLocales(context);

        Set<String> glExtensions = new HashSet<String>();

        addEglExtensions(glExtensions);

play-services-base/core/src/main/java/org/microg/gms/common/HttpFormClient.java

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ public class HttpFormClient { 
            } catch (IOException e) {

                // Ignore

            }

            throw new IOException(error);

            throw new NotOkayException(error);

        }



        String result = new String(Utils.readStreamToEnd(connection.getInputStream()));

play-services-base/core/src/main/java/org/microg/gms/common/NotOkayException.java

0 → 100644
+20 −0
Original line number Diff line number Diff line 
package org.microg.gms.common;



import java.io.IOException;



public class NotOkayException extends IOException {

    public NotOkayException() {

    }



    public NotOkayException(String message) {

        super(message);

    }



    public NotOkayException(String message, Throwable cause) {

        super(message, cause);

    }



    public NotOkayException(Throwable cause) {

        super(cause);

    }

}

play-services-basement/src/main/java/com/google/android/gms/common/Scopes.java

+5 −0
Original line number Diff line number Diff line
@@ -98,4 +98,9 @@ public class Scopes { 
    public static final String USER_BIRTHDAY_READ = "https://www.googleapis.com/auth/user.birthday.read";

    @Hide

    public static final String GMAIL_READONLY = "https://www.googleapis.com/auth/gmail.readonly";

    /**

     * Scope for cryptauthenrollment.googleapis.com (required for certain Google Workspace accounts)

     */

    @Hide

    public static final String CRYPTAUTH = "https://www.googleapis.com/auth/cryptauth";

}

play-services-core-proto/src/main/proto/cryptauth/LICENSE

0 → 100644
+27 −0
Original line number Diff line number Diff line 
// Copyright 2015 The Chromium Authors

//

// Redistribution and use in source and binary forms, with or without

// modification, are permitted provided that the following conditions are

// met:

//

//    * Redistributions of source code must retain the above copyright

// notice, this list of conditions and the following disclaimer.

//    * Redistributions in binary form must reproduce the above

// copyright notice, this list of conditions and the following disclaimer

// in the documentation and/or other materials provided with the

// distribution.

//    * Neither the name of Google LLC nor the names of its

// contributors may be used to endorse or promote products derived from

// this software without specific prior written permission.

//

// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.