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

Fix createConfirmDeviceCredentialIntent for wear for CTS.

Browse Source 
Bug: 33000237
Change-Id: I1fdb5a518c41ab005f12d3142763e374b38d7553
This commit is contained in:
Nancy Zheng
2016-11-18 18:15:09 -08:00
parent 447fff8589
commit 43f166dfb4
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,6 +21,7 @@ import android.annotation.RequiresPermission;
import android.app.trust.ITrustManager; import android.app.trust.ITrustManager;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.UserInfo; import android.content.pm.UserInfo;
import android.os.Binder; import android.os.Binder;
import android.os.RemoteException; import android.os.RemoteException;
@@ -44,6 +45,7 @@ public class KeyguardManager {
private IWindowManager mWM; private IWindowManager mWM;
private ITrustManager mTrustManager; private ITrustManager mTrustManager;
private IUserManager mUserManager; private IUserManager mUserManager;
private Context mContext;
/** /**
* Intent used to prompt user for device credentials. * Intent used to prompt user for device credentials.
@@ -86,8 +88,12 @@ public class KeyguardManager {
Intent intent = new Intent(ACTION_CONFIRM_DEVICE_CREDENTIAL); Intent intent = new Intent(ACTION_CONFIRM_DEVICE_CREDENTIAL);
intent.putExtra(EXTRA_TITLE, title); intent.putExtra(EXTRA_TITLE, title);
intent.putExtra(EXTRA_DESCRIPTION, description); 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. // For security reasons, only allow this to come from system settings.
intent.setPackage("com.android.settings"); intent.setPackage("com.android.settings");
}
return intent; return intent;
} }
@@ -108,8 +114,12 @@ public class KeyguardManager {
intent.putExtra(EXTRA_TITLE, title); intent.putExtra(EXTRA_TITLE, title);
intent.putExtra(EXTRA_DESCRIPTION, description); intent.putExtra(EXTRA_DESCRIPTION, description);
intent.putExtra(Intent.EXTRA_USER_ID, userId); 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. // For security reasons, only allow this to come from system settings.
intent.setPackage("com.android.settings"); intent.setPackage("com.android.settings");
}
return intent; return intent;
} }
@@ -191,7 +201,8 @@ public class KeyguardManager {
} }
KeyguardManager() { KeyguardManager(Context context) {
mContext = context;
mWM = WindowManagerGlobal.getWindowManagerService(); mWM = WindowManagerGlobal.getWindowManagerService();
mTrustManager = ITrustManager.Stub.asInterface( mTrustManager = ITrustManager.Stub.asInterface(
ServiceManager.getService(Context.TRUST_SERVICE)); ServiceManager.getService(Context.TRUST_SERVICE));

6
core/java/android/app/SystemServiceRegistry.java
View File

@@ -320,10 +320,10 @@ final class SystemServiceRegistry {
}}); }});
registerService(Context.KEYGUARD_SERVICE, KeyguardManager.class, registerService(Context.KEYGUARD_SERVICE, KeyguardManager.class,
new StaticServiceFetcher<KeyguardManager>() { new CachedServiceFetcher<KeyguardManager>() {
@Override @Override
public KeyguardManager createService() { public KeyguardManager createService(ContextImpl ctx) {
return new KeyguardManager(); return new KeyguardManager(ctx);
}}); }});
registerService(Context.LAYOUT_INFLATER_SERVICE, LayoutInflater.class, registerService(Context.LAYOUT_INFLATER_SERVICE, LayoutInflater.class,