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

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

Snap for 6169764 from 7a091e33 to qt-qpr3-release

Change-Id: I77306d69a7804a51a2eb965db1f3e512104d5e82
parents 3b162846 7a091e33
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -1157,8 +1157,11 @@ public final class AssetManager implements AutoCloseable {
            }
        }

        synchronized (this) {
            if (mObject != 0) {
                nativeDestroy(mObject);
                mObject = 0;
            }
        }
    }

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ public class NotificationRowBinderImpl implements NotificationRowBinder {
            entry.updateIcons(mContext, sbn);
            entry.reset();
            updateNotification(entry, pmUser, sbn, entry.getRow());
            entry.getRow().setOnDismissRunnable(onDismissRunnable);
        } else {
            entry.createIcons(mContext, sbn);
            new RowInflaterTask().inflate(mContext, parent, entry,
+14 −2
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.graphics.RectF;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.os.UserManager;
import android.provider.Settings;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.ImageView;
@@ -81,8 +82,19 @@ final class CarUserSwitchingDialog extends UserSwitchingDialog {
                    .setImageDrawable(drawable);
        }

        ((TextView) view.findViewById(R.id.user_loading))
                .setText(res.getString(R.string.car_loading_profile));
        TextView msgView = view.findViewById(R.id.user_loading);

        // TODO(b/145132885): use constant from CarSettings
        boolean showInfo = "true".equals(Settings.Global.getString(
                getContext().getContentResolver(),
                "android.car.ENABLE_USER_SWITCH_DEVELOPER_MESSAGE"));

        if (showInfo) {
            msgView.setText(res.getString(R.string.car_loading_profile) + " user\n(from "
                    + mOldUser.id + " to " + mNewUser.id + ")");
        } else {
            msgView.setText(res.getString(R.string.car_loading_profile));
        }
        setView(view);
    }