diff options
author | Xin Li <delphij@google.com> | 2024-01-17 22:14:21 -0800 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2024-01-17 22:14:21 -0800 |
commit | 39d9a7cff79594d7d23794508526ac77fadf8eeb (patch) | |
tree | f731bf466e4eeaf70a9b81f898f31468acacdf58 | |
parent | 79b16dd9ae4aea2b2b21d18b8c10205a43aff4bc (diff) | |
parent | cd39324d9f7c9b0c5405fae1c3de3f086a9680d2 (diff) | |
download | Messaging-39d9a7cff79594d7d23794508526ac77fadf8eeb.tar.gz |
Merge Android 24Q1 Release (ab/11220357)temp_319669529
Bug: 319669529
Merged-In: I02e57588433b5ff1e4d2208c172b904deb8d8236
Change-Id: I3a7b6043fc086e561ff08cfe2aa62b63d7111725
-rw-r--r-- | src/com/android/messaging/ui/contact/ContactRecipientAutoCompleteView.java | 4 | ||||
-rw-r--r--[-rwxr-xr-x] | tools/messagegen/fillsms | 25 |
2 files changed, 20 insertions, 9 deletions
diff --git a/src/com/android/messaging/ui/contact/ContactRecipientAutoCompleteView.java b/src/com/android/messaging/ui/contact/ContactRecipientAutoCompleteView.java index 35641b2..17128c1 100644 --- a/src/com/android/messaging/ui/contact/ContactRecipientAutoCompleteView.java +++ b/src/com/android/messaging/ui/contact/ContactRecipientAutoCompleteView.java @@ -19,7 +19,6 @@ import android.content.Context; import android.database.Cursor; import android.graphics.Rect; import android.os.AsyncTask; -import androidx.appcompat.R; import android.text.Editable; import android.text.TextPaint; import android.text.TextWatcher; @@ -33,6 +32,7 @@ import android.widget.TextView; import com.android.ex.chips.RecipientEditTextView; import com.android.ex.chips.RecipientEntry; import com.android.ex.chips.recipientchip.DrawableRecipientChip; +import com.android.messaging.R; import com.android.messaging.datamodel.data.ParticipantData; import com.android.messaging.util.ContactRecipientEntryUtils; import com.android.messaging.util.ContactUtil; @@ -114,7 +114,7 @@ public class ContactRecipientAutoCompleteView extends RecipientEditTextView { setOnFocusListShrinkRecipients(false); setBackground(context.getResources().getDrawable( - R.drawable.abc_textfield_search_default_mtrl_alpha)); + androidx.appcompat.R.drawable.abc_textfield_search_default_mtrl_alpha)); } public void setContactChipsListener(final ContactChipsChangeListener listener) { diff --git a/tools/messagegen/fillsms b/tools/messagegen/fillsms index 6903941..dc2e507 100755..100644 --- a/tools/messagegen/fillsms +++ b/tools/messagegen/fillsms @@ -100,9 +100,11 @@ image_list_file=$1 shift sql_file=$1 shift +echo $image_list_file dict_lines=`wc -l < $DICT` image_files=`wc -l < $image_list_file` +echo $image_files if [ $mms_per_thread -gt "0" ]; then if [ ! -f $image_list_file ]; then @@ -123,7 +125,7 @@ random_value () dict_word () { - local v=$(random_value 30000) + local v=$(random_value $dict_lines) sed $v"q;d" $DICT } @@ -156,6 +158,11 @@ adb_sql () adb shell sqlite3 data/data/com.android.providers.telephony/databases/mmssms.db "$1" } +adb_sql_with_quotes () +{ + echo $1 + adb shell "sqlite3 data/data/com.android.providers.telephony/databases/mmssms.db \"$1\"" +} ###################################################################################### ###################################################################################### @@ -163,6 +170,7 @@ if [ $opt_exec_only -eq "0" ]; then # clean up sql file rm -f $sql_file + add_sql "PRAGMA trusted_schema=1;" # add sql to clean up database add_sql "delete from pdu where _id>=$TABLE_SMS_START_ID;" add_sql "delete from part where _id>=$TABLE_SMS_START_ID;" @@ -197,6 +205,7 @@ if [ $opt_exec_only -eq "0" ]; then # Generate SMS if [ $sms_per_thread -gt "0" ]; then + add_sql "PRAGMA trusted_schema=1;" half_timestamp_inc=$(( 500 + ((($sms_per_thread + $mms_per_thread) * $TIMESTAMP_INC_IN_SECONDS) * 500 / $sms_per_thread) )) for j in `seq 1 $sms_per_thread`; do @@ -268,20 +277,22 @@ if [ $opt_sql_only -eq "0" ]; then echo adb_sql ".read /data/fillsms" echo - adb_sql "select count(*) from canonical_addresses where _id>=$TABLE_CANONICAL_ADDRESSES_START_ID;" + add_sql "PRAGMA trusted_schema=1;" + echo + adb_sql_with_quotes "select count(*) from canonical_addresses where _id>=$TABLE_CANONICAL_ADDRESSES_START_ID;" echo - adb_sql "select count(*) from threads where _id>=$TABLE_THREADS_START_ID;" + adb_sql_with_quotes "select count(*) from threads where _id>=$TABLE_THREADS_START_ID;" echo if [ $sms_per_thread -gt "0" ]; then - adb_sql "select count(*) from sms where _id>=$TABLE_SMS_START_ID;" + adb_sql_with_quotes "select count(*) from sms where _id>=$TABLE_SMS_START_ID;" echo fi if [ $mms_per_thread -gt "0" ]; then - adb_sql "select count(*) from pdu where _id>=$TABLE_SMS_START_ID;" + adb_sql_with_quotes "select count(*) from pdu where _id>=$TABLE_SMS_START_ID;" echo - adb_sql "select count(*) from part where _id>=$TABLE_SMS_START_ID;" + adb_sql_with_quotes "select count(*) from part where _id>=$TABLE_SMS_START_ID;" echo - adb_sql "select count(*) from addr where _id>=$TABLE_SMS_START_ID;" + adb_sql_with_quotes "select count(*) from addr where _id>=$TABLE_SMS_START_ID;" echo fi fi |