Merge "fix a system crash that occurs when ChooseAccountActivity is restarted from the icicle"
diff --git a/libs/surfaceflinger/Layer.h b/libs/surfaceflinger/Layer.h
index 1310ecc..743afb4 100644
--- a/libs/surfaceflinger/Layer.h
+++ b/libs/surfaceflinger/Layer.h
@@ -78,6 +78,8 @@
inline const sp<FreezeLock>& getFreezeLock() const { return mFreezeLock; }
// only for debugging
inline PixelFormat pixelFormat() const { return mFormat; }
+ // only for debugging
+ inline int getFrontBufferIndex() const { return mFrontBufferIndex; }
private:
inline sp<GraphicBuffer> getFrontBufferLocked() {
diff --git a/libs/surfaceflinger/SurfaceFlinger.cpp b/libs/surfaceflinger/SurfaceFlinger.cpp
index b408779..4555b3c 100644
--- a/libs/surfaceflinger/SurfaceFlinger.cpp
+++ b/libs/surfaceflinger/SurfaceFlinger.cpp
@@ -1519,6 +1519,10 @@
if (l != 0) {
SharedBufferStack::Statistics stats = l->lcblk->getStats();
result.append( l->lcblk->dump(" ") );
+ snprintf(buffer, SIZE,
+ " front-index=%u\n", l->getFrontBufferIndex());
+ result.append(buffer);
+
sp<const GraphicBuffer> buf0(l->getBuffer(0));
sp<const GraphicBuffer> buf1(l->getBuffer(1));
uint32_t w0=0, h0=0, s0=0;
diff --git a/mms-common/java/com/android/mmscommon/mms/pdu/PduPersister.java b/mms-common/java/com/android/mmscommon/mms/pdu/PduPersister.java
index 46f28c7f..d92f0e1 100644
--- a/mms-common/java/com/android/mmscommon/mms/pdu/PduPersister.java
+++ b/mms-common/java/com/android/mmscommon/mms/pdu/PduPersister.java
@@ -1145,6 +1145,10 @@
}
}
+ // mark "read" and "seen"
+ values.put(Mms.READ, 0);
+ values.put(Mms.SEEN, 0);
+
Uri res = SqliteWrapper.insert(mContext, mContentResolver, uri, values);
if (res == null) {
throw new MmsException("persist() failed: return null.");
diff --git a/mms-common/java/com/android/mmscommon/telephony/TelephonyProvider.java b/mms-common/java/com/android/mmscommon/telephony/TelephonyProvider.java
index 87e4758..cfc9231 100644
--- a/mms-common/java/com/android/mmscommon/telephony/TelephonyProvider.java
+++ b/mms-common/java/com/android/mmscommon/telephony/TelephonyProvider.java
@@ -51,37 +51,6 @@
private static final boolean DEBUG = true;
private static final boolean LOCAL_LOGV = DEBUG ? Config.LOGD : Config.LOGV;
-// public static final Pattern EMAIL_ADDRESS
-// = Pattern.compile(
-// "[a-zA-Z0-9\\+\\.\\_\\%\\-]{1,256}" +
-// "\\@" +
-// "[a-zA-Z0-9][a-zA-Z0-9\\-]{0,64}" +
-// "(" +
-// "\\." +
-// "[a-zA-Z0-9][a-zA-Z0-9\\-]{0,25}" +
-// ")+"
-// );
-//
-// /**
-// * This pattern is intended for searching for things that look like they
-// * might be phone numbers in arbitrary text, not for validating whether
-// * something is in fact a phone number. It will miss many things that
-// * are legitimate phone numbers.
-// *
-// * <p> The pattern matches the following:
-// * <ul>
-// * <li>Optionally, a + sign followed immediately by one or more digits. Spaces, dots, or dashes
-// * may follow.
-// * <li>Optionally, sets of digits in parentheses, separated by spaces, dots, or dashes.
-// * <li>A string starting and ending with a digit, containing digits, spaces, dots, and/or dashes.
-// * </ul>
-// */
-// public static final Pattern PHONE
-// = Pattern.compile( // sdd = space, dot, or dash
-// "(\\+[0-9]+[\\- \\.]*)?" // +<digits><sdd>*
-// + "(\\([0-9]+\\)[\\- \\.]*)?" // (<digits>)<sdd>*
-// + "([0-9][0-9\\- \\.][0-9\\- \\.]+[0-9])"); // <digit><digit|sdd>+<digit>
-
// Constructor
public TelephonyProvider() {
}
@@ -136,6 +105,12 @@
public static final String READ = "read";
/**
+ * Indicates whether this message has been seen by the user. The "seen" flag will be
+ * used to figure out whether we need to throw up a statusbar notification or not.
+ */
+ public static final String SEEN = "seen";
+
+ /**
* The TP-Status value for the message, or -1 if no status has
* been received
*/
@@ -706,6 +681,12 @@
public static final String READ = "read";
/**
+ * Indicates whether this message has been seen by the user. The "seen" flag will be
+ * used to figure out whether we need to throw up a statusbar notification or not.
+ */
+ public static final String SEEN = "seen";
+
+ /**
* The Message-ID of the message.
* <P>Type: TEXT</P>
*/
@@ -1157,6 +1138,7 @@
* <P>Type: INTEGER</P>
*/
public static final String READ = "read";
+
/**
* The snippet of the latest message in the thread.
* <P>Type: TEXT</P>
@@ -1697,6 +1679,13 @@
*/
public static final String LAST_TRY = "last_try";
}
+
+ public static final class WordsTable {
+ public static final String ID = "_id";
+ public static final String SOURCE_ROW_ID = "source_id";
+ public static final String TABLE_ID = "table_to_use";
+ public static final String INDEXED_TEXT = "index_text";
+ }
}
public static final class Carriers implements BaseColumns {