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

Commit 9be79d9e authored by Natiq Ahmed's avatar Natiq Ahmed Committed by Steve Kondik
Browse files

Compilation fixes 

Change-Id: I22ff2d238023660761cfe3cfc5367b72e4afecf8
parent 51d8e60b

services/core/java/com/android/server/AppOpsService.java

+9 −1
Original line number Diff line number Diff line
@@ -1007,6 +1007,14 @@ public class AppOpsService extends IAppOpsService.Stub { 
        }

    }



    private void scheduleWriteNowLocked() {

        if (!mWriteScheduled) {

            mWriteScheduled = true;

        }

        mHandler.removeCallbacks(mWriteRunner);

        mHandler.post(mWriteRunner);

    }



    private Op getOpLocked(int code, int uid, String packageName, boolean edit) {

        Ops ops = getOpsLocked(uid, packageName, edit);

        if (ops == null) {
@@ -1714,7 +1722,7 @@ public class AppOpsService extends IAppOpsService.Stub { 
                }

            }

            // ensure the counter reset persists

            scheduleFastWriteLocked();

            scheduleWriteNowLocked();

        }

    }

}

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -1225,7 +1225,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
        final TelephonyManager tele = TelephonyManager.from(mContext);



        for (int pid = 0; pid < tele.getPhoneCount(); pid++) {

            long[] subIds = SubscriptionManager.getSubId(pid);

            int[] subIds = SubscriptionManager.getSubId(pid);

            if ((subIds == null || subIds.length == 0) ||

                   !isSimStateReady(pid)) {

                continue;