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

Commit 3922c4dd authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch 'v1-nougat-sprint_freetown' into 'v1-nougat' 

[RELEASE] Sprint Freetown (nougat)

See merge request e/os/android_frameworks_base!41
parents 114f71fb 7a925444

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.
@@ -1791,7 +1792,7 @@ 
    <bool name="config_actionMenuItemAllCaps">true</bool>



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

    <string translatable="false" name="config_ntpServer">2.android.pool.ntp.org</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

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

            		&& doesPackageSupportRuntimePermissions(launcherPackage)){

            	grantRuntimePermissionsLPw(launcherPackage, LOCATION_PERMISSIONS, userId);

              grantRuntimePermissions(launcherPackage, STORAGE_PERMISSIONS, userId);

            }



            // NlpMozillaBackend