PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Cred mng app settings - close onRemove" into sc-dev

Browse Source
This commit is contained in:
Alex Johnston
2021-03-15 13:33:47 +00:00
committed by Android (Google) Code Review
parent e0c081b02e 6469518bf3
commit 74be0de267
2 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/com/android/settings/security/CredentialManagementAppButtonsController.java
View File

@@ -16,11 +16,8 @@
package com.android.settings.security; package com.android.settings.security;
import android.app.AppOpsManager;
import android.app.admin.DevicePolicyEventLogger; import android.app.admin.DevicePolicyEventLogger;
import android.content.Context; import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.os.RemoteException; import android.os.RemoteException;
@@ -29,6 +26,7 @@ import android.security.KeyChain;
import android.stats.devicepolicy.DevicePolicyEnums; import android.stats.devicepolicy.DevicePolicyEnums;
import android.util.Log; import android.util.Log;
import androidx.fragment.app.Fragment;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
import com.android.settings.R; import com.android.settings.R;
@@ -48,16 +46,15 @@ public class CredentialManagementAppButtonsController extends BasePreferenceCont
private final ExecutorService mExecutor = Executors.newSingleThreadExecutor(); private final ExecutorService mExecutor = Executors.newSingleThreadExecutor();
private final Handler mHandler = new Handler(Looper.getMainLooper()); private final Handler mHandler = new Handler(Looper.getMainLooper());
private final PackageManager mPackageManager;
private final AppOpsManager mAppOpsManager;
private boolean mHasCredentialManagerPackage; private boolean mHasCredentialManagerPackage;
private String mCredentialManagerPackageName; private Fragment mFragment;
public CredentialManagementAppButtonsController(Context context, String preferenceKey) { public CredentialManagementAppButtonsController(Context context, String preferenceKey) {
super(context, preferenceKey); super(context, preferenceKey);
mPackageManager = context.getPackageManager(); }
mAppOpsManager = context.getSystemService(AppOpsManager.class);
public void setParentFragment(Fragment fragment) {
mFragment = fragment;
} }
@Override @Override
@@ -73,7 +70,6 @@ public class CredentialManagementAppButtonsController extends BasePreferenceCont
try { try {
IKeyChainService service = KeyChain.bind(mContext).getService(); IKeyChainService service = KeyChain.bind(mContext).getService();
mHasCredentialManagerPackage = service.hasCredentialManagementApp(); mHasCredentialManagerPackage = service.hasCredentialManagementApp();
mCredentialManagerPackageName = service.getCredentialManagementAppPackageName();
} catch (InterruptedException | RemoteException e) { } catch (InterruptedException | RemoteException e) {
Log.e(TAG, "Unable to display credential management app buttons"); Log.e(TAG, "Unable to display credential management app buttons");
} }
@@ -91,24 +87,17 @@ public class CredentialManagementAppButtonsController extends BasePreferenceCont
} }
private void removeCredentialManagementApp() { private void removeCredentialManagementApp() {
try { mExecutor.execute(() -> {
ApplicationInfo appInfo = mPackageManager.getApplicationInfo( try {
mCredentialManagerPackageName, 0); IKeyChainService service = KeyChain.bind(mContext).getService();
mAppOpsManager.setMode(AppOpsManager.OP_MANAGE_CREDENTIALS, service.removeCredentialManagementApp();
appInfo.uid, mCredentialManagerPackageName, AppOpsManager.MODE_DEFAULT); DevicePolicyEventLogger
mExecutor.execute(() -> { .createEvent(DevicePolicyEnums.CREDENTIAL_MANAGEMENT_APP_REMOVED)
try { .write();
IKeyChainService service = KeyChain.bind(mContext).getService(); mFragment.getActivity().finish();
service.removeCredentialManagementApp(); } catch (InterruptedException | RemoteException e) {
DevicePolicyEventLogger Log.e(TAG, "Unable to remove the credential management app");
.createEvent(DevicePolicyEnums.CREDENTIAL_MANAGEMENT_APP_REMOVED) }
.write(); });
} catch (InterruptedException | RemoteException e) {
Log.e(TAG, "Unable to remove the credential management app");
}
});
} catch (PackageManager.NameNotFoundException e) {
Log.e(TAG, "Unable to remove the credential management app");
}
} }
} }

7
src/com/android/settings/security/CredentialManagementAppFragment.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.security; package com.android.settings.security;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
import android.content.Context;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.DashboardFragment;
@@ -47,6 +48,12 @@ public class CredentialManagementAppFragment extends DashboardFragment {
return SettingsEnums.CREDENTIAL_MANAGEMENT_APP; return SettingsEnums.CREDENTIAL_MANAGEMENT_APP;
} }
@Override
public void onAttach(Context context) {
super.onAttach(context);
use(CredentialManagementAppButtonsController.class).setParentFragment(this);
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.credential_management_app_fragment); new BaseSearchIndexProvider(R.xml.credential_management_app_fragment);
} }