OSDN Git Service

Merge "Add ability to install credentials as other UID"
authorKenny Root <kroot@google.com>
Thu, 28 Mar 2013 20:56:58 +0000 (20:56 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 28 Mar 2013 20:56:58 +0000 (20:56 +0000)
57 files changed:
core/java/android/bluetooth/BluetoothA2dp.java [changed mode: 0755->0644]
core/java/android/bluetooth/BluetoothAdapter.java [changed mode: 0755->0644]
core/java/android/bluetooth/BluetoothDevice.java [changed mode: 0755->0644]
core/java/android/bluetooth/BluetoothHeadset.java [changed mode: 0755->0644]
core/java/android/bluetooth/BluetoothInputDevice.java [changed mode: 0755->0644]
core/java/android/bluetooth/BluetoothPbap.java [changed mode: 0755->0644]
core/java/android/bluetooth/BluetoothProfile.java [changed mode: 0755->0644]
core/java/android/bluetooth/IBluetoothInputDevice.aidl [changed mode: 0755->0644]
core/java/android/bluetooth/IBluetoothManager.aidl [changed mode: 0755->0644]
core/res/res/values-mcc286/config.xml [changed mode: 0755->0644]
core/res/res/xml/kg_password_kbd_numeric.xml [changed mode: 0755->0644]
data/sounds/AudioPackage10.mk [changed mode: 0755->0644]
data/sounds/AudioPackage8.mk [changed mode: 0755->0644]
data/sounds/AudioPackage9.mk [changed mode: 0755->0644]
data/sounds/alarms/ogg/Krypton.ogg [changed mode: 0755->0644]
data/sounds/alarms/wav/Argon.wav [changed mode: 0755->0644]
data/sounds/alarms/wav/Carbon.wav [changed mode: 0755->0644]
data/sounds/alarms/wav/Osmium.wav [changed mode: 0755->0644]
data/sounds/alarms/wav/Platinum.wav [changed mode: 0755->0644]
data/sounds/alarms/wav/Promethium.wav [changed mode: 0755->0644]
docs/html/google/play/billing/v2/billing_integrate.jd [changed mode: 0755->0644]
docs/html/images/ui/notifications/custom_message.png [changed mode: 0755->0644]
docs/html/images/ui/notifications/notifications_window.png [changed mode: 0755->0644]
docs/html/images/ui/notifications/status_bar.png [changed mode: 0755->0644]
docs/html/training/animation/anim_card_flip.mp4 [changed mode: 0755->0644]
docs/html/training/animation/anim_card_flip.ogv [changed mode: 0755->0644]
docs/html/training/animation/anim_card_flip.webm [changed mode: 0755->0644]
docs/html/training/animation/anim_screenslide.mp4 [changed mode: 0755->0644]
docs/html/training/animation/anim_screenslide.ogv [changed mode: 0755->0644]
docs/html/training/animation/anim_screenslide.webm [changed mode: 0755->0644]
libs/hwui/Dither.cpp [changed mode: 0755->0644]
libs/hwui/Dither.h [changed mode: 0755->0644]
media/jni/mediaeditor/VideoBrowserMain.c [changed mode: 0755->0644]
media/tests/EffectsTest/Android.mk [changed mode: 0755->0644]
media/tests/EffectsTest/AndroidManifest.xml [changed mode: 0755->0644]
media/tests/EffectsTest/res/drawable/icon.png [changed mode: 0755->0644]
media/tests/EffectsTest/res/drawable/stop.png [changed mode: 0755->0644]
media/tests/EffectsTest/res/layout/bassboosttest.xml [changed mode: 0755->0644]
media/tests/EffectsTest/res/layout/effectstest.xml [changed mode: 0755->0644]
media/tests/EffectsTest/res/layout/envreverbtest.xml [changed mode: 0755->0644]
media/tests/EffectsTest/res/layout/equalizertest.xml [changed mode: 0755->0644]
media/tests/EffectsTest/res/layout/presetreverbtest.xml [changed mode: 0755->0644]
media/tests/EffectsTest/res/layout/virtualizertest.xml [changed mode: 0755->0644]
media/tests/EffectsTest/res/layout/visualizertest.xml [changed mode: 0755->0644]
media/tests/EffectsTest/res/values/strings.xml [changed mode: 0755->0644]
media/tests/EffectsTest/src/com/android/effectstest/BassBoostTest.java [changed mode: 0755->0644]
media/tests/EffectsTest/src/com/android/effectstest/EffectParameter.java [changed mode: 0755->0644]
media/tests/EffectsTest/src/com/android/effectstest/EffectsTest.java [changed mode: 0755->0644]
media/tests/EffectsTest/src/com/android/effectstest/EnvReverbTest.java [changed mode: 0755->0644]
media/tests/EffectsTest/src/com/android/effectstest/EqualizerTest.java [changed mode: 0755->0644]
media/tests/EffectsTest/src/com/android/effectstest/PresetReverbTest.java [changed mode: 0755->0644]
media/tests/EffectsTest/src/com/android/effectstest/VirtualizerTest.java [changed mode: 0755->0644]
media/tests/EffectsTest/src/com/android/effectstest/VisualizerTest.java [changed mode: 0755->0644]
packages/SystemUI/src/com/android/systemui/statusbar/GestureRecorder.java [changed mode: 0755->0644]
policy/src/com/android/internal/policy/impl/GlobalActions.java [changed mode: 0755->0644]
services/java/com/android/server/BluetoothManagerService.java [changed mode: 0755->0644]
services/java/com/android/server/pm/SELinuxMMAC.java

old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
index 15d2a5a..4bbdb5e 100644 (file)
@@ -206,10 +206,10 @@ public final class SELinuxMMAC {
             String tagName = parser.getName();
             if ("seinfo".equals(tagName)) {
                 String seinfoValue = parser.getAttributeValue(null, "value");
-                if (seinfoValue != null) {
+                if (validateValue(seinfoValue)) {
                     seinfo = seinfoValue;
                 } else {
-                    Slog.w(TAG, "<seinfo> without value at "
+                    Slog.w(TAG, "<seinfo> without valid value at "
                            + parser.getPositionDescription());
                 }
             }
@@ -219,6 +219,28 @@ public final class SELinuxMMAC {
     }
 
     /**
+     * General validation routine for tag values.
+     * Returns a boolean indicating if the passed string
+     * contains only letters or underscores.
+     */
+    private static boolean validateValue(String name) {
+        if (name == null)
+            return false;
+
+        final int N = name.length();
+        if (N == 0)
+            return false;
+
+        for (int i = 0; i < N; i++) {
+            final char c = name.charAt(i);
+            if ((c < 'a' || c > 'z') && (c < 'A' || c > 'Z') && (c != '_')) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
      * Labels a package based on an seinfo tag from install policy.
      * The label is attached to the ApplicationInfo instance of the package.
      * @param PackageParser.Package object representing the package