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

Commit 548967e1 authored by Luca Stefani's avatar Luca Stefani
Browse files

Merge commit 'refs/changes/82/227182/1' of... 

Merge commit 'refs/changes/82/227182/1' of https://github.com/LineageOS/android_frameworks_base into HEAD

Change-Id: If4cc5d73650d446d4cfb6657c70348aab2d97542
parents 3119a18f f1ff8f00

core/java/android/hardware/location/NanoAppFilter.java

+1 −2
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ public class NanoAppFilter implements Parcelable { 
        mAppId = in.readLong();

        mAppVersion = in.readInt();

        mVersionRestrictionMask = in.readInt();

        mAppIdVendorMask = in.readInt();

        mAppIdVendorMask = in.readLong();

    }



    public int describeContents() {
@@ -93,7 +93,6 @@ public class NanoAppFilter implements Parcelable { 
    }



    public void writeToParcel(Parcel out, int flags) {



        out.writeLong(mAppId);

        out.writeInt(mAppVersion);

        out.writeInt(mVersionRestrictionMask);

media/java/android/media/MediaPlayer.java

+1 −1
Original line number Diff line number Diff line
@@ -2510,10 +2510,10 @@ public class MediaPlayer extends PlayerBase 
        @Override

        public void writeToParcel(Parcel dest, int flags) {

            dest.writeInt(mTrackType);

            dest.writeString(mFormat.getString(MediaFormat.KEY_MIME));

            dest.writeString(getLanguage());



            if (mTrackType == MEDIA_TRACK_TYPE_SUBTITLE) {

                dest.writeString(mFormat.getString(MediaFormat.KEY_MIME));

                dest.writeInt(mFormat.getInteger(MediaFormat.KEY_IS_AUTOSELECT));

                dest.writeInt(mFormat.getInteger(MediaFormat.KEY_IS_DEFAULT));

                dest.writeInt(mFormat.getInteger(MediaFormat.KEY_IS_FORCED_SUBTITLE));

services/core/java/com/android/server/connectivity/Vpn.java

+14 −2
Original line number Diff line number Diff line
@@ -100,8 +100,6 @@ import com.android.server.DeviceIdleController; 
import com.android.server.LocalServices;

import com.android.server.net.BaseNetworkObserver;



import libcore.io.IoUtils;



import java.io.File;

import java.io.IOException;

import java.io.InputStream;
@@ -123,6 +121,8 @@ import java.util.SortedSet; 
import java.util.TreeSet;

import java.util.concurrent.atomic.AtomicInteger;



import libcore.io.IoUtils;



/**

 * @hide

 */
@@ -1327,6 +1327,18 @@ public class Vpn { 
                    /* allowedApplications */ null,

                    /* disallowedApplications */ exemptedPackages);



            // The UID range of the first user (0-99999) would block the IPSec traffic, which comes

            // directly from the kernel and is marked as uid=0. So we adjust the range to allow

            // it through (b/69873852).

            for (UidRange range : addedRanges) {

                if (range.start == 0) {

                    addedRanges.remove(range);

                    if (range.stop != 0) {

                        addedRanges.add(new UidRange(1, range.stop));

                    }

                }

            }



            removedRanges.removeAll(addedRanges);

            addedRanges.removeAll(mBlockedUsers);

        }

services/core/java/com/android/server/pm/ShortcutService.java

+24 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ import java.nio.charset.StandardCharsets; 
import java.util.ArrayList;

import java.util.Collections;

import java.util.List;

import java.util.Objects;

import java.util.concurrent.atomic.AtomicBoolean;

import java.util.function.Consumer;

import java.util.function.Predicate;
@@ -1573,6 +1574,24 @@ public class ShortcutService extends IShortcutService.Stub { 
                "Ephemeral apps can't use ShortcutManager");

    }



    private void verifyShortcutInfoPackage(String callerPackage, ShortcutInfo si) {

        if (si == null) {

            return;

        }

        if (!Objects.equals(callerPackage, si.getPackage())) {

            android.util.EventLog.writeEvent(0x534e4554, "109824443", -1, "");

            throw new SecurityException("Shortcut package name mismatch");

        }

    }



    private void verifyShortcutInfoPackages(

            String callerPackage, List<ShortcutInfo> list) {

        final int size = list.size();

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

            verifyShortcutInfoPackage(callerPackage, list.get(i));

        }

    }



    // Overridden in unit tests to execute r synchronously.

    void injectPostToHandler(Runnable r) {

        mHandler.post(r);
@@ -1720,6 +1739,7 @@ public class ShortcutService extends IShortcutService.Stub { 
        verifyCaller(packageName, userId);



        final List<ShortcutInfo> newShortcuts = (List<ShortcutInfo>) shortcutInfoList.getList();

        verifyShortcutInfoPackages(packageName, newShortcuts);

        final int size = newShortcuts.size();



        final boolean unlimited = injectHasUnlimitedShortcutsApiCallsPermission(
@@ -1774,6 +1794,7 @@ public class ShortcutService extends IShortcutService.Stub { 
        verifyCaller(packageName, userId);



        final List<ShortcutInfo> newShortcuts = (List<ShortcutInfo>) shortcutInfoList.getList();

        verifyShortcutInfoPackages(packageName, newShortcuts);

        final int size = newShortcuts.size();



        final boolean unlimited = injectHasUnlimitedShortcutsApiCallsPermission(
@@ -1859,6 +1880,7 @@ public class ShortcutService extends IShortcutService.Stub { 
        verifyCaller(packageName, userId);



        final List<ShortcutInfo> newShortcuts = (List<ShortcutInfo>) shortcutInfoList.getList();

        verifyShortcutInfoPackages(packageName, newShortcuts);

        final int size = newShortcuts.size();



        final boolean unlimited = injectHasUnlimitedShortcutsApiCallsPermission(
@@ -1921,6 +1943,7 @@ public class ShortcutService extends IShortcutService.Stub { 
        Preconditions.checkNotNull(shortcut);

        Preconditions.checkArgument(shortcut.isEnabled(), "Shortcut must be enabled");

        verifyCaller(packageName, userId);

        verifyShortcutInfoPackage(packageName, shortcut);



        final Intent ret;

        synchronized (mLock) {
@@ -1942,6 +1965,7 @@ public class ShortcutService extends IShortcutService.Stub { 
    private boolean requestPinItem(String packageName, int userId, ShortcutInfo shortcut,

            AppWidgetProviderInfo appWidget, Bundle extras, IntentSender resultIntent) {

        verifyCaller(packageName, userId);

        verifyShortcutInfoPackage(packageName, shortcut);



        final boolean ret;

        synchronized (mLock) {