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

Commit 41e2d749 authored by Nathan Harold's avatar Nathan Harold Committed by android-build-merger
Browse files

Merge "Move some members to the "Q blacklist"." am: f5cf9f24 

am: 13c9e7e2

Change-Id: Ia2419cce28d26d9464da2a5172cb332b629e943e
parents db0e0f8c 13c9e7e2

core/java/android/accessibilityservice/AccessibilityService.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.Intent;

import android.content.pm.ParceledListSlice;

import android.content.pm.ParceledListSlice;

import android.graphics.Region;

import android.graphics.Region;

import android.os.Build;

import android.os.Handler;

import android.os.Handler;

import android.os.IBinder;

import android.os.IBinder;

import android.os.Looper;

import android.os.Looper;
@@ -411,7 +412,7 @@ public abstract class AccessibilityService extends Service { 
    @UnsupportedAppUsage

    @UnsupportedAppUsage

    private AccessibilityServiceInfo mInfo;

    private AccessibilityServiceInfo mInfo;





    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)

    private IBinder mWindowToken;

    private IBinder mWindowToken;





    private WindowManager mWindowManager;

    private WindowManager mWindowManager;

core/java/android/app/Activity.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -847,7 +847,7 @@ public class Activity extends ContextThemeWrapper 
    /*package*/ ActionBar mActionBar = null;

    /*package*/ ActionBar mActionBar = null;

    private boolean mEnableDefaultActionBarUp;

    private boolean mEnableDefaultActionBarUp;





    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)

    private VoiceInteractor mVoiceInteractor;

    private VoiceInteractor mVoiceInteractor;





    @UnsupportedAppUsage

    @UnsupportedAppUsage
@@ -7086,7 +7086,7 @@ public class Activity extends ContextThemeWrapper 




    // ------------------ Internal API ------------------

    // ------------------ Internal API ------------------





    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)

    final void setParent(Activity parent) {

    final void setParent(Activity parent) {

        mParent = parent;

        mParent = parent;

    }

    }

core/java/android/app/ActivityManager.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -1344,7 +1344,7 @@ public class ActivityManager { 
         * @return The background color.

         * @return The background color.

         * @hide

         * @hide

         */

         */

        @UnsupportedAppUsage

        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)

        public int getBackgroundColor() {

        public int getBackgroundColor() {

            return mColorBackground;

            return mColorBackground;

        }

        }

core/java/android/app/ActivityThread.java

+8 −8
Original line number Original line Diff line number Diff line
@@ -334,7 +334,7 @@ public final class ActivityThread extends ClientTransactionHandler { 
    // An executor that performs multi-step transactions.

    // An executor that performs multi-step transactions.

    private final TransactionExecutor mTransactionExecutor = new TransactionExecutor(this);

    private final TransactionExecutor mTransactionExecutor = new TransactionExecutor(this);





    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)

    private final ResourcesManager mResourcesManager;

    private final ResourcesManager mResourcesManager;





    private static final class ProviderKey {

    private static final class ProviderKey {
@@ -368,7 +368,7 @@ public final class ActivityThread extends ClientTransactionHandler { 
    @UnsupportedAppUsage

    @UnsupportedAppUsage

    final ArrayMap<IBinder, ProviderRefCount> mProviderRefCountMap

    final ArrayMap<IBinder, ProviderRefCount> mProviderRefCountMap

        = new ArrayMap<IBinder, ProviderRefCount>();

        = new ArrayMap<IBinder, ProviderRefCount>();

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)

    final ArrayMap<IBinder, ProviderClientRecord> mLocalProviders

    final ArrayMap<IBinder, ProviderClientRecord> mLocalProviders

        = new ArrayMap<IBinder, ProviderClientRecord>();

        = new ArrayMap<IBinder, ProviderClientRecord>();

    @UnsupportedAppUsage

    @UnsupportedAppUsage
@@ -388,7 +388,7 @@ public final class ActivityThread extends ClientTransactionHandler { 
    final GcIdler mGcIdler = new GcIdler();

    final GcIdler mGcIdler = new GcIdler();

    boolean mGcIdlerScheduled = false;

    boolean mGcIdlerScheduled = false;





    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)

    static volatile Handler sMainThreadHandler;  // set once in main()

    static volatile Handler sMainThreadHandler;  // set once in main()





    Bundle mCoreSettings = null;

    Bundle mCoreSettings = null;
@@ -450,7 +450,7 @@ public final class ActivityThread extends ClientTransactionHandler { 
        private int mLifecycleState = PRE_ON_CREATE;

        private int mLifecycleState = PRE_ON_CREATE;





        @VisibleForTesting

        @VisibleForTesting

        @UnsupportedAppUsage

        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)

        public ActivityClientRecord() {

        public ActivityClientRecord() {

            this.isForward = false;

            this.isForward = false;

            init();

            init();
@@ -698,7 +698,7 @@ public final class ActivityThread extends ClientTransactionHandler { 
        @UnsupportedAppUsage

        @UnsupportedAppUsage

        boolean persistent;

        boolean persistent;

        Configuration config;

        Configuration config;

        @UnsupportedAppUsage

        @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)

        CompatibilityInfo compatInfo;

        CompatibilityInfo compatInfo;

        String buildSerial;

        String buildSerial;
@@ -2025,7 +2025,7 @@ public final class ActivityThread extends ClientTransactionHandler { 
        return mH;

        return mH;

    }

    }





    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)

    public final LoadedApk getPackageInfo(String packageName, CompatibilityInfo compatInfo,

    public final LoadedApk getPackageInfo(String packageName, CompatibilityInfo compatInfo,

            int flags) {

            int flags) {

        return getPackageInfo(packageName, compatInfo, flags, UserHandle.myUserId());

        return getPackageInfo(packageName, compatInfo, flags, UserHandle.myUserId());
@@ -2114,7 +2114,7 @@ public final class ActivityThread extends ClientTransactionHandler { 
        return getPackageInfo(ai, compatInfo, null, false, true, false);

        return getPackageInfo(ai, compatInfo, null, false, true, false);

    }

    }





    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)

    public final LoadedApk peekPackageInfo(String packageName, boolean includeCode) {

    public final LoadedApk peekPackageInfo(String packageName, boolean includeCode) {

        synchronized (mResourcesManager) {

        synchronized (mResourcesManager) {

            WeakReference<LoadedApk> ref;

            WeakReference<LoadedApk> ref;
@@ -2787,7 +2787,7 @@ public final class ActivityThread extends ClientTransactionHandler { 
        return aInfo;

        return aInfo;

    }

    }





    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)

    public final Activity startActivityNow(Activity parent, String id,

    public final Activity startActivityNow(Activity parent, String id,

        Intent intent, ActivityInfo activityInfo, IBinder token, Bundle state,

        Intent intent, ActivityInfo activityInfo, IBinder token, Bundle state,

        Activity.NonConfigurationInstances lastNonConfigurationInstances) {

        Activity.NonConfigurationInstances lastNonConfigurationInstances) {

core/java/android/app/ContentProviderHolder.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ import android.annotation.UnsupportedAppUsage; 
import android.content.ContentProviderNative;

import android.content.ContentProviderNative;

import android.content.IContentProvider;

import android.content.IContentProvider;

import android.content.pm.ProviderInfo;

import android.content.pm.ProviderInfo;

import android.os.Build;

import android.os.IBinder;

import android.os.IBinder;

import android.os.Parcel;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.Parcelable;
@@ -35,7 +36,7 @@ public class ContentProviderHolder implements Parcelable { 
    @UnsupportedAppUsage

    @UnsupportedAppUsage

    public IContentProvider provider;

    public IContentProvider provider;

    public IBinder connection;

    public IBinder connection;

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)

    public boolean noReleaseNeeded;

    public boolean noReleaseNeeded;





    @UnsupportedAppUsage

    @UnsupportedAppUsage