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

Commit 0f0673ec authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8562897 from 67ea0a0b to tm-qpr1-release 

Change-Id: Idacdab0afc123d01dc0b1fcd324c62ae6ef0687f
parents 2a1e51e8 67ea0a0b

core/api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -314,7 +314,6 @@ package android.app { 
  public final class NotificationChannel implements android.os.Parcelable {

    method public int getOriginalImportance();

    method public boolean isImportanceLockedByCriticalDeviceFunction();

    method public boolean isImportanceLockedByOEM();

    method public void lockFields(int);

    method public void setDeleted(boolean);

    method public void setDeletedTimeMs(long);

core/java/android/app/NotificationChannel.java

+0 −8
Original line number Diff line number Diff line
@@ -863,14 +863,6 @@ public final class NotificationChannel implements Parcelable { 
        mImportanceLockedDefaultApp = locked;

    }



    /**

     * @hide

     */

    @TestApi

    public boolean isImportanceLockedByOEM() {

        return mImportanceLockedByOEM;

    }



    /**

     * @hide

     */

core/java/android/app/admin/ProvisioningIntentHelper.java

+38 −0
Original line number Diff line number Diff line
@@ -17,8 +17,10 @@ 
package android.app.admin;



import static android.app.admin.DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE;

import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE;

import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME;

import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME;

import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_ROLE_HOLDER_EXTRAS_BUNDLE;

import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_TRIGGER;

import static android.app.admin.DevicePolicyManager.MIME_TYPE_PROVISIONING_NFC;

import static android.app.admin.DevicePolicyManager.PROVISIONING_TRIGGER_NFC;
@@ -36,12 +38,14 @@ import android.nfc.NdefRecord; 
import android.nfc.NfcAdapter;

import android.os.Bundle;

import android.os.Parcelable;

import android.os.PersistableBundle;

import android.util.Log;



import java.io.IOException;

import java.io.StringReader;

import java.util.Enumeration;

import java.util.Properties;

import java.util.Set;



/**

 * Utility class that provides functionality to create provisioning intents from nfc intents.
@@ -124,12 +128,46 @@ final class ProvisioningIntentHelper { 
            ComponentName componentName = ComponentName.unflattenFromString(

                    properties.getProperty(propertyName));

            bundle.putParcelable(propertyName, componentName);

        } else if (EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE.equals(propertyName)

                || EXTRA_PROVISIONING_ROLE_HOLDER_EXTRAS_BUNDLE.equals(propertyName)) {

            try {

                bundle.putParcelable(propertyName,

                        deserializeExtrasBundle(properties, propertyName));

            } catch (IOException e) {

                Log.e(TAG,

                        "Failed to parse " + propertyName + ".", e);

            }

        }

        else {

            bundle.putString(propertyName, properties.getProperty(propertyName));

        }

    }



    /**

     * Get a {@link PersistableBundle} from a {@code String} property in a {@link Properties}

     * object.

     * @param properties the source of the extra

     * @param extraName key into the {@link Properties} object

     * @return the {@link PersistableBundle} or {@code null} if there was no property with the

     * given name

     * @throws IOException if there was an error parsing the property

     */

    private static PersistableBundle deserializeExtrasBundle(

            Properties properties, String extraName) throws IOException {

        String serializedExtras = properties.getProperty(extraName);

        if (serializedExtras == null) {

            return null;

        }

        Properties bundleProperties = new Properties();

        bundleProperties.load(new StringReader(serializedExtras));

        PersistableBundle extrasBundle = new PersistableBundle(bundleProperties.size());

        Set<String> propertyNames = bundleProperties.stringPropertyNames();

        for (String propertyName : propertyNames) {

            extrasBundle.putString(propertyName, bundleProperties.getProperty(propertyName));

        }

        return extrasBundle;

    }



    private static Intent createProvisioningIntentFromBundle(Bundle bundle) {

        requireNonNull(bundle);

core/java/android/content/pm/parsing/ApkLiteParseUtils.java

+6 −1
Original line number Diff line number Diff line
@@ -567,9 +567,14 @@ public class ApkLiteParseUtils { 
                    targetCode = minCode;

                }



                boolean allowUnknownCodenames = false;

                if ((flags & FrameworkParsingPackageUtils.PARSE_APK_IN_APEX) != 0) {

                    allowUnknownCodenames = true;

                }



                ParseResult<Integer> targetResult = FrameworkParsingPackageUtils.computeTargetSdkVersion(

                        targetVer, targetCode, SDK_CODENAMES, input,

                        /* allowUnknownCodenames= */ false);

                        allowUnknownCodenames);

                if (targetResult.isError()) {

                    return input.error(targetResult);

                }

core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ public class FrameworkParsingPackageUtils { 
    private static final int MAX_FILE_NAME_SIZE = 223;



    public static final int PARSE_IGNORE_OVERLAY_REQUIRED_SYSTEM_PROPERTY = 1 << 7;

    public static final int PARSE_APK_IN_APEX = 1 << 9;



    /**

     * Check if the given name is valid.