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

Commit 6acb2106 authored by Andrei-Valentin Onea's avatar Andrei-Valentin Onea Committed by android-build-merger
Browse files

Merge changes from topic "unsupported-internal" 

am: 2f573ac6

Change-Id: I0fedf5c754a59a9c57b3abd00adff00d58b4930c
parents 310609b8 2f573ac6

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -1552,6 +1552,7 @@ droidstubs { 
        ":openjdk_java_files",

        ":non_openjdk_java_files",

        ":opt-telephony-common-srcs",

        "core/java/**/*.java",

    ],

    arg_files: [

        "core/res/AndroidManifest.xml",

config/hiddenapi-greylist.txt

+0 −269

File changed.

Preview size limit exceeded, changes collapsed.

core/java/com/android/internal/app/AlertActivity.java

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.internal.app;



import android.annotation.UnsupportedAppUsage;

import android.app.Activity;

import android.app.Dialog;

import android.content.DialogInterface;
@@ -38,11 +39,13 @@ public abstract class AlertActivity extends Activity implements DialogInterface 
     * 

     * @see #mAlertParams

     */

    @UnsupportedAppUsage

    protected AlertController mAlert;



    /**

     * The parameters for the alert.

     */

    @UnsupportedAppUsage

    protected AlertController.AlertParams mAlertParams;



    @Override
@@ -90,6 +93,7 @@ public abstract class AlertActivity extends Activity implements DialogInterface 
     * @see #mAlert

     * @see #mAlertParams

     */

    @UnsupportedAppUsage

    protected void setupAlert() {

        mAlert.installContent(mAlertParams);

    }

core/java/com/android/internal/app/AssistUtils.java

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.internal.app; 


import com.android.internal.R;



import android.annotation.UnsupportedAppUsage;

import android.app.SearchManager;

import android.content.ComponentName;

import android.content.Context;
@@ -43,6 +44,7 @@ public class AssistUtils { 
    private final Context mContext;

    private final IVoiceInteractionManagerService mVoiceInteractionManagerService;



    @UnsupportedAppUsage

    public AssistUtils(Context context) {

        mContext = context;

        mVoiceInteractionManagerService = IVoiceInteractionManagerService.Stub.asInterface(
@@ -145,6 +147,7 @@ public class AssistUtils { 
        }

    }



    @UnsupportedAppUsage

    public ComponentName getAssistComponentForUser(int userId) {

        final String setting = Settings.Secure.getStringForUser(mContext.getContentResolver(),

                Settings.Secure.ASSISTANT, userId);

core/java/com/android/internal/app/ChooserActivity.java

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.animation.Animator; 
import android.animation.AnimatorListenerAdapter;

import android.animation.ObjectAnimator;

import android.annotation.NonNull;

import android.annotation.UnsupportedAppUsage;

import android.app.Activity;

import android.app.ActivityManager;

import android.app.usage.UsageStatsManager;