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

Commit bf088b80 authored by Dan Pasanen's avatar Dan Pasanen
Browse files

Merge tag 'android-7.1.2_r24' into cm-14.1 

Android 7.1.2 release 24

# gpg: Signature made Fri 30 Jun 2017 01:19:30 PM CDT
# gpg:                using DSA key E8AD3F819AB10E78
# gpg: Can't check signature: No public key
parents 82e0cb1e 66cb6dc1

core/java/android/view/accessibility/AccessibilityNodeInfo.java

+12 −11
Original line number Diff line number Diff line
@@ -2760,16 +2760,19 @@ public class AccessibilityNodeInfo implements Parcelable { 


        if (mActions != null && !mActions.isEmpty()) {

            final int actionCount = mActions.size();

            parcel.writeInt(actionCount);



            int nonLegacyActionCount = 0;

            int defaultLegacyStandardActions = 0;

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

                AccessibilityAction action = mActions.get(i);

                if (isDefaultLegacyStandardAction(action)) {

                    defaultLegacyStandardActions |= action.getId();

                } else {

                    nonLegacyActionCount++;

                }

            }

            parcel.writeInt(defaultLegacyStandardActions);

            parcel.writeInt(nonLegacyActionCount);



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

                AccessibilityAction action = mActions.get(i);
@@ -2780,6 +2783,7 @@ public class AccessibilityNodeInfo implements Parcelable { 
            }

        } else {

            parcel.writeInt(0);

            parcel.writeInt(0);

        }



        parcel.writeInt(mMaxTextLength);
@@ -2947,17 +2951,14 @@ public class AccessibilityNodeInfo implements Parcelable { 
        mBoundsInScreen.left = parcel.readInt();

        mBoundsInScreen.right = parcel.readInt();



        final int actionCount = parcel.readInt();

        if (actionCount > 0) {

        final int legacyStandardActions = parcel.readInt();

        addLegacyStandardActions(legacyStandardActions);

            final int nonLegacyActionCount = actionCount - Integer.bitCount(legacyStandardActions);

        final int nonLegacyActionCount = parcel.readInt();

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

            final AccessibilityAction action = new AccessibilityAction(

                    parcel.readInt(), parcel.readCharSequence());

            addActionUnchecked(action);

        }

        }



        mMaxTextLength = parcel.readInt();

        mMovementGranularities = parcel.readInt();

core/java/com/android/internal/os/ZygoteInit.java

+1 −1
Original line number Diff line number Diff line
@@ -644,7 +644,7 @@ public class ZygoteInit { 
            OsConstants.CAP_NET_RAW,

            OsConstants.CAP_SYS_MODULE,

            OsConstants.CAP_SYS_NICE,

            OsConstants.CAP_SYS_RESOURCE,

            OsConstants.CAP_SYS_PTRACE,

            OsConstants.CAP_SYS_TIME,

            OsConstants.CAP_SYS_TTY_CONFIG

        );

services/core/java/com/android/server/vr/VrManagerService.java

+1 −5
Original line number Diff line number Diff line
@@ -539,16 +539,12 @@ public class VrManagerService extends SystemService implements EnabledComponentC 
                    false, mOverlayToken, null, oldUserId);

        }



        if (!mVrModeEnabled) {

            return;

        }



        // Apply the restrictions for the current user based on vr state

        String[] exemptions = (exemptedPackage == null) ? new String[0] :

                new String[] { exemptedPackage };



        appOpsManager.setUserRestrictionForUser(AppOpsManager.OP_SYSTEM_ALERT_WINDOW,

                true, mOverlayToken, exemptions, newUserId);

                mVrModeEnabled, mOverlayToken, exemptions, newUserId);

    }



    private void updateDependentAppOpsLocked(String newVrServicePackage, int newUserId,