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

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

Merge "Merge commit '12562abc' into manual_merge_12562abcd47d"

parents 1a292884 6111e23d

core/java/android/app/KeyguardManager.java

+22 −17
Original line number Diff line number Diff line
@@ -24,25 +24,25 @@ import android.app.trust.ITrustManager; 
import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.os.Binder;

import android.os.Handler;

import android.os.IBinder;

import android.os.Looper;

import android.os.PowerManager;

import android.os.RemoteException;

import android.os.IBinder;

import android.os.IUserManager;

import android.os.ServiceManager;

import android.os.ServiceManager.ServiceNotFoundException;

import android.os.UserHandle;

import android.util.Log;

import android.view.IWindowManager;

import android.view.IOnKeyguardExitResult;

import android.view.WindowManager;

import android.view.IWindowManager;

import android.view.WindowManager.LayoutParams;

import android.view.WindowManagerGlobal;



import com.android.internal.policy.IKeyguardDismissCallback;



import java.util.List;



/**

 * Class that can be used to lock and unlock the keyboard. Get an instance of this

 * class by calling {@link android.content.Context#getSystemService(java.lang.String)}
@@ -100,12 +100,9 @@ public class KeyguardManager { 
        Intent intent = new Intent(ACTION_CONFIRM_DEVICE_CREDENTIAL);

        intent.putExtra(EXTRA_TITLE, title);

        intent.putExtra(EXTRA_DESCRIPTION, description);

        if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)) {

            intent.setPackage("com.google.android.apps.wearable.settings");

        } else {

            // For security reasons, only allow this to come from system settings.

            intent.setPackage("com.android.settings");

        }



        // explicitly set the package for security

        intent.setPackage(getSettingsPackageForIntent(intent));

        return intent;

    }
@@ -126,15 +123,23 @@ public class KeyguardManager { 
        intent.putExtra(EXTRA_TITLE, title);

        intent.putExtra(EXTRA_DESCRIPTION, description);

        intent.putExtra(Intent.EXTRA_USER_ID, userId);

        if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)) {

            intent.setPackage("com.google.android.apps.wearable.settings");

        } else {

            // For security reasons, only allow this to come from system settings.

            intent.setPackage("com.android.settings");

        }



        // explicitly set the package for security

        intent.setPackage(getSettingsPackageForIntent(intent));



        return intent;

    }



    private String getSettingsPackageForIntent(Intent intent) {

        List<ResolveInfo> resolveInfos = mContext.getPackageManager()

                .queryIntentActivities(intent, PackageManager.MATCH_SYSTEM_ONLY);

        for (int i = 0; i < resolveInfos.size(); i++) {

            return resolveInfos.get(i).activityInfo.packageName;

        }



        return "com.android.settings";

    }



    /**

     * @deprecated Use {@link LayoutParams#FLAG_DISMISS_KEYGUARD}

     * and/or {@link LayoutParams#FLAG_SHOW_WHEN_LOCKED}