[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 9210f5f3f1 am: ae73cdd0bb -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/16155841
Change-Id: I93ffbbbe0884567addceee1accc51f4b7693efa5
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 1576ba2..9a6ddf1 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -17,16 +17,16 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="sharedUserLabel" msgid="8024311725474286801">"Android Core এপসমূহ"</string>
- <string name="app_label" msgid="3389954322874982620">"সম্পৰ্কসমূহৰ সঞ্চয়াগাৰ"</string>
+ <string name="app_label" msgid="3389954322874982620">"সম্পৰ্কসমূহৰ ষ্ট’ৰেজ"</string>
<string name="provider_label" msgid="6012150850819899907">"সম্পর্কবোৰ"</string>
<string name="upgrade_out_of_memory_notification_ticker" msgid="7638747231223520477">"সম্পৰ্কসূচী আপগ্ৰেড কৰিবলৈ অধিক মেম\'ৰিৰ প্ৰয়োজন।"</string>
- <string name="upgrade_out_of_memory_notification_title" msgid="8888171924684998531">"সম্পৰ্কসূচীৰ বাবে সঞ্চয়াগাৰ আপগ্ৰেড কৰিথকা হৈছে"</string>
+ <string name="upgrade_out_of_memory_notification_title" msgid="8888171924684998531">"সম্পৰ্কসূচীৰ বাবে ষ্ট’ৰেজ আপগ্ৰেড কৰি থকা হৈছে"</string>
<string name="upgrade_out_of_memory_notification_text" msgid="2581831842693151968">"আপগ্ৰেড প্ৰক্ৰিয়া সম্পূৰ্ণ কৰিবলৈ টিপক।"</string>
<string name="default_directory" msgid="93961630309570294">"সম্পর্কসূচী"</string>
<string name="local_invisible_directory" msgid="705244318477396120">"অন্যান্য"</string>
<string name="voicemail_from_column" msgid="435732568832121444">"ইয়াৰ পৰা অহা ভইচমেল "</string>
<string name="debug_dump_title" msgid="4916885724165570279">"সম্পৰ্কসূচীৰ ডেটাবেছ প্ৰতিলিপি কৰক"</string>
- <string name="debug_dump_database_message" msgid="406438635002392290">"আপুনি এই কাৰ্যবোৰ কৰিবলৈ লৈছে ১) সকলো সম্পৰ্ক সম্বন্ধীয় তথ্য় আৰু কল লগ সন্নিবিষ্ট থকা আপোনাৰ ডেটাবেছক আভ্য়ন্তৰীণ সঞ্চয়াগাৰলৈ প্ৰতিলিপি কৰা আৰু ২) ইয়াক ইমেইল কৰা। ডিভাইচৰ পৰা সফলতাৰে প্ৰতিলিপি কৰাৰ বা ইমেইল পোৱাৰ পিছত উক্ত প্ৰতিলিপি মচিবলৈ নাপাহৰিব।"</string>
+ <string name="debug_dump_database_message" msgid="406438635002392290">"আপুনি এই কাৰ্যবোৰ কৰিবলৈ লৈছে ১) আটাইবোৰ সম্পৰ্ক সম্বন্ধীয় তথ্য় আৰু কল লগ সন্নিবিষ্ট থকা আপোনাৰ ডেটাবেছক আভ্য়ন্তৰীণ ষ্ট’ৰেজলৈ প্ৰতিলিপি কৰা আৰু ২) ইয়াক ইমেইল কৰা। ডিভাইচৰ পৰা সফলতাৰে প্ৰতিলিপি কৰাৰ বা ইমেইল পোৱাৰ পিছত উক্ত প্ৰতিলিপি মচিবলৈ নাপাহৰিব।"</string>
<string name="debug_dump_delete_button" msgid="7832879421132026435">"এতিয়াই মচক"</string>
<string name="debug_dump_start_button" msgid="2837506913757600001">"আৰম্ভ কৰক"</string>
<string name="debug_dump_email_sender_picker" msgid="3534420908672176460">"আপোনাৰ ফাইল পঠাবলৈ কোনো প্ৰ\'গ্ৰাম বাছনি কৰক"</string>
diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index 0c6e819..4b2b37a 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -20,6 +20,7 @@
import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
+import android.os.Looper;
import android.accounts.Account;
import android.accounts.AccountManager;
import android.accounts.OnAccountsUpdateListener;
@@ -64,7 +65,6 @@
import android.os.Bundle;
import android.os.CancellationSignal;
import android.os.Handler;
-import android.os.Looper;
import android.os.ParcelFileDescriptor;
import android.os.ParcelFileDescriptor.AutoCloseInputStream;
import android.os.RemoteException;
@@ -126,6 +126,7 @@
import com.android.common.content.ProjectionMap;
import com.android.common.content.SyncStateContentProviderHelper;
import com.android.common.io.MoreCloseables;
+import com.android.i18n.phonenumbers.Phonenumber;
import com.android.internal.util.ArrayUtils;
import com.android.providers.contacts.ContactLookupKey.LookupKeySegment;
import com.android.providers.contacts.ContactsDatabaseHelper.AccountsColumns;
@@ -2272,10 +2273,6 @@
@Override
public Bundle call(String method, String arg, Bundle extras) {
- LogFields.Builder logBuilder =
- LogFields.Builder.aLogFields()
- .setApiType(LogUtils.ApiType.CALL)
- .setStartNanos(SystemClock.elapsedRealtimeNanos());
waitForAccess(mReadAccessLatch);
switchToContactMode();
if (Authorization.AUTHORIZATION_METHOD.equals(method)) {
@@ -2316,54 +2313,34 @@
throw new IllegalArgumentException("Account name or type is empty");
}
- long resultId = -1;
final Bundle response = new Bundle();
final SQLiteDatabase db = mDbHelper.get().getWritableDatabase();
db.beginTransaction();
try {
- resultId = mDbHelper.get().createSimAccountIdInTransaction(
+ mDbHelper.get().createSimAccountIdInTransaction(
AccountWithDataSet.get(accountName, accountType, null), simSlot, efType);
db.setTransactionSuccessful();
- } catch (Exception e) {
- logBuilder.setException(e);
- throw e;
} finally {
- LogUtils.log(
- logBuilder
- .setMethodCall(LogUtils.MethodCall.ADD_SIM_ACCOUNTS)
- .setResultCount(resultId > -1 ? 1 : 0)
- .build());
db.endTransaction();
}
-
getContext().sendBroadcast(new Intent(SimContacts.ACTION_SIM_ACCOUNTS_CHANGED));
return response;
} else if (SimContacts.REMOVE_SIM_ACCOUNT_METHOD.equals(method)) {
- ContactsPermissions.enforceCallingOrSelfPermission(
- getContext(), MANAGE_SIM_ACCOUNTS_PERMISSION);
+ ContactsPermissions.enforceCallingOrSelfPermission(getContext(),
+ MANAGE_SIM_ACCOUNTS_PERMISSION);
final int simSlot = extras.getInt(SimContacts.KEY_SIM_SLOT_INDEX, -1);
if (simSlot < 0) {
throw new IllegalArgumentException("Sim slot is negative");
}
-
- int removedCount = 0;
final Bundle response = new Bundle();
final SQLiteDatabase db = mDbHelper.get().getWritableDatabase();
db.beginTransaction();
try {
- removedCount = mDbHelper.get().removeSimAccounts(simSlot);
+ mDbHelper.get().removeSimAccounts(simSlot);
scheduleBackgroundTask(BACKGROUND_TASK_UPDATE_ACCOUNTS);
db.setTransactionSuccessful();
- } catch (Exception e) {
- logBuilder.setException(e);
- throw e;
} finally {
- LogUtils.log(
- logBuilder
- .setMethodCall(LogUtils.MethodCall.REMOVE_SIM_ACCOUNTS)
- .setResultCount(removedCount)
- .build());
db.endTransaction();
}
getContext().sendBroadcast(new Intent(SimContacts.ACTION_SIM_ACCOUNTS_CHANGED));
@@ -2371,22 +2348,11 @@
} else if (SimContacts.QUERY_SIM_ACCOUNTS_METHOD.equals(method)) {
ContactsPermissions.enforceCallingOrSelfPermission(getContext(), READ_PERMISSION);
final Bundle response = new Bundle();
- int accountsCount = 0;
- try {
- final List<SimAccount> simAccounts = mDbHelper.get().getAllSimAccounts();
- response.putParcelableList(SimContacts.KEY_SIM_ACCOUNTS, simAccounts);
- accountsCount = simAccounts.size();
- return response;
- } catch (Exception e) {
- logBuilder.setException(e);
- throw e;
- } finally {
- LogUtils.log(
- logBuilder
- .setMethodCall(LogUtils.MethodCall.GET_SIM_ACCOUNTS)
- .setResultCount(accountsCount)
- .build());
- }
+
+ final List<SimAccount> simAccounts = mDbHelper.get().getAllSimAccounts();
+ response.putParcelableList(SimContacts.KEY_SIM_ACCOUNTS, simAccounts);
+
+ return response;
}
return null;
}
diff --git a/src/com/android/providers/contacts/util/LogFields.java b/src/com/android/providers/contacts/util/LogFields.java
index 4d07ca4..f4a60fe 100644
--- a/src/com/android/providers/contacts/util/LogFields.java
+++ b/src/com/android/providers/contacts/util/LogFields.java
@@ -34,8 +34,6 @@
private int resultCount;
- private int methodCall;
-
public LogFields(int apiType, int uriType, boolean callerIsSyncAdapter, long startNanos) {
this.apiType = apiType;
this.uriType = uriType;
@@ -71,10 +69,6 @@
return resultCount;
}
- public int getMethodCall() {
- return methodCall;
- }
-
public static final class Builder {
private int apiType;
private int uriType;
@@ -83,7 +77,6 @@
private Exception exception;
private Uri resultUri;
private int resultCount;
- private int methodCall;
private Builder() {
}
@@ -127,17 +120,11 @@
return this;
}
- public Builder setMethodCall(int methodCall) {
- this.methodCall = methodCall;
- return this;
- }
-
public LogFields build() {
LogFields logFields = new LogFields(apiType, uriType, callerIsSyncAdapter, startNanos);
logFields.resultCount = this.resultCount;
logFields.exception = this.exception;
logFields.resultUri = this.resultUri;
- logFields.methodCall = this.methodCall;
return logFields;
}
}
diff --git a/src/com/android/providers/contacts/util/LogUtils.java b/src/com/android/providers/contacts/util/LogUtils.java
index a564a35..9e12325 100644
--- a/src/com/android/providers/contacts/util/LogUtils.java
+++ b/src/com/android/providers/contacts/util/LogUtils.java
@@ -37,7 +37,6 @@
int INSERT = 2;
int UPDATE = 3;
int DELETE = 4;
- int CALL = 5;
}
// Keep in sync with ContactsProviderStatus#CallerType in
@@ -47,14 +46,6 @@
int CALLER_IS_NOT_SYNC_ADAPTER = 2;
}
- // Keep in sync with ContactsProviderStatus#MethodCall in
- // frameworks/proto_logging/stats/atoms.proto file.
- public interface MethodCall {
- int ADD_SIM_ACCOUNTS = 1;
- int REMOVE_SIM_ACCOUNTS = 2;
- int GET_SIM_ACCOUNTS = 3;
- }
-
private static final int STATSD_LOG_ATOM_ID = 301;
public static void log(LogFields logFields) {
@@ -66,8 +57,6 @@
.writeInt(getResultType(logFields.getException()))
.writeInt(logFields.getResultCount())
.writeLong(getLatencyMicros(logFields.getStartNanos()))
- .writeInt(0) // Empty value for TaskType
- .writeInt(logFields.getMethodCall())
.usePooledBuffer()
.build());
}
