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

Commit 8d994400 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Android (Google) Code Review
Browse files

Merge "Extend support for requestRouteToHostAddress for backward compatibility" into qt-dev

parents 15bff875 e41992c1

services/core/java/com/android/server/ConnectivityService.java

+6 −2
Original line number Original line Diff line number Diff line
@@ -133,6 +133,7 @@ import android.os.ServiceSpecificException; 
import android.os.ShellCallback;

import android.os.ShellCallback;

import android.os.ShellCommand;

import android.os.ShellCommand;

import android.os.SystemClock;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.UserHandle;

import android.os.UserManager;

import android.os.UserManager;

import android.provider.Settings;

import android.provider.Settings;
@@ -1628,8 +1629,11 @@ public class ConnectivityService extends IConnectivityManager.Stub 
     */

     */

    private boolean disallowedBecauseSystemCaller() {

    private boolean disallowedBecauseSystemCaller() {

        // TODO: start throwing a SecurityException when GnssLocationProvider stops calling

        // TODO: start throwing a SecurityException when GnssLocationProvider stops calling

        // requestRouteToHost.

        // requestRouteToHost. In Q, GnssLocationProvider is changed to not call requestRouteToHost

        if (isSystem(Binder.getCallingUid())) {

        // for devices launched with Q and above. However, existing devices upgrading to Q and

        // above must continued to be supported for few more releases.

        if (isSystem(Binder.getCallingUid()) && SystemProperties.getInt(

                "ro.product.first_api_level", 0) > Build.VERSION_CODES.P) {

            log("This method exists only for app backwards compatibility"

            log("This method exists only for app backwards compatibility"

                    + " and must not be called by system services.");

                    + " and must not be called by system services.");

            return true;

            return true;