drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 65f420ec: Merge "Add a config updater component for the intent firewall" into jb-mr2-dev

Browse Source 
* commit '65f420ec98f451cb17e55c6ace3f249d73b33399':
  Add a config updater component for the intent firewall
This commit is contained in:
Ben Gruver
2013-04-05 09:39:11 -07:00
committed by Android Git Automerger
parent 5b8f221b15 65f420ec98
commit a1607a8c62
4 changed files with 55 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/provider/Settings.java
View File

@ -5397,6 +5397,20 @@ public final class Settings {
*/
public static final String CERT_PIN_UPDATE_METADATA_URL = "cert_pin_metadata_url";
/**
* URL for intent firewall updates
* @hide
*/
public static final String INTENT_FIREWALL_UPDATE_CONTENT_URL =
"intent_firewall_content_url";
/**
* URL for intent firewall update metadata
* @hide
*/
public static final String INTENT_FIREWALL_UPDATE_METADATA_URL =
"intent_firewall_metadata_url";
/**
* SELinux enforcement status. If 0, permissive; if 1, enforcing.
* @hide

6
core/res/AndroidManifest.xml
View File

@ -2301,6 +2301,12 @@
</intent-filter>
</receiver>
<receiver android:name="com.android.server.updates.IntentFirewallInstallReceiver" >
<intent-filter>
<action android:name="android.intent.action.UPDATE_INTENT_FIREWALL" />
</intent-filter>
</receiver>
<receiver android:name="com.android.server.updates.SmsShortCodesInstallReceiver" >
<intent-filter>
<action android:name="android.intent.action.UPDATE_SMS_SHORT_CODES" />

12
services/java/com/android/server/firewall/IntentFirewall.java
View File

@ -42,7 +42,9 @@ import java.util.List;
public class IntentFirewall {
private static final String TAG = "IntentFirewall";
private static final String RULES_FILENAME = "ifw.xml";
// e.g. /data/system/ifw/ifw.xml or /data/secure/system/ifw/ifw.xml
private static final File RULES_FILE =
new File(Environment.getSystemSecureDirectory(), "ifw/ifw.xml");
private static final String TAG_RULES = "rules";
private static final String TAG_ACTIVITY = "activity";
@ -93,9 +95,7 @@ public class IntentFirewall {
public IntentFirewall(AMSInterface ams) {
mAms = ams;
File dataSystemDir = new File(Environment.getDataDirectory(), "system");
File rulesFile = new File(dataSystemDir, RULES_FILENAME);
readRules(rulesFile);
readRules(getRulesFile());
}
public boolean checkStartActivity(Intent intent, ApplicationInfo callerApp,
@ -127,6 +127,10 @@ public class IntentFirewall {
return !block;
}
public static File getRulesFile() {
return RULES_FILE;
}
private void readRules(File rulesFile) {
FileInputStream fis;
try {

27
services/java/com/android/server/updates/IntentFirewallInstallReceiver.java Normal file
View File

@ -0,0 +1,27 @@
/*
* Copyright (C) 2013 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.server.updates;
import com.android.server.firewall.IntentFirewall;
public class IntentFirewallInstallReceiver extends ConfigUpdateInstallReceiver {
public IntentFirewallInstallReceiver() {
super(IntentFirewall.getRulesFile().getParent(), IntentFirewall.getRulesFile().getName(),
"metadata/", "version");
}
}