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

Commit db7fd6ee authored by Mathew Inwood's avatar Mathew Inwood
Browse files

resolve merge conflicts of 20fcc2eb to stage-aosp-master 

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: I9437532ae617eda28aa5ae796563e985cc0ddbca
Change-Id: Ifa50d21fb63b7ac73ab2ddaeebb1e01f535595c7
parents dc5ad0b6 20fcc2eb

config/hiddenapi-light-greylist.txt

+0 −3
Original line number Original line Diff line number Diff line 
Landroid/accessibilityservice/AccessibilityService;->mInfo:Landroid/accessibilityservice/AccessibilityServiceInfo;

Landroid/accessibilityservice/AccessibilityService;->mWindowToken:Landroid/os/IBinder;

Landroid/accessibilityservice/AccessibilityServiceInfo;->setCapabilities(I)V

Landroid/accessibilityservice/IAccessibilityServiceConnection$Stub;-><init>()V

Landroid/accessibilityservice/IAccessibilityServiceConnection$Stub;-><init>()V

Landroid/accessibilityservice/IAccessibilityServiceConnection$Stub;->asInterface(Landroid/os/IBinder;)Landroid/accessibilityservice/IAccessibilityServiceConnection;

Landroid/accessibilityservice/IAccessibilityServiceConnection$Stub;->asInterface(Landroid/os/IBinder;)Landroid/accessibilityservice/IAccessibilityServiceConnection;

Landroid/accounts/Account;->accessId:Ljava/lang/String;

Landroid/accounts/Account;->accessId:Ljava/lang/String;

core/java/android/accessibilityservice/AccessibilityService.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ import android.annotation.IntDef; 
import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.RequiresPermission;

import android.annotation.UnsupportedAppUsage;

import android.app.Service;

import android.app.Service;

import android.content.Context;

import android.content.Context;

import android.content.Intent;

import android.content.Intent;
@@ -407,8 +408,10 @@ public abstract class AccessibilityService extends Service { 




    private int mConnectionId = AccessibilityInteractionClient.NO_ID;

    private int mConnectionId = AccessibilityInteractionClient.NO_ID;





    @UnsupportedAppUsage

    private AccessibilityServiceInfo mInfo;

    private AccessibilityServiceInfo mInfo;





    @UnsupportedAppUsage

    private IBinder mWindowToken;

    private IBinder mWindowToken;





    private WindowManager mWindowManager;

    private WindowManager mWindowManager;

core/java/android/accessibilityservice/AccessibilityServiceInfo.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ package android.accessibilityservice; 
import static android.content.pm.PackageManager.FEATURE_FINGERPRINT;

import static android.content.pm.PackageManager.FEATURE_FINGERPRINT;





import android.annotation.IntDef;

import android.annotation.IntDef;

import android.annotation.UnsupportedAppUsage;

import android.content.ComponentName;

import android.content.ComponentName;

import android.content.Context;

import android.content.Context;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager;
@@ -695,6 +696,7 @@ public class AccessibilityServiceInfo implements Parcelable { 
     *

     *

     * @hide

     * @hide

     */

     */

    @UnsupportedAppUsage

    public void setCapabilities(int capabilities) {

    public void setCapabilities(int capabilities) {

        mCapabilities = capabilities;

        mCapabilities = capabilities;

    }

    }