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

Commit c89cb97e authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7128020 from d11f218b to rvc-qpr3-release 

Change-Id: I82b14dd82f710d884e14357ca9832195cc26d84a
parents def7a267 d11f218b

core/java/android/app/admin/DevicePolicyManager.java

+1 −1
Original line number Diff line number Diff line
@@ -7000,7 +7000,7 @@ public class DevicePolicyManager { 
        throwIfParentInstance("isProfileOwnerApp");

        if (mService != null) {

            try {

                ComponentName profileOwner = mService.getProfileOwnerAsUser(myUserId());

                ComponentName profileOwner = mService.getProfileOwner(myUserId());

                return profileOwner != null

                        && profileOwner.getPackageName().equals(packageName);

            } catch (RemoteException re) {

core/java/android/app/admin/IDevicePolicyManager.aidl

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ interface IDevicePolicyManager { 


    boolean setProfileOwner(in ComponentName who, String ownerName, int userHandle);

    ComponentName getProfileOwnerAsUser(int userHandle);

    ComponentName getProfileOwner(int userHandle);

    ComponentName getProfileOwnerOrDeviceOwnerSupervisionComponent(in UserHandle userHandle);

    String getProfileOwnerName(int userHandle);

    void setProfileEnabled(in ComponentName who);

core/java/android/view/InsetsAnimationThreadControlRunner.java

+3 −0
Original line number Diff line number Diff line
@@ -108,6 +108,9 @@ public class InsetsAnimationThreadControlRunner implements InsetsAnimationContro 
        mControl = new InsetsAnimationControlImpl(controls, frame, state, listener,

                types, mCallbacks, durationMs, interpolator, animationType);

        InsetsAnimationThread.getHandler().post(() -> {

            if (mControl.isCancelled()) {

                return;

            }

            Trace.asyncTraceBegin(Trace.TRACE_TAG_VIEW,

                    "InsetsAsyncAnimation: " + WindowInsets.Type.toString(types), types);

            listener.onReady(mControl, types);

core/res/res/color-car/car_borderless_button_text_color.xml

+1 −0
Original line number Diff line number Diff line
@@ -16,5 +16,6 @@ limitations under the License. 
<!-- Default text colors for car buttons when enabled/disabled. -->

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

    <item android:color="@*android:color/car_grey_700" android:state_enabled="false"/>

    <item android:color="@*android:color/car_grey_700" android:state_ux_restricted="true"/>

    <item android:color="?android:attr/colorButtonNormal"/>

</selector>

core/res/res/color-car/car_switch_track.xml

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

<!-- Copyright (C) 2014 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.

-->

<!-- copy of switch_track_material, but with a ux restricted state -->

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

    <item android:state_enabled="false"

          android:color="?attr/colorForeground"

          android:alpha="?attr/disabledAlpha" />

    <item android:state_ux_restricted="true"

          android:color="?attr/colorForeground"

          android:alpha="?attr/disabledAlpha" />

    <item android:state_checked="true"

          android:color="?attr/colorControlActivated" />

    <item android:color="?attr/colorForeground" />

</selector>