summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--api/current.xml30
-rw-r--r--core/java/android/content/SyncManager.java10
-rw-r--r--core/java/android/database/sqlite/SQLiteClosable.java18
-rw-r--r--core/java/android/provider/ContactsContract.java41
-rwxr-xr-xcore/res/res/values/strings.xml31
-rw-r--r--libs/rs/rsScriptC_LibCL.cpp4
-rwxr-xr-xservices/jni/com_android_server_location_GpsLocationProvider.cpp4
7 files changed, 115 insertions, 23 deletions
diff --git a/api/current.xml b/api/current.xml
index ef73447..7db3e89 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -151841,6 +151841,36 @@
</implements>
<implements name="android.provider.ContactsContract.DataColumnsWithJoins">
</implements>
+<method name="getTypeLabel"
+ return="java.lang.CharSequence"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="res" type="android.content.res.Resources">
+</parameter>
+<parameter name="type" type="int">
+</parameter>
+<parameter name="label" type="java.lang.CharSequence">
+</parameter>
+</method>
+<method name="getTypeLabelResource"
+ return="int"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="type" type="int">
+</parameter>
+</method>
<field name="CONTENT_ITEM_TYPE"
type="java.lang.String"
transient="false"
diff --git a/core/java/android/content/SyncManager.java b/core/java/android/content/SyncManager.java
index c9115c5..34bd386 100644
--- a/core/java/android/content/SyncManager.java
+++ b/core/java/android/content/SyncManager.java
@@ -728,10 +728,16 @@ public class SyncManager implements OnAccountsUpdateListener {
newDelayInMs = maxSyncRetryTimeInSeconds * 1000;
}
+ final long backoff = now + newDelayInMs;
+
mSyncStorageEngine.setBackoff(op.account, op.authority,
- now + newDelayInMs, newDelayInMs);
+ backoff, newDelayInMs);
+
+ op.backoff = backoff;
+ op.updateEffectiveRunTime();
+
synchronized (mSyncQueue) {
- mSyncQueue.onBackoffChanged(op.account, op.authority, now + newDelayInMs);
+ mSyncQueue.onBackoffChanged(op.account, op.authority, backoff);
}
}
diff --git a/core/java/android/database/sqlite/SQLiteClosable.java b/core/java/android/database/sqlite/SQLiteClosable.java
index 96e6f22..93f9a71 100644
--- a/core/java/android/database/sqlite/SQLiteClosable.java
+++ b/core/java/android/database/sqlite/SQLiteClosable.java
@@ -23,14 +23,12 @@ import android.database.CursorWindow;
*/
public abstract class SQLiteClosable {
private int mReferenceCount = 1;
- private Object mLock = new Object(); // STOPSHIP remove this line
protected abstract void onAllReferencesReleased();
protected void onAllReferencesReleasedFromContainer() {}
public void acquireReference() {
- synchronized(mLock) { // STOPSHIP change 'mLock' to 'this'
- checkRefCount();
+ synchronized(this) {
if (mReferenceCount <= 0) {
throw new IllegalStateException(
"attempt to re-open an already-closed object: " + getObjInfo());
@@ -40,8 +38,7 @@ public abstract class SQLiteClosable {
}
public void releaseReference() {
- synchronized(mLock) { // STOPSHIP change 'mLock' to 'this'
- checkRefCount();
+ synchronized(this) {
mReferenceCount--;
if (mReferenceCount == 0) {
onAllReferencesReleased();
@@ -50,8 +47,7 @@ public abstract class SQLiteClosable {
}
public void releaseReferenceFromContainer() {
- synchronized(mLock) { // STOPSHIP change 'mLock' to 'this'
- checkRefCount();
+ synchronized(this) {
mReferenceCount--;
if (mReferenceCount == 0) {
onAllReferencesReleasedFromContainer();
@@ -76,12 +72,4 @@ public abstract class SQLiteClosable {
buff.append(") ");
return buff.toString();
}
-
- // STOPSHIP remove this method before shipping
- private void checkRefCount() {
- if (mReferenceCount > 1000) {
- throw new IllegalStateException("bad refcount: " + mReferenceCount +
- ". file bug against frameworks->database" + getObjInfo());
- }
- }
}
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java
index 0448ec0..9e6434a 100644
--- a/core/java/android/provider/ContactsContract.java
+++ b/core/java/android/provider/ContactsContract.java
@@ -5127,6 +5127,47 @@ public final class ContactsContract {
* <P>Type: TEXT</P>
*/
public static final String NAME = DATA;
+
+ /**
+ * Return the string resource that best describes the given
+ * {@link #TYPE}. Will always return a valid resource.
+ */
+ public static final int getTypeLabelResource(int type) {
+ switch (type) {
+ case TYPE_ASSISTANT: return com.android.internal.R.string.relationTypeAssistant;
+ case TYPE_BROTHER: return com.android.internal.R.string.relationTypeBrother;
+ case TYPE_CHILD: return com.android.internal.R.string.relationTypeChild;
+ case TYPE_DOMESTIC_PARTNER:
+ return com.android.internal.R.string.relationTypeDomesticPartner;
+ case TYPE_FATHER: return com.android.internal.R.string.relationTypeFather;
+ case TYPE_FRIEND: return com.android.internal.R.string.relationTypeFriend;
+ case TYPE_MANAGER: return com.android.internal.R.string.relationTypeManager;
+ case TYPE_MOTHER: return com.android.internal.R.string.relationTypeMother;
+ case TYPE_PARENT: return com.android.internal.R.string.relationTypeParent;
+ case TYPE_PARTNER: return com.android.internal.R.string.relationTypePartner;
+ case TYPE_REFERRED_BY:
+ return com.android.internal.R.string.relationTypeReferredBy;
+ case TYPE_RELATIVE: return com.android.internal.R.string.relationTypeRelative;
+ case TYPE_SISTER: return com.android.internal.R.string.relationTypeSister;
+ case TYPE_SPOUSE: return com.android.internal.R.string.relationTypeSpouse;
+ default: return com.android.internal.R.string.orgTypeCustom;
+ }
+ }
+
+ /**
+ * Return a {@link CharSequence} that best describes the given type,
+ * possibly substituting the given {@link #LABEL} value
+ * for {@link #TYPE_CUSTOM}.
+ */
+ public static final CharSequence getTypeLabel(Resources res, int type,
+ CharSequence label) {
+ if (type == TYPE_CUSTOM && !TextUtils.isEmpty(label)) {
+ return label;
+ } else {
+ final int labelRes = getTypeLabelResource(type);
+ return res.getText(labelRes);
+ }
+ }
}
/**
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 061fa4f..1d2ab1e 100755
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -1440,6 +1440,37 @@
<!-- Custom organization type -->
<string name="orgTypeCustom">Custom</string>
+ <!-- Custom relationship custom [CHAR LIMIT=20] -->
+ <string name="relationTypeCustom">Custom</string>
+ <!-- Assistant relationship type [CHAR LIMIT=20] -->
+ <string name="relationTypeAssistant">Assistant</string>
+ <!-- Brother relationship type [CHAR LIMIT=20] -->
+ <string name="relationTypeBrother">Brother</string>
+ <!-- Child relationship type [CHAR LIMIT=20] -->
+ <string name="relationTypeChild">Child</string>
+ <!-- Domestic Partner relationship type [CHAR LIMIT=20] -->
+ <string name="relationTypeDomesticPartner">Domestic Partner</string>
+ <!-- Father relationship type [CHAR LIMIT=20] -->
+ <string name="relationTypeFather">Father</string>
+ <!-- Friend relationship type [CHAR LIMIT=20] -->
+ <string name="relationTypeFriend">Friend</string>
+ <!-- Manager relationship type [CHAR LIMIT=20] -->
+ <string name="relationTypeManager">Manager</string>
+ <!-- Mother relationship type [CHAR LIMIT=20] -->
+ <string name="relationTypeMother">Mother</string>
+ <!-- Parent relationship type [CHAR LIMIT=20] -->
+ <string name="relationTypeParent">Parent</string>
+ <!-- Partner relationship type [CHAR LIMIT=20] -->
+ <string name="relationTypePartner">Partner</string>
+ <!-- Referred by relationship type [CHAR LIMIT=20] -->
+ <string name="relationTypeReferredBy">Referred by</string>
+ <!-- Relative relationship type [CHAR LIMIT=20] -->
+ <string name="relationTypeRelative">Relative</string>
+ <!-- Sister relationship type [CHAR LIMIT=20] -->
+ <string name="relationTypeSister">Sister</string>
+ <!-- Spouse relationship type [CHAR LIMIT=20] -->
+ <string name="relationTypeSpouse">Spouse</string>
+
<!-- Custom SIP address type -->
<string name="sipAddressTypeCustom">Custom</string>
<!-- Home SIP address type -->
diff --git a/libs/rs/rsScriptC_LibCL.cpp b/libs/rs/rsScriptC_LibCL.cpp
index ce8e7b2..1b1a752 100644
--- a/libs/rs/rsScriptC_LibCL.cpp
+++ b/libs/rs/rsScriptC_LibCL.cpp
@@ -205,9 +205,9 @@ static ScriptCState::SymbolTable_t gSyms[] = {
{ "_Z5asinhf", (void *)&asinhf },
{ "_Z6asinpif", (void *)&SC_asinpi },
{ "_Z4atanf", (void *)&atanf },
- { "_Z5atan2f", (void *)&atan2f },
+ { "_Z5atan2ff", (void *)&atan2f },
{ "_Z6atanpif", (void *)&SC_atanpi },
- { "_Z7atan2pif", (void *)&SC_atan2pi },
+ { "_Z7atan2piff", (void *)&SC_atan2pi },
{ "_Z4cbrtf", (void *)&cbrtf },
{ "_Z4ceilf", (void *)&ceilf },
{ "_Z8copysignff", (void *)&copysignf },
diff --git a/services/jni/com_android_server_location_GpsLocationProvider.cpp b/services/jni/com_android_server_location_GpsLocationProvider.cpp
index f5e17f5..a75e41d 100755
--- a/services/jni/com_android_server_location_GpsLocationProvider.cpp
+++ b/services/jni/com_android_server_location_GpsLocationProvider.cpp
@@ -199,8 +199,6 @@ GpsNiCallbacks sGpsNiCallbacks = {
static void agps_request_set_id(uint32_t flags)
{
- LOGD("agps_request_set_id: flags (%d)", flags);
-
JNIEnv* env = AndroidRuntime::getJNIEnv();
env->CallVoidMethod(mCallbacksObj, method_requestSetID, flags);
checkAndClearExceptionFromCallback(env, __FUNCTION__);
@@ -208,8 +206,6 @@ static void agps_request_set_id(uint32_t flags)
static void agps_request_ref_location(uint32_t flags)
{
- LOGD("agps_ref_location: flags (%d)", flags);
-
JNIEnv* env = AndroidRuntime::getJNIEnv();
env->CallVoidMethod(mCallbacksObj, method_requestRefLocation, flags);
checkAndClearExceptionFromCallback(env, __FUNCTION__);
generated by cgit v1.1 at 2025-10-21 03:15:14 +0000