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

Commit 4e7dc793 authored by Sasha Kuznetsov's avatar Sasha Kuznetsov Committed by Automerger Merge Worker
Browse files

Merge "Move gnss files to server/location/gnss" into rvc-dev am: 1caed5cd am: 8967581d 

Change-Id: I290d47e1424afb1aa5d18b292260d33d6fcd5b80
parents 259ee30a 8967581d

services/core/java/com/android/server/location/RemoteListenerHelper.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -273,7 +273,7 @@ public abstract class RemoteListenerHelper<TRequest, TListener extends IInterfac 
        }

        }





        @Nullable

        @Nullable

        protected TRequest getRequest() {

        public TRequest getRequest() {

            return mRequest;

            return mRequest;

        }

        }

    }

    }

services/core/java/com/android/server/location/ExponentialBackOff.java→services/core/java/com/android/server/location/gnss/ExponentialBackOff.java

+17 −1
Original line number Original line Diff line number Diff line 
package com.android.server.location;

/*

 * Copyright (C) 2020 The Android Open Source Project

 *

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

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.server.location.gnss;





/**

/**

 * A simple implementation of exponential backoff.

 * A simple implementation of exponential backoff.

services/core/java/com/android/server/location/GnssAntennaInfoProvider.java→services/core/java/com/android/server/location/gnss/GnssAntennaInfoProvider.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 * limitations under the License.

 */

 */





package com.android.server.location;

package com.android.server.location.gnss;





import android.content.Context;

import android.content.Context;

import android.location.GnssAntennaInfo;

import android.location.GnssAntennaInfo;
@@ -23,6 +23,8 @@ import android.os.Handler; 
import android.util.Log;

import android.util.Log;





import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;

import com.android.server.location.CallerIdentity;

import com.android.server.location.RemoteListenerHelper;





import java.util.List;

import java.util.List;

services/core/java/com/android/server/location/GnssBatchingProvider.java→services/core/java/com/android/server/location/gnss/GnssBatchingProvider.java

+17 −1
Original line number Original line Diff line number Diff line 
package com.android.server.location;

/*

 * Copyright (C) 2020 The Android Open Source Project

 *

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

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.server.location.gnss;





import android.util.Log;

import android.util.Log;

services/core/java/com/android/server/location/GnssCapabilitiesProvider.java→services/core/java/com/android/server/location/gnss/GnssCapabilitiesProvider.java

+2 −2
Original line number Original line Diff line number Diff line 
/*

/*

 * Copyright (C) 2019 The Android Open Source Project

 * Copyright (C) 2020 The Android Open Source Project

 *

 *

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

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

 * you may not use this file except in compliance with the License.

 * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 * limitations under the License.

 */

 */





package com.android.server.location;

package com.android.server.location.gnss;





import android.location.GnssCapabilities;

import android.location.GnssCapabilities;

import android.util.Log;

import android.util.Log;