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

Commit c66fd4a4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "FRP: Make SystemAPI"

parents 2e01b1d6 4f3ba354

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -315,6 +315,10 @@ package android.app { 
    method public void onInstantAppResolveInfo(java.util.List<android.content.pm.InstantAppResolveInfo>);

  }



  public class KeyguardManager {

    method public android.content.Intent createConfirmFactoryResetCredentialIntent(java.lang.CharSequence, java.lang.CharSequence, java.lang.CharSequence);

  }



  public class Notification implements android.os.Parcelable {

    field public static final java.lang.String EXTRA_ALLOW_DURING_SETUP = "android.allowDuringSetup";

    field public static final java.lang.String EXTRA_SUBSTITUTE_APP_NAME = "android.substName";

core/java/android/app/KeyguardManager.java

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.Manifest; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.annotation.SystemService;

import android.app.trust.ITrustManager;

import android.content.Context;
@@ -172,6 +173,7 @@ public class KeyguardManager { 
     *

     * @hide

     */

    @SystemApi

    public Intent createConfirmFactoryResetCredentialIntent(

            CharSequence title, CharSequence description, CharSequence alternateButtonLabel) {

        if (!LockPatternUtils.frpCredentialEnabled(mContext)) {