This file contains 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
drew@master:base$ git diff core/java/android/os/StrictMode.java | |
diff --git a/core/java/android/os/StrictMode.java b/core/java/android/os/StrictM | |
index 4d7a9bb..b49f7cd 100644 | |
--- a/core/java/android/os/StrictMode.java | |
+++ b/core/java/android/os/StrictMode.java | |
@@ -123,6 +123,13 @@ public final class StrictMode { | |
*/ | |
public static final String VISUAL_PROPERTY = "persist.sys.strictmode.visual | |
+ /** |
This file contains 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/core/java/android/os/StrictMode.java b/core/java/android/os/StrictMode.java | |
index 4d7a9bb..b49f7cd 100644 | |
--- a/core/java/android/os/StrictMode.java | |
+++ b/core/java/android/os/StrictMode.java | |
@@ -123,6 +123,13 @@ public final class StrictMode { | |
*/ | |
public static final String VISUAL_PROPERTY = "persist.sys.strictmode.visual"; | |
+ /** | |
+ * The boolean system property to control screen flashes on violations. |
This file contains 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/core/java/android/os/StrictMode.java b/core/java/android/os/StrictMode.java | |
index 4d7a9bb..9a32a8d 100644 | |
--- a/core/java/android/os/StrictMode.java | |
+++ b/core/java/android/os/StrictMode.java | |
@@ -123,6 +123,13 @@ public final class StrictMode { | |
*/ | |
public static final String VISUAL_PROPERTY = "persist.sys.strictmode.visual"; | |
+ /** | |
+ * The boolean system property to disable strictmode regardless of build type. |
This file contains 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/frameworks/base/libs/gui/SurfaceTexture.cpp b/frameworks/base/libs/gui/SurfaceTexture.cpp | |
index c72a45b..9e425e3 100644 | |
--- a/libs/gui/SurfaceTexture.cpp | |
+++ b/libs/gui/SurfaceTexture.cpp | |
@@ -246,6 +246,8 @@ status_t SurfaceTexture::requestBuffer(int slot, sp<GraphicBuffer>* buf) { | |
return NO_ERROR; | |
} | |
+#define MAX_SLEEPTIMEOUTS (5) | |
+ |
This file contains 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/libril/Android.mk b/libril/Android.mk | |
index 5c96ec9..fee6107 100644 | |
--- a/libril/Android.mk | |
+++ b/libril/Android.mk | |
@@ -16,6 +16,9 @@ LOCAL_SHARED_LIBRARIES := \ | |
libhardware_legacy | |
LOCAL_CFLAGS := | |
+ifdef BOARD_USE_NEW_LIBRIL_HTC | |
+LOCAL_CFLAGS += -DNEW_LIBRIL_HTC |
This file contains 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/arch/arm/configs/cayniarb_ruby_defconfig b/arch/arm/configs/cayniarb_ruby_defconfig | |
index b9b702c..be81290 100644 | |
--- a/arch/arm/configs/cayniarb_ruby_defconfig | |
+++ b/arch/arm/configs/cayniarb_ruby_defconfig | |
@@ -1,7 +1,7 @@ | |
# | |
# Automatically generated make config: don't edit | |
# Linux kernel version: 2.6.35.14 | |
-# Sun Feb 26 16:09:38 2012 | |
+# Wed Feb 29 03:08:53 2012 |
This file contains 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
[drew@master aosp]$ repo forall -pcv git log --oneline --no-merges android-4.0.4_r1.2..android-4.0.4_r2.1 | |
project build/ | |
1bbaf73 IMM76L | |
b0936b7 IMM76K | |
396c8cf IMM76J | |
project device/moto/stingray/ | |
ca7247e Update for cmda radio 3.1A.65P |
This file contains 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
06-10 01:15:40.169: I/ActivityManager(222): Displayed com.evervolv.toolbox/.SubSettings: +190ms | |
06-10 01:15:40.229: D/OpenGLRenderer(714): Flushing caches (mode 0) | |
06-10 01:15:41.240: I/ActivityManager(222): START {act=android.intent.action.MAIN cmp=com.evervolv.toolbox/.SubSettings (has extras)} from pid 714 | |
06-10 01:15:41.340: D/EVToolbox(714): Array ResourceID: 2131099649 | |
06-10 01:15:41.340: D/EVToolbox(714): Drawable count: 4 | |
06-10 01:15:41.340: D/EVToolbox(714): Drawable ResourceID: 2130837509 | |
06-10 01:15:41.340: D/EVToolbox(714): Drawable ResourceID: 2130837510 | |
06-10 01:15:41.340: D/EVToolbox(714): Drawable ResourceID: 2130837508 | |
06-10 01:15:41.340: D/EVToolbox(714): Drawable ResourceID: 2130837507 | |
06-10 01:15:41.370: D/AndroidRuntime(714): Shutting down VM |
This file contains 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
# Copyright (C) 2010 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, |
This file contains 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
<4>[ 10.884735] ## wifi_probe | |
<4>[ 10.886840] wifi_set_power = 1 | |
<4>[ 10.889770] mahimahi_wifi_power: 1 | |
<4>[ 11.248992] mmc1: host does not support reading read-only switch. assuming write-enable. | |
<6>[ 11.251373] mmc1: new high speed SDHC card at address 0007 | |
<6>[ 11.254089] mmcblk0: mmc1:0007 SD16G 14.9 GiB | |
<6>[ 11.257324] mmcblk0: p1 p2 p3 | |
<6>[ 11.294189] batt: 99%, 4153 mV, 111 mA (9 avg), 29.0 C, 1344 mAh | |
<6>[ 11.301666] batt: charging OFF [FULL] | |
<4>[ 11.340698] wifi_set_carddetect = 1 |
OlderNewer