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

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

Snap for 9704301 from 931859a1 to tm-qpr3-release 

Change-Id: I7f0705dc2b50e4c8aa55c4c60e6aa31082476f74
parents b6a73c19 931859a1

core/java/android/content/AttributionSource.java

+17 −3
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.os.Parcelable; 
import android.os.Process;

import android.permission.PermissionManager;

import android.util.ArraySet;

import android.util.Log;



import com.android.internal.annotations.Immutable;
@@ -87,6 +88,8 @@ import java.util.Set; 
 */

@Immutable

public final class AttributionSource implements Parcelable {

    private static final String TAG = "AttributionSource";



    private static final String DESCRIPTOR = "android.content.AttributionSource";



    private static final Binder sDefaultToken = new Binder(DESCRIPTOR);
@@ -154,10 +157,21 @@ public final class AttributionSource implements Parcelable { 
    AttributionSource(@NonNull Parcel in) {

        this(AttributionSourceState.CREATOR.createFromParcel(in));



        if (!Binder.isDirectlyHandlingTransaction()) {

            Log.e(TAG, "Unable to verify calling UID #" + mAttributionSourceState.uid + " PID #"

                    + mAttributionSourceState.pid + " when not handling Binder transaction; "

                    + "clearing.");

            mAttributionSourceState.pid = -1;

            mAttributionSourceState.uid = -1;

            mAttributionSourceState.packageName = null;

            mAttributionSourceState.attributionTag = null;

            mAttributionSourceState.next = null;

        } else {

            // Since we just unpacked this object as part of it transiting a Binder

            // call, this is the perfect time to enforce that its UID and PID can be trusted

            enforceCallingUidAndPid();

        }

    }



    /** @hide */

    public AttributionSource(@NonNull AttributionSourceState attributionSourceState) {

libs/WindowManager/Shell/res/color/split_divider_background.xml→libs/WindowManager/Shell/res/color-night/taskbar_background.xml

+2 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2021 The Android Open Source Project

  ~ Copyright (C) 2023 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.
@@ -14,6 +14,7 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<!-- Should be the same as in packages/apps/Launcher3/res/color-night-v31/taskbar_background.xml -->

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

    <item android:color="@android:color/system_neutral1_500" android:lStar="15" />

</selector>
 
 No newline at end of file

libs/WindowManager/Shell/res/color/taskbar_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,5 +16,5 @@ 
  -->

<!-- Should be the same as in packages/apps/Launcher3/res/color-v31/taskbar_background.xml -->

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

    <item android:color="@android:color/system_neutral1_500" android:lStar="15" />

    <item android:color="@android:color/system_neutral1_500" android:lStar="95" />

</selector>
 
 No newline at end of file

libs/WindowManager/Shell/res/values-night/colors.xml

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
  -->



<resources>

    <color name="docked_divider_handle">#ffffff</color>

    <!-- Bubbles -->

    <color name="bubbles_icon_tint">@color/GM2_grey_200</color>

    <!-- Splash screen-->

libs/WindowManager/Shell/res/values/colors.xml

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
 */

-->

<resources>

    <color name="docked_divider_handle">#ffffff</color>

    <color name="docked_divider_handle">#000000</color>

    <color name="split_divider_background">@color/taskbar_background</color>

    <drawable name="forced_resizable_background">#59000000</drawable>

    <color name="minimize_dock_shadow_start">#60000000</color>

    <color name="minimize_dock_shadow_end">#00000000</color>