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

Commit 03cdd3d2 authored by Victoria Lease's avatar Victoria Lease
Browse files

dual-mode switching single/multiuser ServiceWatcher 

This changelist revises LocationManager's previous multiuser system.

Location provider services that are not multiuser-aware continue to
run as before: ServiceWatcher binds to location provider services as
the current active user. When the device switches from one user to
another, ServiceWatcher unbinds from the old user's location provider
service and binds to the new user's instance.

Now, location provider services that are multiuser-aware or
user-agnostic can declare "serviceIsMultiuser" metadata in their
AndroidManifest.xml to prevent ServiceWatcher from performing this
switching. These services will run as singleton services and will be
expected to handle user switches on their own.

With this feature in, I was able to switch FusedLocationProvider to
run in multiuser mode, sharing the system_server process instead of
running in its own process. The NetworkLocationProvider is unchanged,
still running in singleuser mode, cheerfully oblivious to the
possibility that there might be any user on the device besides the
one it services.

Bug: 8028045
Change-Id: I1a5bd032918419bab6edb46c62ff8c6811170654
parent f48a2d30

packages/FusedLocation/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -23,6 +23,5 @@ LOCAL_JAVA_LIBRARIES := com.android.location.provider 


LOCAL_PACKAGE_NAME := FusedLocation

LOCAL_CERTIFICATE := platform

LOCAL_SDK_VERSION := current



include $(BUILD_PACKAGE)

packages/FusedLocation/AndroidManifest.xml

+6 −2
Original line number Diff line number Diff line
@@ -18,14 +18,17 @@ 
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

        package="com.android.location.fused"

        coreApp="true">

        coreApp="true"

        android:sharedUserId="android.uid.system">



    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />

    <uses-permission android:name="android.permission.INSTALL_LOCATION_PROVIDER" />

    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />



    <application

            android:label="@string/app_label">

            android:label="@string/app_label"

            android:process="system">



        <uses-library android:name="com.android.location.provider" />
@@ -39,6 +42,7 @@ 
               <action android:name="com.android.location.service.FusedLocationProvider" />

           </intent-filter>

           <meta-data android:name="serviceVersion" android:value="0" />

           <meta-data android:name="serviceIsMultiuser" android:value="true" />

        </service>

    </application>

</manifest>

packages/FusedLocation/src/com/android/location/fused/FusedLocationProvider.java

+17 −0
Original line number Diff line number Diff line
@@ -24,13 +24,17 @@ import com.android.location.provider.LocationProviderBase; 
import com.android.location.provider.ProviderPropertiesUnbundled;

import com.android.location.provider.ProviderRequestUnbundled;



import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.location.Criteria;

import android.location.LocationProvider;

import android.os.Bundle;

import android.os.Handler;

import android.os.Looper;

import android.os.Message;

import android.os.UserHandle;

import android.os.WorkSource;



public class FusedLocationProvider extends LocationProviderBase implements FusionEngine.Callback {
@@ -60,6 +64,19 @@ public class FusedLocationProvider extends LocationProviderBase implements Fusio 
        super(TAG, PROPERTIES);

        mContext = context;

        mEngine = new FusionEngine(context, Looper.myLooper());



        // listen for user change

        IntentFilter intentFilter = new IntentFilter();

        intentFilter.addAction(Intent.ACTION_USER_SWITCHED);

        mContext.registerReceiverAsUser(new BroadcastReceiver() {

            @Override

            public void onReceive(Context context, Intent intent) {

                String action = intent.getAction();

                if (Intent.ACTION_USER_SWITCHED.equals(action)) {

                    mEngine.switchUser();

                }

            }

        }, UserHandle.ALL, intentFilter, null, mHandler);

    }



    /**

packages/FusedLocation/src/com/android/location/fused/FusionEngine.java

+8 −0
Original line number Diff line number Diff line
@@ -300,4 +300,12 @@ public class FusionEngine implements LocationListener { 
        s.append("    ").append(mStats.get(NETWORK)).append('\n');

        pw.append(s);

    }



    /** Called on mLooper thread */

    public void switchUser() {

        // reset state to prevent location data leakage

        mFusedLocation = null;

        mGpsLocation = null;

        mNetworkLocation = null;

    }

}

services/java/com/android/server/LocationManagerService.java

+46 −21
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ public class LocationManagerService extends ILocationManager.Stub { 
                mContext,

                LocationManager.NETWORK_PROVIDER,

                NETWORK_LOCATION_SERVICE_ACTION,

                providerPackageNames, mLocationHandler, mCurrentUserId);

                providerPackageNames, mLocationHandler);

        if (networkProvider != null) {

            mRealProviders.put(LocationManager.NETWORK_PROVIDER, networkProvider);

            mProxyProviders.add(networkProvider);
@@ -379,7 +379,7 @@ public class LocationManagerService extends ILocationManager.Stub { 
                mContext,

                LocationManager.FUSED_PROVIDER,

                FUSED_LOCATION_SERVICE_ACTION,

                providerPackageNames, mLocationHandler, mCurrentUserId);

                providerPackageNames, mLocationHandler);

        if (fusedLocationProvider != null) {

            addProviderLocked(fusedLocationProvider);

            mProxyProviders.add(fusedLocationProvider);
@@ -392,7 +392,7 @@ public class LocationManagerService extends ILocationManager.Stub { 


        // bind to geocoder provider

        mGeocodeProvider = GeocoderProxy.createAndBind(mContext, providerPackageNames,

                mLocationHandler, mCurrentUserId);

                mLocationHandler);

        if (mGeocodeProvider == null) {

            Slog.e(TAG,  "no geocoder provider found");

        }
@@ -404,11 +404,11 @@ public class LocationManagerService extends ILocationManager.Stub { 
     */

    private void switchUser(int userId) {

        mBlacklist.switchUser(userId);

        mLocationHandler.removeMessages(MSG_LOCATION_CHANGED);

        synchronized (mLock) {

            mLastLocation.clear();

            for (LocationProviderInterface p : mProviders) {

                updateProviderListenersLocked(p.getName(), false, mCurrentUserId);

                p.switchUser(userId);

            }

            mCurrentUserId = userId;

            updateProvidersLocked();
@@ -668,8 +668,17 @@ public class LocationManagerService extends ILocationManager.Stub { 
    }





    private boolean isAllowedBySettingsLocked(String provider, int userId) {

        if (userId != mCurrentUserId) {

    /**

     * Returns "true" if access to the specified location provider is allowed by the current user's

     * settings. Access to all location providers is forbidden to non-location-provider processes

     * belonging to background users.

     *

     * @param provider the name of the location provider

     * @param uid the requestor's UID

     * @return

     */

    private boolean isAllowedBySettingsLocked(String provider, int uid) {

        if (UserHandle.getUserId(uid) != mCurrentUserId && !isUidALocationProvider(uid)) {

            return false;

        }

        if (mEnabledProviders.contains(provider)) {
@@ -862,7 +871,7 @@ public class LocationManagerService extends ILocationManager.Stub { 
    public List<String> getProviders(Criteria criteria, boolean enabledOnly) {

        int allowedResolutionLevel = getCallerAllowedResolutionLevel();

        ArrayList<String> out;

        int callingUserId = UserHandle.getCallingUserId();

        int uid = Binder.getCallingUid();;

        long identity = Binder.clearCallingIdentity();

        try {

            synchronized (mLock) {
@@ -873,7 +882,7 @@ public class LocationManagerService extends ILocationManager.Stub { 
                        continue;

                    }

                    if (allowedResolutionLevel >= getMinimumResolutionLevelForProviderUse(name)) {

                        if (enabledOnly && !isAllowedBySettingsLocked(name, callingUserId)) {

                        if (enabledOnly && !isAllowedBySettingsLocked(name, uid)) {

                            continue;

                        }

                        if (criteria != null && !LocationProvider.propertiesMeetCriteria(
@@ -949,7 +958,8 @@ public class LocationManagerService extends ILocationManager.Stub { 
            LocationProviderInterface p = mProviders.get(i);

            boolean isEnabled = p.isEnabled();

            String name = p.getName();

            boolean shouldBeEnabled = isAllowedBySettingsLocked(name, mCurrentUserId);

            boolean shouldBeEnabled = isAllowedBySettingsLocked(name,

                    UserHandle.getUid(mCurrentUserId, 0));

            if (isEnabled && !shouldBeEnabled) {

                updateProviderListenersLocked(name, false, mCurrentUserId);

                changesMade = true;
@@ -1260,7 +1270,7 @@ public class LocationManagerService extends ILocationManager.Stub { 
            oldRecord.disposeLocked(false);

        }



        boolean isProviderEnabled = isAllowedBySettingsLocked(name, UserHandle.getUserId(uid));

        boolean isProviderEnabled = isAllowedBySettingsLocked(name, uid);

        if (isProviderEnabled) {

            applyRequirementsLocked(name);

        } else {
@@ -1317,7 +1327,7 @@ public class LocationManagerService extends ILocationManager.Stub { 
        // update provider

        for (String provider : providers) {

            // If provider is already disabled, don't need to do anything

            if (!isAllowedBySettingsLocked(provider, mCurrentUserId)) {

            if (!isAllowedBySettingsLocked(provider, UserHandle.getUid(mCurrentUserId, 0))) {

                continue;

            }
@@ -1358,7 +1368,7 @@ public class LocationManagerService extends ILocationManager.Stub { 
                LocationProviderInterface provider = mProvidersByName.get(name);

                if (provider == null) return null;



                if (!isAllowedBySettingsLocked(name, mCurrentUserId)) return null;

                if (!isAllowedBySettingsLocked(name, uid)) return null;



                Location location = mLastLocation.get(name);

                if (location == null) {
@@ -1538,13 +1548,32 @@ public class LocationManagerService extends ILocationManager.Stub { 
                LocationProviderInterface p = mProvidersByName.get(provider);

                if (p == null) return false;



                return isAllowedBySettingsLocked(provider, mCurrentUserId);

                return isAllowedBySettingsLocked(provider, UserHandle.getUid(mCurrentUserId, 0));

            }

        } finally {

            Binder.restoreCallingIdentity(identity);

        }

    }



    /**

     * Returns "true" if the UID belongs to a bound location provider.

     *

     * @param uid the uid

     * @return true if uid belongs to a bound location provider

     */

    private boolean isUidALocationProvider(int uid) {

        if (uid == Process.SYSTEM_UID) {

            return true;

        }

        if (mGeocodeProvider != null) {

            if (doesPackageHaveUid(uid, mGeocodeProvider.getConnectedPackageName())) return true;

        }

        for (LocationProviderProxy proxy : mProxyProviders) {

            if (doesPackageHaveUid(uid, proxy.getConnectedPackageName())) return true;

        }

        return false;

    }



    private void checkCallerIsProvider() {

        if (mContext.checkCallingOrSelfPermission(INSTALL_LOCATION_PROVIDER)

                == PackageManager.PERMISSION_GRANTED) {
@@ -1558,14 +1587,10 @@ public class LocationManagerService extends ILocationManager.Stub { 
        // also allow providers with a UID matching the

        // currently bound package name



        int uid = Binder.getCallingUid();



        if (mGeocodeProvider != null) {

            if (doesPackageHaveUid(uid, mGeocodeProvider.getConnectedPackageName())) return;

        }

        for (LocationProviderProxy proxy : mProxyProviders) {

            if (doesPackageHaveUid(uid, proxy.getConnectedPackageName())) return;

        if (isUidALocationProvider(Binder.getCallingUid())) {

            return;

        }



        throw new SecurityException("need INSTALL_LOCATION_PROVIDER permission, " +

                "or UID of a currently bound location provider");

    }
@@ -1817,7 +1842,7 @@ public class LocationManagerService extends ILocationManager.Stub { 
        }



        synchronized (mLock) {

            if (isAllowedBySettingsLocked(provider, mCurrentUserId)) {

            if (isAllowedBySettingsLocked(provider, UserHandle.getUid(mCurrentUserId, 0))) {

                handleLocationChangedLocked(myLocation, passive);

            }

        }