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

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

Snap for 8961426 from fc1f09ff to tm-qpr1-release 

Change-Id: I6f7bf146f798f73ac7c13f228fc16f4aad1c3da5
parents 90f35621 fc1f09ff

apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java

+8 −6
Original line number Diff line number Diff line
@@ -5262,6 +5262,7 @@ public class AlarmManagerService extends SystemService { 
                                        + TareBill.getName(bill) + " changed to " + canAfford);

                    }



                    synchronized (mLock) {

                        ArrayMap<EconomyManagerInternal.ActionBill, Boolean> actionAffordability =

                                mAffordabilityCache.get(userId, packageName);

                        if (actionAffordability == null) {
@@ -5269,6 +5270,7 @@ public class AlarmManagerService extends SystemService { 
                            mAffordabilityCache.add(userId, packageName, actionAffordability);

                        }

                        actionAffordability.put(bill, canAfford);

                    }



                    mHandler.obtainMessage(AlarmHandler.TARE_AFFORDABILITY_CHANGED, userId,

                            canAfford ? 1 : 0, packageName)

cmds/uiautomator/library/core-src/com/android/uiautomator/core/UiDevice.java

+2 −2
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ public class UiDevice { 
        Tracer.trace();

        Display display = getAutomatorBridge().getDefaultDisplay();

        Point p = new Point();

        display.getSize(p);

        display.getRealSize(p);

        return p.x;

    }
@@ -394,7 +394,7 @@ public class UiDevice { 
        Tracer.trace();

        Display display = getAutomatorBridge().getDefaultDisplay();

        Point p = new Point();

        display.getSize(p);

        display.getRealSize(p);

        return p.y;

    }

core/java/android/service/dreams/IDreamManager.aidl

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ interface IDreamManager { 
    void testDream(int userId, in ComponentName componentName);

    @UnsupportedAppUsage

    boolean isDreaming();

    @UnsupportedAppUsage

    boolean isDreamingOrInPreview();

    void finishSelf(in IBinder token, boolean immediate);

    void startDozing(in IBinder token, int screenState, int screenBrightness);

    void stopDozing(in IBinder token);

core/java/com/android/internal/policy/DecorContext.java

+9 −0
Original line number Diff line number Diff line
@@ -137,4 +137,13 @@ public class DecorContext extends ContextThemeWrapper { 
        }

        return false;

    }



    @Override

    public boolean isConfigurationContext() {

        Context context = mContext.get();

        if (context != null) {

            return context.isConfigurationContext();

        }

        return false;

    }

}

core/java/com/android/internal/widget/LocalImageResolver.java

+7 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.graphics.ImageDecoder; 
import android.graphics.drawable.Drawable;

import android.graphics.drawable.Icon;

import android.net.Uri;

import android.text.TextUtils;

import android.util.Log;

import android.util.Size;
@@ -108,6 +109,12 @@ public class LocalImageResolver { 
                }

                break;

            case Icon.TYPE_RESOURCE:

                if (!(TextUtils.isEmpty(icon.getResPackage())

                        || context.getPackageName().equals(icon.getResPackage()))) {

                    // We can't properly resolve icons from other packages here, so fall back.

                    return icon.loadDrawable(context);

                }



                Drawable result = resolveImage(icon.getResId(), context, maxWidth, maxHeight);

                if (result != null) {

                    return tintDrawable(icon, result);