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

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

Make change and version bump to r_aml_300802500 for mainline module file:... 

Make change and version bump to r_aml_300802500 for mainline module file: packages/Tethering/apex/manifest.json

Change-Id: I679f091959d2cc72015bde3fa0bb2f6b7bd5d074
parents 2b49d85e 96063e36

apex/extservices/apex_manifest.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "com.android.extservices",

  "version": 300802400

  "version": 300802500

}

apex/permission/apex_manifest.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "com.android.permission",

  "version": 300802400

  "version": 300802500

}

apex/statsd/apex_manifest.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "com.android.os.statsd",

  "version": 300802400

  "version": 300802500

}

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5264,6 +5264,7 @@ package android.view.autofill { 
    ctor public AutofillId(int, int);

    ctor public AutofillId(@NonNull android.view.autofill.AutofillId, long, int);

    method public boolean equalsIgnoreSession(@Nullable android.view.autofill.AutofillId);

    method @NonNull public static android.view.autofill.AutofillId withoutSession(@NonNull android.view.autofill.AutofillId);

  }



  public final class AutofillManager {

core/java/android/app/ActivityView.java

+16 −2
Original line number Diff line number Diff line
@@ -33,7 +33,10 @@ import android.hardware.display.VirtualDisplay; 
import android.os.Bundle;

import android.os.UserHandle;

import android.util.AttributeSet;

import android.util.DisplayMetrics;

import android.util.Log;

import android.view.Display;

import android.view.DisplayInfo;

import android.view.IWindow;

import android.view.IWindowManager;

import android.view.KeyEvent;
@@ -407,6 +410,9 @@ public class ActivityView extends ViewGroup implements android.window.TaskEmbedd 
    }



    private class SurfaceCallback implements SurfaceHolder.Callback {

        private final DisplayInfo mTempDisplayInfo = new DisplayInfo();

        private final DisplayMetrics mTempMetrics = new DisplayMetrics();



        @Override

        public void surfaceCreated(SurfaceHolder surfaceHolder) {

            if (!mTaskEmbedder.isInitialized()) {
@@ -415,14 +421,22 @@ public class ActivityView extends ViewGroup implements android.window.TaskEmbedd 
                mTmpTransaction.reparent(mTaskEmbedder.getSurfaceControl(),

                        mSurfaceView.getSurfaceControl()).apply();

            }

            mTaskEmbedder.resizeTask(getWidth(), getHeight());

            mTaskEmbedder.start();

        }



        @Override

        public void surfaceChanged(SurfaceHolder surfaceHolder, int format, int width, int height) {

            final Display display = getVirtualDisplay().getDisplay();

            if (!display.getDisplayInfo(mTempDisplayInfo)) {

                return;

            }

            mTempDisplayInfo.getAppMetrics(mTempMetrics);

            if (width != mTempMetrics.widthPixels || height != mTempMetrics.heightPixels) {

                mTaskEmbedder.resizeTask(width, height);

                mTaskEmbedder.notifyBoundsChanged();

            }

        }



        @Override

        public void surfaceDestroyed(SurfaceHolder surfaceHolder) {