filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AOSP/Messaging - Update language to comply with Android's inclusive language guidance.

Browse Source 
See https://source.android.com/setup/contribute/respectful-code for reference

BUG=161896447

Test: make and make messagingtests
Change-Id: I01c520f1d5e9eab8dbb25b08d133ae34bd301093
This commit is contained in:
Raman Tenneti
2020-07-29 16:40:49 -07:00
parent b1aa213ce9
commit 4b52654e98
12 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/messaging/datamodel/DatabaseHelper.java
View File

@@ -49,10 +49,13 @@ public class DatabaseHelper extends SQLiteOpenHelper {
return Integer.parseInt(context.getResources().getString(R.string.database_version));
}
/** Table containing names of all other tables and views */
private static final String MASTER_TABLE = "sqlite_master";
/**
* Table containing names of all other tables and views.
* TODO(rtenneti): Fix the following special SQLLite table name when SQLLite changes.
*/
private static final String PRIMARY_TABLE = "sqlite_master";
/** Column containing the name of the tables and views */
private static final String[] MASTER_COLUMNS = new String[] { "name", };
private static final String[] PRIMARY_COLUMNS = new String[] { "name", };
// Table names
public static final String CONVERSATIONS_TABLE = "conversations";
@@ -682,7 +685,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
*/
private static void dropAllTables(final SQLiteDatabase db) {
final Cursor tableCursor =
db.query(MASTER_TABLE, MASTER_COLUMNS, "type='table'", null, null, null, null);
db.query(PRIMARY_TABLE, PRIMARY_COLUMNS, "type='table'", null, null, null, null);
if (tableCursor != null) {
try {
final String dropPrefix = "DROP TABLE IF EXISTS ";
@@ -713,7 +716,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
*/
private static void dropAllTriggers(final SQLiteDatabase db) {
final Cursor triggerCursor =
db.query(MASTER_TABLE, MASTER_COLUMNS, "type='trigger'", null, null, null, null);
db.query(PRIMARY_TABLE, PRIMARY_COLUMNS, "type='trigger'", null, null, null, null);
if (triggerCursor != null) {
try {
final String dropPrefix = "DROP TRIGGER IF EXISTS ";
@@ -744,7 +747,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
*/
public static void dropAllViews(final SQLiteDatabase db) {
final Cursor viewCursor =
db.query(MASTER_TABLE, MASTER_COLUMNS, "type='view'", null, null, null, null);
db.query(PRIMARY_TABLE, PRIMARY_COLUMNS, "type='view'", null, null, null, null);
if (viewCursor != null) {
try {
while (viewCursor.moveToNext()) {
@@ -762,7 +765,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
*/
private static void dropAllIndexes(final SQLiteDatabase db) {
final Cursor indexCursor =
db.query(MASTER_TABLE, MASTER_COLUMNS, "type='index'", null, null, null, null);
db.query(PRIMARY_TABLE, PRIMARY_COLUMNS, "type='index'", null, null, null, null);
if (indexCursor != null) {
try {
final String dropPrefix = "DROP INDEX IF EXISTS ";