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

Commit 37a36109 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 am: c4aa34d7 

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

Change-Id: I2fa6c217eb71bd8ebe352cafeec05aa0b0464373
parents 087b9a5d c4aa34d7

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

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

            TelephonyUtils.waitUntilReady(latch, CHANGE_PERMISSION_TIMEOUT_MS);

            mAppOps.setMode(AppOpsManager.OPSTR_MANAGE_IPSEC_TUNNELS,

            mAppOps.setMode(AppOpsManager.OPSTR_MANAGE_IPSEC_TUNNELS,

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

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

            mAppOps.setMode(AppOpsManager.OPSTR_FINE_LOCATION,

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

        } catch (RuntimeException e) {

        } catch (RuntimeException e) {

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

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

            throw e;

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

            for (String pkg : dataServices) {

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

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

                        pkg, AppOpsManager.MODE_ERRORED);

                        pkg, AppOpsManager.MODE_ERRORED);

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

                        pkg, AppOpsManager.MODE_ERRORED);

            }

            }

        } catch (RuntimeException e) {

        } catch (RuntimeException e) {

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

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