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

Unverified Commit 53b435fe authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-security-14.0.0_r22' into staging/lineage-21.0_android-security-14.0.0_r22 

Android Security 14.0.0 Release 22 (13793696)

* tag 'android-security-14.0.0_r22':
  Implement onNullBinding() in autofill service connection
  PrintSpooler: Require empty output for PDF
  RESTRICT AUTOMERGE Prevent root from getting unverified attributions from non system apps
  Check DPC package validity during package updates
  DevicePolicyManager: ignore invalid proxy settings
  Ensuring valid packageName when granting slice permission
  [RESTRICT AUTOMERGE] [appops] Preflight skip datasource validation
  [RESTRICT AUTOMERGE] Fix recording config mic indicator suppression
  [RESTRICT AUTOMERGE] appop: Finish all when last in chain fail
  [RESTRICT AUTOMERGE] Disallow PINNED in setLaunchWindowingMode
  Check sound Uri permission when creating a notification channel
  Don't allow SdkSandbox to bypass systemUid check.
  Calculate how much memory is used per account.
  Prevent non-system ShutdownActivity from being launched by BatteryService
  Don't allow hiding SysUi
  Avoid mixups between different CPSes in ZenModeConditions
  Revoke NLS permission if the last association has been removed
  Limits the display name to 1024 characters
  Do not allow custom animation of untrusted Toast
  Use consistent animation when forcibly hiding non system overlay
  RESTRICT AUTOMERGE Ignore pinned Windows
  Revert "Update CtsShim to use sharedUserId"
  Improve audio sharing password handling
  Unexport ControlsActivity
  Avoid home intent normalization if it is from trusted callers
  Revert "Check sound Uri permission when creating a notification channel"

Conflicts:
	packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothLeBroadcast.java
	services/core/java/com/android/server/BatteryService.java
	services/core/java/com/android/server/appop/AppOpsService.java
	services/core/java/com/android/server/notification/ConditionProviders.java
	services/core/java/com/android/server/notification/NotificationRecord.java
	services/core/java/com/android/server/pm/permission/PermissionManagerService.java
	services/core/java/com/android/server/wm/BackgroundActivityStartController.java
	services/core/java/com/android/server/wm/BackgroundLaunchProcessController.java
	services/core/java/com/android/server/wm/WindowProcessController.java
	services/tests/uiservicestests/src/com/android/server/notification/NotificationRecordTest.java
	services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java
	services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java
	services/tests/wmtests/src/com/android/server/wm/TaskLaunchParamsModifierTests.java

Change-Id: If79f5167432e8d82b2948c0938e95fb52037e3e2
parents 15e779d7 a771ce5d

core/java/android/app/admin/DeviceAdminInfo.java

+2 −0
Original line number Diff line number Diff line
@@ -397,6 +397,8 @@ public final class DeviceAdminInfo implements Parcelable { 
        } catch (NameNotFoundException e) {

            throw new XmlPullParserException(

                    "Unable to create context for: " + mActivityInfo.packageName);

        } catch (OutOfMemoryError e) {

            throw new XmlPullParserException("Out of memory when parsing", null, e);

        } finally {

            if (parser != null) parser.close();

        }

core/java/android/companion/AssociationRequest.java

+7 −0
Original line number Diff line number Diff line
@@ -233,6 +233,8 @@ public final class AssociationRequest implements Parcelable { 
     */

    private boolean mSkipPrompt;



    private static final int DISPLAY_NAME_LENGTH_LIMIT = 1024;



    /**

     * Creates a new AssociationRequest.

     *
@@ -419,6 +421,11 @@ public final class AssociationRequest implements Parcelable { 
        public Builder setDisplayName(@NonNull CharSequence displayName) {

            checkNotUsed();

            mDisplayName = requireNonNull(displayName);

            if (displayName.length() > DISPLAY_NAME_LENGTH_LIMIT) {

                throw new IllegalArgumentException("Length of the display name must be at most "

                        + DISPLAY_NAME_LENGTH_LIMIT + " characters");

            }



            return this;

        }

packages/CtsShim/build/Android.bp

+8 −36
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ genrule { 
  name: "generate_priv_manifest",

  srcs: [

    "shim_priv/AndroidManifest.xml",

        ":CtsShimPrivUpgrade",

    ":CtsShimPrivUpgrade"

  ],

  out: ["AndroidManifest.xml"],

  cmd: "sed -e s/__HASH__/`sha512sum -b $(location :CtsShimPrivUpgrade) | cut -d' ' -f1`/ $(location shim_priv/AndroidManifest.xml) > $(out)",
@@ -152,34 +152,6 @@ android_app { 
    ],

}



//##########################################################

// Variant: System app upgrade



android_app {

    name: "CtsShimUpgrade",



    sdk_version: "current",

    optimize: {

        enabled: false,

    },

    dex_preopt: {

        enabled: false,

    },



    manifest: "shim/AndroidManifestUpgrade.xml",

    min_sdk_version: "24",

}



genrule {

    name: "generate_shim_manifest",

    srcs: [

        "shim/AndroidManifest.xml",

        ":CtsShimUpgrade",

    ],

    out: ["AndroidManifest.xml"],

    cmd: "sed -e s/__HASH__/`sha512sum -b $(location :CtsShimUpgrade) | cut -d' ' -f1`/ $(location shim/AndroidManifest.xml) > $(out)",

}



//##########################################################

// Variant: System app
@@ -194,7 +166,7 @@ android_app { 
        enabled: false,

    },



    manifest: ":generate_shim_manifest",

    manifest: "shim/AndroidManifest.xml",

    apex_available: [

        "//apex_available:platform",

        "com.android.apex.cts.shim.v1",

packages/CtsShim/build/shim/AndroidManifest.xml

+3 −5
Original line number Diff line number Diff line
@@ -17,15 +17,13 @@ 
<!-- Manifest for the system CTS shim -->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:tools="http://schemas.android.com/tools"

    package="com.android.cts.ctsshim"

    android:sharedUserId="com.android.cts.ctsshim" >

    package="com.android.cts.ctsshim" >



    <uses-sdk

        android:minSdkVersion="24"

    <uses-sdk android:minSdkVersion="24"

        android:targetSdkVersion="28" />



    <restrict-update

        android:hash="__HASH__" />

        android:hash="__CAN_NOT_BE_UPDATED__" />



    <application

        android:hasCode="false"

packages/CtsShim/build/shim/AndroidManifestUpgrade.xml

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2016 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<!-- Manifest for the system CTS shim -->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:tools="http://schemas.android.com/tools"

    package="com.android.cts.ctsshim" >



    <uses-sdk

        android:minSdkVersion="24"

        android:targetSdkVersion="28" />



    <application

        android:hasCode="false"

        tools:ignore="AllowBackup,MissingApplicationIcon" />

</manifest>