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

DO Disclosures: detailed application lists

Browse Source 
Add UI that lists enterprise set default apps for handling important intents
(opening browser, using camera, phone, etc).

Bug: 32692748
Test: m RunSettingsRoboTests
Merged-In: I75bb97d1b3728b1dcb90981b24d12edf510c4b04
Change-Id: I7d0041e4fada48bc56f6a6637614ac4471dba65a
(cherry picked from commit f0a61dd112)
This commit is contained in:
Denis Kuznetsov
2017-04-12 17:33:35 +02:00
parent 7db69b7a26
commit 3de32ae4dc
26 changed files with 970 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/com/android/settings/applications/ApplicationFeatureProvider.java
View File

@@ -16,14 +16,14 @@
package com.android.settings.applications;
import com.android.settings.applications.instantapps.InstantAppButtonsController;
import android.annotation.UserIdInt;
import android.app.Fragment;
import android.content.Intent;
import android.view.View;
import com.android.settings.applications.instantapps.InstantAppButtonsController;
import java.util.List;
import java.util.Set;
public interface ApplicationFeatureProvider {
@@ -80,16 +80,18 @@ public interface ApplicationFeatureProvider {
void listAppsWithAdminGrantedPermissions(String[] permissions, ListOfAppsCallback callback);
/**
* Return the persistent preferred activities configured by the admin for the current user and
* all its managed profiles. A persistent preferred activity is an activity that the admin
* configured to always handle a given intent (e.g. open browser), even if the user has other
* apps installed that would also be able to handle the intent.
* Return the persistent preferred activities configured by the admin for the given user.
* A persistent preferred activity is an activity that the admin configured to always handle a
* given intent (e.g. open browser), even if the user has other apps installed that would also
* be able to handle the intent.
*
* @param userId ID of the user for which to find persistent preferred activities
* @param intent The intents for which to find persistent preferred activities
*
* @return the persistent preferred activites for the given intent
* @return the persistent preferred activites for the given intents, ordered first by user id,
* then by package name
*/
Set<PersistentPreferredActivityInfo> findPersistentPreferredActivities(Intent[] intents);
List<UserAppInfo> findPersistentPreferredActivities(@UserIdInt int userId, Intent[] intents);
/**
* Callback that receives the number of packages installed on the device.
@@ -104,30 +106,4 @@ public interface ApplicationFeatureProvider {
interface ListOfAppsCallback {
void onListOfAppsResult(List<UserAppInfo> result);
}
public static class PersistentPreferredActivityInfo {
public final String packageName;
public final int userId;
public PersistentPreferredActivityInfo(String packageName, int userId) {
this.packageName = packageName;
this.userId = userId;
}
@Override
public boolean equals(Object other) {
if (!(other instanceof PersistentPreferredActivityInfo)) {
return false;
}
final PersistentPreferredActivityInfo otherActivityInfo
= (PersistentPreferredActivityInfo) other;
return otherActivityInfo.packageName.equals(packageName)
&& otherActivityInfo.userId == userId;
}
@Override
public int hashCode() {
return packageName.hashCode() ^ userId;
}
}
}

48
src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
View File

@@ -22,6 +22,7 @@ import android.content.Intent;
import android.content.pm.ComponentInfo;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.content.pm.UserInfo;
import android.os.RemoteException;
import android.os.UserHandle;
import android.os.UserManager;
@@ -31,6 +32,7 @@ import android.view.View;
import com.android.settings.applications.instantapps.InstantAppButtonsController;
import com.android.settings.enterprise.DevicePolicyManagerWrapper;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -103,36 +105,34 @@ public class ApplicationFeatureProviderImpl implements ApplicationFeatureProvide
}
@Override
public Set<PersistentPreferredActivityInfo> findPersistentPreferredActivities(
Intent[] intents) {
final Set<PersistentPreferredActivityInfo> activities = new ArraySet<>();
final List<UserHandle> users = mUm.getUserProfiles();
public List<UserAppInfo> findPersistentPreferredActivities(int userId, Intent[] intents) {
final List<UserAppInfo> preferredActivities = new ArrayList<>();
final Set<UserAppInfo> uniqueApps = new ArraySet<>();
final UserInfo userInfo = mUm.getUserInfo(userId);
for (final Intent intent : intents) {
for (final UserHandle user : users) {
final int userId = user.getIdentifier();
try {
final ResolveInfo resolveInfo = mPms.findPersistentPreferredActivity(intent,
userId);
if (resolveInfo != null) {
ComponentInfo componentInfo = null;
if (resolveInfo.activityInfo != null) {
componentInfo = resolveInfo.activityInfo;
} else if (resolveInfo.serviceInfo != null) {
componentInfo = resolveInfo.serviceInfo;
} else if (resolveInfo.providerInfo != null) {
componentInfo = resolveInfo.providerInfo;
}
if (componentInfo != null) {
activities.add(new PersistentPreferredActivityInfo(
componentInfo.packageName, userId));
try {
final ResolveInfo resolveInfo =
mPms.findPersistentPreferredActivity(intent, userId);
if (resolveInfo != null) {
ComponentInfo componentInfo = null;
if (resolveInfo.activityInfo != null) {
componentInfo = resolveInfo.activityInfo;
} else if (resolveInfo.serviceInfo != null) {
componentInfo = resolveInfo.serviceInfo;
} else if (resolveInfo.providerInfo != null) {
componentInfo = resolveInfo.providerInfo;
}
if (componentInfo != null) {
UserAppInfo info = new UserAppInfo(userInfo, componentInfo.applicationInfo);
if (uniqueApps.add(info)) {
preferredActivities.add(info);
}
}
} catch (RemoteException exception) {
}
} catch (RemoteException exception) {
}
}
return activities;
return preferredActivities;
}
private static class CurrentUserAndManagedProfilePolicyInstalledAppCounter

67
src/com/android/settings/applications/EnterpriseDefaultApps.java Normal file
View File

@@ -0,0 +1,67 @@
/*
* Copyright (C) 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License
*/
package com.android.settings.applications;
import android.content.Intent;
import android.net.Uri;
import android.provider.ContactsContract;
import android.provider.MediaStore;
/**
* UI grouping of important intents that can be configured by device and profile owners.
*/
public enum EnterpriseDefaultApps {
BROWSER(new Intent[] {
buildIntent(Intent.ACTION_VIEW, Intent.CATEGORY_BROWSABLE, "http:", null)}),
CALENDAR(new Intent[] {
buildIntent(Intent.ACTION_INSERT, null, null, "vnd.android.cursor.dir/event")}),
CAMERA(new Intent[] {
new Intent(MediaStore.ACTION_IMAGE_CAPTURE),
new Intent(MediaStore.ACTION_VIDEO_CAPTURE)}),
CONTACTS(new Intent[] {
buildIntent(Intent.ACTION_PICK, null, null, ContactsContract.Contacts.CONTENT_TYPE)}),
EMAIL(new Intent[] {
new Intent(Intent.ACTION_SENDTO), new Intent(Intent.ACTION_SEND),
new Intent(Intent.ACTION_SEND_MULTIPLE)}),
MAP(new Intent[] {buildIntent(Intent.ACTION_VIEW, null, "geo:", null)}),
PHONE(new Intent[] {new Intent(Intent.ACTION_DIAL), new Intent(Intent.ACTION_CALL)});
private final Intent[] mIntents;
EnterpriseDefaultApps(Intent[] intents) {
mIntents = intents;
}
public Intent[] getIntents() {
return mIntents;
}
private static Intent buildIntent(String action, String category, String protocol,
String type) {
final Intent intent = new Intent(action);
if (category != null) {
intent.addCategory(category);
}
if (protocol != null) {
intent.setData(Uri.parse(protocol));
}
if (type != null) {
intent.setType(type);
}
return intent;
}
}

3
src/com/android/settings/applications/InstalledAppLister.java
View File

@@ -22,8 +22,7 @@ import android.os.UserManager;
public abstract class InstalledAppLister extends AppLister {
public InstalledAppLister(PackageManagerWrapper packageManager,
UserManager userManager) {
public InstalledAppLister(PackageManagerWrapper packageManager, UserManager userManager) {
super(packageManager, userManager);
}

3
src/com/android/settings/applications/UserAppInfo.java
View File

@@ -43,9 +43,10 @@ public class UserAppInfo {
if (other == null || getClass() != other.getClass()) {
return false;
}
final UserAppInfo that = (UserAppInfo) other;
// As UserInfo and AppInfo do not support hashcode/equals contract, assume
// equality based on corresponding identity fields.
return that.userInfo.id == userInfo.id && TextUtils.equals(that.appInfo.packageName,
appInfo.packageName);
}

15
src/com/android/settings/enterprise/ApplicationListFragment.java
View File

@@ -38,11 +38,6 @@ public abstract class ApplicationListFragment extends DashboardFragment
static final String TAG = "EnterprisePrivacySettings";
@Override
public int getMetricsCategory() {
return MetricsEvent.ENTERPRISE_PRIVACY_SETTINGS;
}
@Override
protected String getLogTag() {
return TAG;
@@ -75,6 +70,11 @@ public abstract class ApplicationListFragment extends DashboardFragment
FeatureFactory.getFactory(context).getApplicationFeatureProvider(context)
.listAppsWithAdminGrantedPermissions(mPermissions, callback);
}
@Override
public int getMetricsCategory() {
return MetricsEvent.ENTERPRISE_PRIVACY_PERMISSIONS;
}
}
public static class AdminGrantedPermissionCamera extends AdminGrantedPermission {
@@ -100,6 +100,11 @@ public abstract class ApplicationListFragment extends DashboardFragment
public EnterpriseInstalledPackages() {
}
@Override
public int getMetricsCategory() {
return MetricsEvent.ENTERPRISE_PRIVACY_INSTALLED_APPS;
}
@Override
public void buildApplicationList(Context context,
ApplicationFeatureProvider.ListOfAppsCallback callback) {

2
src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
View File

@@ -17,10 +17,8 @@
package com.android.settings.enterprise;
import android.content.ComponentName;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.pm.UserInfo;
import android.content.res.Resources;

1
src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java
View File

@@ -14,7 +14,6 @@
package com.android.settings.enterprise;
import android.content.Context;
import android.content.res.Resources;
import android.support.v7.preference.Preference;
import com.android.settings.R;

59
src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragment.java Normal file
View File

@@ -0,0 +1,59 @@
/*
* Copyright (C) 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License
*/
package com.android.settings.enterprise;
import android.content.Context;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.PreferenceController;
import com.android.settings.dashboard.DashboardFragment;
import java.util.ArrayList;
import java.util.List;
/**
* Fragment for displaying a list of default applications set by profile or device admin.
*/
public class EnterpriseSetDefaultAppsListFragment extends DashboardFragment {
static final String TAG = "EnterprisePrivacySettings";
@Override
public int getMetricsCategory() {
return MetricsEvent.ENTERPRISE_PRIVACY_DEFAULT_APPS;
}
@Override
protected String getLogTag() {
return TAG;
}
@Override
protected int getPreferenceScreenResId() {
return R.xml.enterprise_set_default_apps_settings;
}
@Override
protected List<PreferenceController> getPreferenceControllers(Context context) {
final List controllers = new ArrayList<PreferenceController>();
final EnterpriseSetDefaultAppsListPreferenceController controller =
new EnterpriseSetDefaultAppsListPreferenceController(
context, this, context.getPackageManager());
controllers.add(controller);
return controllers;
}
}

197
src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java Normal file
View File

@@ -0,0 +1,197 @@
/*
* Copyright (C) 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License
*/
package com.android.settings.enterprise;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.pm.UserInfo;
import android.os.Handler;
import android.os.UserHandle;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceCategory;
import android.support.v7.preference.PreferenceGroup;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.applications.EnterpriseDefaultApps;
import com.android.settings.applications.UserAppInfo;
import com.android.settings.core.PreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.users.UserFeatureProvider;
import java.util.ArrayList;
import java.util.Collections;
import java.util.EnumMap;
import java.util.List;
/**
* PreferenceController that builds a dynamic list of default apps set by device or profile owner.
*/
public class EnterpriseSetDefaultAppsListPreferenceController extends PreferenceController {
private final PackageManager mPm;
private final SettingsPreferenceFragment mParent;
private final ApplicationFeatureProvider mApplicationFeatureProvider;
private final EnterprisePrivacyFeatureProvider mEnterprisePrivacyFeatureProvider;
private final UserFeatureProvider mUserFeatureProvider;
private List<UserInfo> mUsers = Collections.emptyList();
private List<EnumMap<EnterpriseDefaultApps, List<ApplicationInfo>>> mApps =
Collections.emptyList();
public EnterpriseSetDefaultAppsListPreferenceController(Context context,
SettingsPreferenceFragment parent, PackageManager packageManager) {
super(context);
mPm = packageManager;
mParent = parent;
final FeatureFactory factory = FeatureFactory.getFactory(context);
mApplicationFeatureProvider = factory.getApplicationFeatureProvider(context);
mEnterprisePrivacyFeatureProvider = factory.getEnterprisePrivacyFeatureProvider(context);
mUserFeatureProvider = factory.getUserFeatureProvider(context);
buildAppList();
}
/**
* Builds data for UI. Updates mUsers and mApps so that they contain non-empty list.
*/
private void buildAppList() {
mUsers = new ArrayList<>();
mApps = new ArrayList<>();
for (UserHandle user : mUserFeatureProvider.getUserProfiles()) {
boolean hasDefaultsForUser = false;
EnumMap<EnterpriseDefaultApps, List<ApplicationInfo>> userMap = null;
for (EnterpriseDefaultApps typeOfDefault : EnterpriseDefaultApps.values()) {
List<UserAppInfo> apps = mApplicationFeatureProvider.
findPersistentPreferredActivities(user.getIdentifier(),
typeOfDefault.getIntents());
if (apps.isEmpty()) {
continue;
}
if (!hasDefaultsForUser) {
hasDefaultsForUser = true;
mUsers.add(apps.get(0).userInfo);
userMap = new EnumMap<>(EnterpriseDefaultApps.class);
mApps.add(userMap);
}
ArrayList<ApplicationInfo> applicationInfos = new ArrayList<>();
for (UserAppInfo userAppInfo : apps) {
applicationInfos.add(userAppInfo.appInfo);
}
userMap.put(typeOfDefault, applicationInfos);
}
}
new Handler(mContext.getMainLooper()).post(() -> { updateUi(); });
}
@Override
public boolean isAvailable() {
return true;
}
@Override
public String getPreferenceKey() {
return null;
}
private void updateUi() {
final Context prefContext = mParent.getPreferenceManager().getContext();
final PreferenceScreen screen = mParent.getPreferenceScreen();
if (screen == null) {
return;
}
if (!mEnterprisePrivacyFeatureProvider.isInCompMode() && mUsers.size() == 1) {
createPreferences(prefContext, screen, mApps.get(0));
} else {
for (int i = 0; i < mUsers.size(); i++) {
final UserInfo userInfo = mUsers.get(i);
final PreferenceCategory category = new PreferenceCategory(prefContext);
screen.addPreference(category);
if (userInfo.isManagedProfile()) {
category.setTitle(R.string.managed_device_admin_title);
} else {
category.setTitle(R.string.personal_device_admin_title);
}
category.setOrder(i);
createPreferences(prefContext, category, mApps.get(i));
}
}
}
private void createPreferences(Context prefContext, PreferenceGroup group,
EnumMap<EnterpriseDefaultApps, List<ApplicationInfo>> apps) {
if (group == null) {
return;
}
for (EnterpriseDefaultApps typeOfDefault : EnterpriseDefaultApps.values()) {
final List<ApplicationInfo> appsForCategory = apps.get(typeOfDefault);
if (appsForCategory == null || appsForCategory.isEmpty()) {
continue;
}
final Preference preference = new Preference(prefContext);
preference.setTitle(getTitle(prefContext, typeOfDefault, appsForCategory.size()));
preference.setSummary(buildSummaryString(prefContext, appsForCategory));
preference.setOrder(typeOfDefault.ordinal());
preference.setSelectable(false);
group.addPreference(preference);
}
}
private CharSequence buildSummaryString(Context context, List<ApplicationInfo> apps) {
final CharSequence[] appNames = new String[apps.size()];
for (int i = 0; i < apps.size(); i++) {
appNames[i] = apps.get(i).loadLabel(mPm);
}
if (apps.size() == 1) {
return appNames[0];
} else if (apps.size() == 2) {
return context.getString(R.string.app_names_concatenation_template_2, appNames[0],
appNames[1]);
} else {
return context.getString(R.string.app_names_concatenation_template_3, appNames[0],
appNames[1], appNames[2]);
}
}
private String getTitle(Context context, EnterpriseDefaultApps typeOfDefault, int appCount) {
switch (typeOfDefault) {
case BROWSER:
return context.getString(R.string.default_browser_title);
case CALENDAR:
return context.getString(R.string.default_calendar_app_title);
case CONTACTS:
return context.getString(R.string.default_contacts_app_title);
case PHONE:
return context.getResources()
.getQuantityString(R.plurals.default_phone_app_title, appCount);
case MAP:
return context.getString(R.string.default_map_app_title);
case EMAIL:
return context.getResources()
.getQuantityString(R.plurals.default_email_app_title, appCount);
case CAMERA:
return context.getResources()
.getQuantityString(R.plurals.default_camera_app_title, appCount);
default:
throw new IllegalStateException("Unknown type of default " + typeOfDefault);
}
}
}

64
src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java
View File

@@ -14,28 +14,29 @@
package com.android.settings.enterprise;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.provider.ContactsContract;
import android.provider.MediaStore;
import android.os.UserHandle;
import android.support.v7.preference.Preference;
import com.android.settings.R;
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.applications.EnterpriseDefaultApps;
import com.android.settings.core.DynamicAvailabilityPreferenceController;
import com.android.settings.core.lifecycle.Lifecycle;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.users.UserFeatureProvider;
public class EnterpriseSetDefaultAppsPreferenceController
extends DynamicAvailabilityPreferenceController {
private static final String KEY_DEFAULT_APPS = "number_enterprise_set_default_apps";
private final ApplicationFeatureProvider mFeatureProvider;
private final ApplicationFeatureProvider mApplicationFeatureProvider;
private final UserFeatureProvider mUserFeatureProvider;
public EnterpriseSetDefaultAppsPreferenceController(Context context, Lifecycle lifecycle) {
super(context, lifecycle);
mFeatureProvider = FeatureFactory.getFactory(context)
.getApplicationFeatureProvider(context);
final FeatureFactory factory = FeatureFactory.getFactory(context);
mApplicationFeatureProvider = factory.getApplicationFeatureProvider(context);
mUserFeatureProvider = factory.getUserFeatureProvider(context);
}
@Override
@@ -56,47 +57,14 @@ public class EnterpriseSetDefaultAppsPreferenceController
}
private int getNumberOfEnterpriseSetDefaultApps() {
// Browser
int num = mFeatureProvider.findPersistentPreferredActivities(new Intent[] {
buildIntent(Intent.ACTION_VIEW, Intent.CATEGORY_BROWSABLE, "http:", null)}).size();
// Camera
num += mFeatureProvider.findPersistentPreferredActivities(new Intent[] {
new Intent(MediaStore.ACTION_IMAGE_CAPTURE),
new Intent(MediaStore.ACTION_VIDEO_CAPTURE)}).size();
// Map
num += mFeatureProvider.findPersistentPreferredActivities(new Intent[] {
buildIntent(Intent.ACTION_VIEW, null, "geo:", null)}).size();
// E-mail
num += mFeatureProvider.findPersistentPreferredActivities(new Intent[] {
new Intent(Intent.ACTION_SENDTO), new Intent(Intent.ACTION_SEND),
new Intent(Intent.ACTION_SEND_MULTIPLE)}).size();
// Calendar
num += mFeatureProvider.findPersistentPreferredActivities(new Intent[] {
buildIntent(Intent.ACTION_INSERT, null, null, "vnd.android.cursor.dir/event")})
.size();
// Contacts
num += mFeatureProvider.findPersistentPreferredActivities(new Intent[] {
buildIntent(Intent.ACTION_PICK, null, null,
ContactsContract.Contacts.CONTENT_TYPE)}).size();
// Dialer
num += mFeatureProvider.findPersistentPreferredActivities(new Intent[] {
new Intent(Intent.ACTION_DIAL), new Intent(Intent.ACTION_CALL)}).size();
int num = 0;
for (UserHandle user : mUserFeatureProvider.getUserProfiles()) {
for (EnterpriseDefaultApps app : EnterpriseDefaultApps.values()) {
num += mApplicationFeatureProvider
.findPersistentPreferredActivities(user.getIdentifier(),
app.getIntents()).size();
}
}
return num;
}
private static Intent buildIntent(String action, String category, String protocol,
String type) {
final Intent intent = new Intent(action);
if (category != null) {
intent.addCategory(category);
}
if (protocol != null) {
intent.setData(Uri.parse(protocol));
}
if (type != null) {
intent.setType(type);
}
return intent;
}
}

3
src/com/android/settings/overlay/FeatureFactory.java
View File

@@ -31,6 +31,7 @@ import com.android.settings.gestures.AssistGestureFeatureProvider;
import com.android.settings.localepicker.LocaleFeatureProvider;
import com.android.settings.security.SecurityFeatureProvider;
import com.android.settings.search2.SearchFeatureProvider;
import com.android.settings.users.UserFeatureProvider;
/**
* Abstract class for creating feature controllers. Allows OEM implementations to define their own
@@ -94,6 +95,8 @@ public abstract class FeatureFactory {
public abstract SecurityFeatureProvider getSecurityFeatureProvider();
public abstract UserFeatureProvider getUserFeatureProvider(Context context);
public static final class FactoryNotFoundException extends RuntimeException {
public FactoryNotFoundException(Throwable throwable) {
super("Unable to create factory. Did you misconfigure Proguard?", throwable);

11
src/com/android/settings/overlay/FeatureFactoryImpl.java
View File

@@ -45,6 +45,8 @@ import com.android.settings.search2.SearchFeatureProvider;
import com.android.settings.search2.SearchFeatureProviderImpl;
import com.android.settings.security.SecurityFeatureProvider;
import com.android.settings.security.SecurityFeatureProviderImpl;
import com.android.settings.users.UserFeatureProvider;
import com.android.settings.users.UserFeatureProviderImpl;
import com.android.settings.vpn2.ConnectivityManagerWrapperImpl;
/**
@@ -63,6 +65,7 @@ public class FeatureFactoryImpl extends FeatureFactory {
private SuggestionFeatureProvider mSuggestionFeatureProvider;
private PowerUsageFeatureProvider mPowerUsageFeatureProvider;
private AssistGestureFeatureProvider mAssistGestureFeatureProvider;
private UserFeatureProvider mUserFeatureProvider;
@Override
public SupportFeatureProvider getSupportFeatureProvider(Context context) {
@@ -157,6 +160,14 @@ public class FeatureFactoryImpl extends FeatureFactory {
return mSuggestionFeatureProvider;
}
@Override
public UserFeatureProvider getUserFeatureProvider(Context context) {
if (mUserFeatureProvider == null) {
mUserFeatureProvider = new UserFeatureProviderImpl(context);
}
return mUserFeatureProvider;
}
@Override
public AssistGestureFeatureProvider getAssistGestureFeatureProvider() {
if (mAssistGestureFeatureProvider == null) {

31
src/com/android/settings/users/UserFeatureProvider.java Normal file
View File

@@ -0,0 +1,31 @@
/*
* Copyright (C) 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License
*/
package com.android.settings.users;
import android.os.UserHandle;
import java.util.List;
public interface UserFeatureProvider {
/**
* Returns a list of UserHandles for profiles associated with the user that the calling process
* is running on, including the user itself.
*
* @return A non-empty list of UserHandles associated with the calling user.
*/
List<UserHandle> getUserProfiles();
}

36
src/com/android/settings/users/UserFeatureProviderImpl.java Normal file
View File

@@ -0,0 +1,36 @@
/*
* Copyright (C) 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License
*/
package com.android.settings.users;
import android.content.Context;
import android.os.UserHandle;
import android.os.UserManager;
import java.util.List;
public class UserFeatureProviderImpl implements UserFeatureProvider {
UserManager mUm;
public UserFeatureProviderImpl(Context context) {
mUm = (UserManager) context.getSystemService(Context.USER_SERVICE);
}
@Override
public List<UserHandle> getUserProfiles() {
return mUm.getUserProfiles();
}
}