This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
DefinitionBlock ("", "SSDT", 1, "CUSTOM", "CSC3551", 0x00000001) | |
{ | |
External (_SB_.PC00.SPI0, DeviceObj) | |
External (_SB_.PC00.SPI0.SPK1, DeviceObj) | |
Scope (_SB.PC00.SPI0.SPK1) | |
{ | |
Name (_DSD, Package () // _DSD: Device-Specific Data | |
{ | |
ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?xml version="1.0" encoding="utf-8"?> | |
<!-- | |
** | |
** Copyright 2009, 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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp | |
index 25a77d0..81e8855 100644 | |
--- a/services/audioflinger/AudioFlinger.cpp | |
+++ b/services/audioflinger/AudioFlinger.cpp | |
@@ -153,11 +153,13 @@ static int load_audio_interface(const char *if_name, audio_hw_device_t **dev) | |
if (rc) { | |
goto out; | |
} | |
+#if !defined(ICS_AUDIO_BLOB) && !defined(MR0_AUDIO_BLOB) | |
if ((*dev)->common.version < AUDIO_DEVICE_API_VERSION_MIN) { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/com/android/browser/BrowserPreferencesPage.java b/src/com/android/browser/BrowserPreferencesPage.java | |
index 6e6da17..766b653 100644 | |
--- a/src/com/android/browser/BrowserPreferencesPage.java | |
+++ b/src/com/android/browser/BrowserPreferencesPage.java | |
@@ -98,4 +98,9 @@ public class BrowserPreferencesPage extends PreferenceActivity { | |
return intent; | |
} | |
+ @Override | |
+ protected boolean isValidFragment(String fragmentName) { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/icu4c/source/common/ucnv.c b/icu4c/source/common/ucnv.c | |
index 5cf4d15..3701f30 100644 | |
--- a/icu4c/source/common/ucnv.c | |
+++ b/icu4c/source/common/ucnv.c | |
@@ -2914,6 +2914,75 @@ ucnv_isFixedWidth(UConverter *cnv, UErrorCode *status){ | |
return FALSE; | |
} | |
} | |
+ | |
+U_CAPI void U_EXPORT2 ucnv_setToUCallBack_48 (UConverter * converter, |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/kernel/module.c b/kernel/module.c | |
index 78ac6ec..1260650 100644 | |
--- a/kernel/module.c | |
+++ b/kernel/module.c | |
@@ -2553,7 +2553,7 @@ static int check_modinfo(struct module *mod, struct load_info *info) | |
} else if (!same_magic(modmagic, vermagic, info->index.vers)) { | |
printk(KERN_ERR "%s: version magic '%s' should be '%s'\n", | |
mod->name, modmagic, vermagic); | |
- return -ENOEXEC; | |
+ //return -ENOEXEC; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/rootdir/init.rc b/rootdir/init.rc | |
index 8ba7c10..8deb4e1 100644 | |
--- a/rootdir/init.rc | |
+++ b/rootdir/init.rc | |
@@ -596,7 +596,6 @@ service installd /system/bin/installd | |
service flash_recovery /system/bin/install-recovery.sh | |
class main | |
- seclabel u:r:install_recovery:s0 | |
oneshot |