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

Commit 766a8d47 authored by Soonil Nagarkar's avatar Soonil Nagarkar
Browse files

Move ServiceWatcher into package 

Allows for better OWNERS rights and decomposing ServiceWatcher into
multiple pieces.

Bug: 181665909
Test: builds
Change-Id: I63bad4140cf04fb227183bb53b61aeb8fa912f3f
parent 3f9a7c0f

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

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import android.location.IGeocodeProvider; 
import android.os.IBinder;

import android.os.RemoteException;



import com.android.server.ServiceWatcher;

import com.android.server.servicewatcher.ServiceWatcher;



import java.util.Collections;

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

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ import android.os.IBinder; 
import android.os.RemoteException;

import android.util.Log;



import com.android.server.ServiceWatcher;

import com.android.server.ServiceWatcher.BoundService;

import com.android.server.servicewatcher.ServiceWatcher;

import com.android.server.servicewatcher.ServiceWatcher.BoundService;



/**

 * Proxy class to bind GmsCore to the ActivityRecognitionHardware.

services/core/java/com/android/server/location/geofence/GeofenceProxy.java

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import android.os.RemoteException; 
import android.os.UserHandle;

import android.util.Log;



import com.android.server.ServiceWatcher;

import com.android.server.servicewatcher.ServiceWatcher;



import java.util.Objects;

services/core/java/com/android/server/location/provider/proxy/ProxyLocationProvider.java

+2 −2
Original line number Diff line number Diff line
@@ -37,9 +37,9 @@ import android.util.ArraySet; 


import com.android.internal.annotations.GuardedBy;

import com.android.internal.util.ArrayUtils;

import com.android.server.ServiceWatcher;

import com.android.server.ServiceWatcher.BoundService;

import com.android.server.location.provider.AbstractLocationProvider;

import com.android.server.servicewatcher.ServiceWatcher;

import com.android.server.servicewatcher.ServiceWatcher.BoundService;



import java.io.FileDescriptor;

import java.io.PrintWriter;

services/core/java/com/android/server/ServiceWatcher.java→services/core/java/com/android/server/servicewatcher/ServiceWatcher.java

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

 */



package com.android.server;

package com.android.server.servicewatcher;



import static android.content.Context.BIND_AUTO_CREATE;

import static android.content.Context.BIND_NOT_FOREGROUND;
@@ -52,6 +52,7 @@ import com.android.internal.annotations.Immutable; 
import com.android.internal.content.PackageMonitor;

import com.android.internal.util.Preconditions;

import com.android.internal.util.function.pooled.PooledLambda;

import com.android.server.FgThread;



import java.io.FileDescriptor;

import java.io.PrintWriter;