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

Commit c4aa34d7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Grant AppOp fine location to data service dynamically" am: 240d5ece 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1447535

Change-Id: I5d8abe04ebbac96b3bc5ae91d2f787b4f373e902
parents 1d7e4742 240d5ece

src/java/com/android/internal/telephony/dataconnection/DataServiceManager.java

+5 −1
Original line number Diff line number Diff line
@@ -149,6 +149,8 @@ public class DataServiceManager extends Handler { 
            TelephonyUtils.waitUntilReady(latch, CHANGE_PERMISSION_TIMEOUT_MS);

            mAppOps.setMode(AppOpsManager.OPSTR_MANAGE_IPSEC_TUNNELS,

                    UserHandle.myUserId(), pkgToGrant[0], AppOpsManager.MODE_ALLOWED);

            mAppOps.setMode(AppOpsManager.OPSTR_FINE_LOCATION,

                    UserHandle.myUserId(), pkgToGrant[0], AppOpsManager.MODE_ALLOWED);

        } catch (RuntimeException e) {

            loge("Binder to package manager died, permission grant for DataService failed.");

            throw e;
@@ -183,6 +185,8 @@ public class DataServiceManager extends Handler { 
            for (String pkg : dataServices) {

                mAppOps.setMode(AppOpsManager.OPSTR_MANAGE_IPSEC_TUNNELS, UserHandle.myUserId(),

                        pkg, AppOpsManager.MODE_ERRORED);

                mAppOps.setMode(AppOpsManager.OPSTR_FINE_LOCATION, UserHandle.myUserId(),

                        pkg, AppOpsManager.MODE_ERRORED);

            }

        } catch (RuntimeException e) {

            loge("Binder to package manager died; failed to revoke DataService permissions.");