Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Query for the settings package in KeyguardManager instead of

Browse Source 
hardcoding it.

Bug: 33047002
Change-Id: I57bfab4750540789937d50c72ec05bb7a4535ae1
This commit is contained in:
Nancy Zheng
2016-11-21 15:46:08 -08:00
parent 5e7fc7ccc8
commit e256a18dcd
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
core/java/android/app/KeyguardManager.java
View File

@@ -22,18 +22,19 @@ import android.app.trust.ITrustManager;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.UserInfo;
import android.content.pm.ResolveInfo;
import android.os.Binder;
import android.os.RemoteException;
import android.os.IBinder;
import android.os.IUserManager;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.UserHandle;
import android.os.UserManager;
import android.view.IWindowManager;
import android.view.IOnKeyguardExitResult;
import android.view.IWindowManager;
import android.view.WindowManagerGlobal;
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)}
@@ -88,12 +89,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;
}
@@ -114,15 +112,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 android.view.WindowManager.LayoutParams#FLAG_DISMISS_KEYGUARD}
* and/or {@link android.view.WindowManager.LayoutParams#FLAG_SHOW_WHEN_LOCKED}