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

Commit 8148f9b6 authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch 'v1-oreo-sprint_freetown' into 'v1-oreo' 

[RELEASE] Sprint Freetown (oreo)

See merge request e/os/android_frameworks_base!42
parents 7779285b 9fe1d557

core/java/android/net/SntpClient.java

+4 −1
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2008 The Android Open Source Project

 * Copyright (C) 2019 e.foundation

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -38,7 +39,7 @@ import java.util.Arrays; 
 */

public class SntpClient {

    private static final String TAG = "SntpClient";

    private static final boolean DBG = true;

    private static final boolean DBG = false;



    private static final int REFERENCE_TIME_OFFSET = 16;

    private static final int ORIGINATE_TIME_OFFSET = 24;
@@ -83,6 +84,7 @@ public class SntpClient { 
     * @return true if the transaction was successful.

     */

    public boolean requestTime(String host, int timeout) {

        if (DBG) Log.d(TAG, "request time : " + host);

        InetAddress address = null;

        try {

            address = InetAddress.getByName(host);
@@ -95,6 +97,7 @@ public class SntpClient { 
    }



    public boolean requestTime(InetAddress address, int port, int timeout) {

        if (DBG) Log.d(TAG, "request time addr : " + address.toString());

        DatagramSocket socket = null;

        final int oldTag = TrafficStats.getAndSetThreadStatsTag(TrafficStats.TAG_SYSTEM_NTP);

        try {

core/res/res/values/config.xml

+2 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
<!--

/*

** Copyright 2009, The Android Open Source Project

** Copyright (C) 2019 e.foundation

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.
@@ -1841,7 +1842,7 @@ 
    <bool name="config_actionMenuItemAllCaps">true</bool>



    <!-- Remote server that can provide NTP responses. -->

    <string translatable="false" name="config_ntpServer">time.android.com</string>

    <string translatable="false" name="config_ntpServer">pool.ntp.org</string>

    <!-- Normal polling frequency in milliseconds -->

    <integer name="config_ntpPollingInterval">86400000</integer>

    <!-- Try-again polling interval in milliseconds, in case the network request failed -->

services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java

+4 −3
Original line number Diff line number Diff line
@@ -402,6 +402,7 @@ final class DefaultPermissionGrantPolicy { 
            if(launcherPackage != null

            		&& doesPackageSupportRuntimePermissions(launcherPackage)){

            	grantRuntimePermissionsLPw(launcherPackage, LOCATION_PERMISSIONS, userId);

              grantRuntimePermissions(launcherPackage, STORAGE_PERMISSIONS, userId);

            }



            // NlpMozillaBackend