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

Commit c73b4ee9 authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Prefer to show re-up for location controller extra package 

Test: atest CtsPermissionTestCases:android.permission.cts.LocationAccessCheckTest
Change-Id: I462d8feaf4de0ce97ddbc6f2e5e19ca85d5819f9
parent 7fad659c

src/com/android/packageinstaller/permission/service/LocationAccessCheck.java

+7 −5
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ import android.content.pm.PackageManager; 
import android.graphics.Bitmap;

import android.graphics.Canvas;

import android.graphics.drawable.Drawable;

import android.location.LocationManager;

import android.net.Uri;

import android.os.AsyncTask;

import android.os.UserHandle;
@@ -403,18 +404,19 @@ public class LocationAccessCheck { 


                UserPackage packageToNotifyFor = null;



                // Prefer location history

                /* TODO: Enable once we know the location history package

                // Prefer to show notification for location controller extra package

                int numPkgs = packages.size();

                for (int i = 0; i < numPkgs; i++) {

                    UserPackage pkg = packages.get(i);



                    if (pkg.pkg.equals(getSystemServiceSafe(this, LocationManager.class,

                            pkg.user).getLocationHistoryProviderPackage())) {

                    LocationManager locationManager = getSystemServiceSafe(mContext,

                            LocationManager.class, pkg.user);

                    if (locationManager.isLocationControllerExtraPackageEnabled() && pkg.pkg.equals(

                            locationManager.getLocationControllerExtraPackage())) {

                        packageToNotifyFor = pkg;

                        break;

                    }

                }

                */



                if (packageToNotifyFor == null) {

                    packageToNotifyFor = packages.get(mRandom.nextInt(packages.size()));