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

Commit ed37f17a authored by Andrei-Valentin Onea's avatar Andrei-Valentin Onea Committed by Android (Google) Code Review
Browse files

Merge changes from topic "android-internal-srcs"

* changes:
  Add @UnsupportedAppUsage annotations
  Add android internal dirs to hiddenapi-mappings
parents 273033ea 15884391
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -1626,6 +1626,7 @@ droidstubs {
        ":openjdk_java_files",
        ":non_openjdk_java_files",
        ":opt-telephony-common-srcs",
        "core/java/**/*.java",
    ],
    arg_files: [
        "core/res/AndroidManifest.xml",
+0 −268

File changed.

Preview size limit exceeded, changes collapsed.

+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);
    }
+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@
package com.android.internal.app;

import android.annotation.NonNull;
import android.annotation.UnsupportedAppUsage;
import android.content.ComponentName;
import android.content.Context;
import android.content.pm.ApplicationInfo;
@@ -42,6 +43,7 @@ public class AssistUtils {
    private final Context mContext;
    private final IVoiceInteractionManagerService mVoiceInteractionManagerService;

    @UnsupportedAppUsage
    public AssistUtils(Context context) {
        mContext = context;
        mVoiceInteractionManagerService = IVoiceInteractionManagerService.Stub.asInterface(
@@ -168,6 +170,7 @@ public class AssistUtils {
        }
    }

    @UnsupportedAppUsage
    public ComponentName getAssistComponentForUser(int userId) {
        final String setting = Settings.Secure.getStringForUser(mContext.getContentResolver(),
                Settings.Secure.ASSISTANT, userId);
+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.animation.AnimatorSet;
import android.animation.ObjectAnimator;
import android.animation.ValueAnimator;
import android.annotation.IntDef;
import android.annotation.UnsupportedAppUsage;
import android.app.Activity;
import android.app.ActivityManager;
import android.app.prediction.AppPredictionContext;
Loading