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

Merge "Ensure trust agents are only provided by platform packages - DO NOT MERGE" into lmp-preview-dev

Browse Source
This commit is contained in:
Adrian Roos
2014-06-04 21:43:46 +00:00
committed by Android (Google) Code Review
parent 6430ac5c1e 4c8fd9e0cf
commit fe8572a056
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/TrustAgentSettings.java
View File

@@ -21,6 +21,7 @@ import com.android.internal.widget.LockPatternUtils;
import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserException;
import android.Manifest;
import android.app.ListFragment; import android.app.ListFragment;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
@@ -36,6 +37,7 @@ import android.service.trust.TrustAgentService;
import android.util.ArrayMap; import android.util.ArrayMap;
import android.util.ArraySet; import android.util.ArraySet;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log;
import android.util.Slog; import android.util.Slog;
import android.util.Xml; import android.util.Xml;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@@ -55,6 +57,8 @@ public class TrustAgentSettings extends ListFragment implements View.OnClickList
private static final String SERVICE_INTERFACE = TrustAgentService.SERVICE_INTERFACE; private static final String SERVICE_INTERFACE = TrustAgentService.SERVICE_INTERFACE;
private static final String TRUST_AGENT_META_DATA = TrustAgentService.TRUST_AGENT_META_DATA; private static final String TRUST_AGENT_META_DATA = TrustAgentService.TRUST_AGENT_META_DATA;
private static final String PERMISSION_PROVIDE_AGENT = Manifest.permission.PROVIDE_TRUST_AGENT;
private final ArraySet<ComponentName> mActiveAgents = new ArraySet<ComponentName>(); private final ArraySet<ComponentName> mActiveAgents = new ArraySet<ComponentName>();
private final ArrayMap<ComponentName, AgentInfo> mAvailableAgents private final ArrayMap<ComponentName, AgentInfo> mAvailableAgents
@@ -121,6 +125,15 @@ public class TrustAgentSettings extends ListFragment implements View.OnClickList
for (ResolveInfo resolveInfo : resolveInfos) { for (ResolveInfo resolveInfo : resolveInfos) {
if (resolveInfo.serviceInfo == null) continue; if (resolveInfo.serviceInfo == null) continue;
String packageName = resolveInfo.serviceInfo.packageName;
if (pm.checkPermission(PERMISSION_PROVIDE_AGENT, packageName)
!= PackageManager.PERMISSION_GRANTED) {
Log.w(TAG, "Skipping agent because package " + packageName
+ " does not have permission " + PERMISSION_PROVIDE_AGENT + ".");
continue;
}
ComponentName name = getComponentName(resolveInfo); ComponentName name = getComponentName(resolveInfo);
if (!mAvailableAgents.containsKey(name)) { if (!mAvailableAgents.containsKey(name)) {
AgentInfo agentInfo = new AgentInfo(); AgentInfo agentInfo = new AgentInfo();