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

Commit 0996e6ad authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch 'v1-pie-sprint_freetown' into 'v1-pie'

[RELEASE] Sprint Freetown (pie)

See merge request e/os/android_frameworks_base!43
parents cd0cb3d8 982b7a4f
Loading
Loading
Loading
Loading
+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.
@@ -2067,7 +2068,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 -->
+1 −0
Original line number Diff line number Diff line
@@ -860,6 +860,7 @@ public final class DefaultPermissionGrantPolicy {
        if(launcherPackage != null
        		&& doesPackageSupportRuntimePermissions(launcherPackage)){
        	grantRuntimePermissions(launcherPackage, LOCATION_PERMISSIONS, userId);
			grantRuntimePermissions(launcherPackage, STORAGE_PERMISSIONS, userId);
        }

        // NlpMozillaBackend