diff options
24 files changed, 130 insertions, 88 deletions
diff --git a/core/java/android/accounts/AccountAuthenticatorResponse.java b/core/java/android/accounts/AccountAuthenticatorResponse.java index 614e139..41f26ac 100644 --- a/core/java/android/accounts/AccountAuthenticatorResponse.java +++ b/core/java/android/accounts/AccountAuthenticatorResponse.java @@ -33,7 +33,7 @@ public class AccountAuthenticatorResponse implements Parcelable { /** * @hide */ - /* package private */ AccountAuthenticatorResponse(IAccountAuthenticatorResponse response) { + public AccountAuthenticatorResponse(IAccountAuthenticatorResponse response) { mAccountAuthenticatorResponse = response; } diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java index b20cf88..e34c827 100644 --- a/core/java/android/content/ContentResolver.java +++ b/core/java/android/content/ContentResolver.java @@ -116,6 +116,10 @@ public abstract class ContentResolver { */ public static final String SYNC_EXTRAS_INITIALIZE = "initialize"; + /** @hide */ + public static final Intent ACTION_SYNC_CONN_STATUS_CHANGED = + new Intent("com.android.sync.SYNC_CONN_STATUS_CHANGED"); + public static final String SCHEME_CONTENT = "content"; public static final String SCHEME_ANDROID_RESOURCE = "android.resource"; public static final String SCHEME_FILE = "file"; @@ -181,7 +185,7 @@ public abstract class ContentResolver { }; /** @hide */ - static String syncErrorToString(int error) { + public static String syncErrorToString(int error) { if (error < 1 || error > SYNC_ERROR_NAMES.length) { return String.valueOf(error); } diff --git a/core/java/android/content/PeriodicSync.java b/core/java/android/content/PeriodicSync.java index 17813ec..513a556 100644 --- a/core/java/android/content/PeriodicSync.java +++ b/core/java/android/content/PeriodicSync.java @@ -79,6 +79,25 @@ public class PeriodicSync implements Parcelable { return account.equals(other.account) && authority.equals(other.authority) && period == other.period - && SyncStorageEngine.equals(extras, other.extras); + && syncExtrasEquals(extras, other.extras); + } + + /** {@hide} */ + public static boolean syncExtrasEquals(Bundle b1, Bundle b2) { + if (b1.size() != b2.size()) { + return false; + } + if (b1.isEmpty()) { + return true; + } + for (String key : b1.keySet()) { + if (!b2.containsKey(key)) { + return false; + } + if (!b1.get(key).equals(b2.get(key))) { + return false; + } + } + return true; } } diff --git a/core/java/android/content/SyncAdaptersCache.java b/core/java/android/content/SyncAdaptersCache.java index 7b643a0..8bb3ee7 100644 --- a/core/java/android/content/SyncAdaptersCache.java +++ b/core/java/android/content/SyncAdaptersCache.java @@ -31,7 +31,7 @@ import java.io.IOException; * A cache of services that export the {@link android.content.ISyncAdapter} interface. * @hide */ -/* package private */ class SyncAdaptersCache extends RegisteredServicesCache<SyncAdapterType> { +public class SyncAdaptersCache extends RegisteredServicesCache<SyncAdapterType> { private static final String TAG = "Account"; private static final String SERVICE_INTERFACE = "android.content.SyncAdapter"; @@ -39,7 +39,7 @@ import java.io.IOException; private static final String ATTRIBUTES_NAME = "sync-adapter"; private static final MySerializer sSerializer = new MySerializer(); - SyncAdaptersCache(Context context) { + public SyncAdaptersCache(Context context) { super(context, SERVICE_INTERFACE, SERVICE_META_DATA, ATTRIBUTES_NAME, sSerializer); } diff --git a/core/java/android/content/SyncInfo.java b/core/java/android/content/SyncInfo.java index abfe964..0284882 100644 --- a/core/java/android/content/SyncInfo.java +++ b/core/java/android/content/SyncInfo.java @@ -46,7 +46,7 @@ public class SyncInfo implements Parcelable { public final long startTime; /** @hide */ - SyncInfo(int authorityId, Account account, String authority, + public SyncInfo(int authorityId, Account account, String authority, long startTime) { this.authorityId = authorityId; this.account = account; diff --git a/core/java/android/content/SyncStatusInfo.java b/core/java/android/content/SyncStatusInfo.java index bb2b2da..49e3e35 100644 --- a/core/java/android/content/SyncStatusInfo.java +++ b/core/java/android/content/SyncStatusInfo.java @@ -46,7 +46,7 @@ public class SyncStatusInfo implements Parcelable { private static final String TAG = "Sync"; - SyncStatusInfo(int authorityId) { + public SyncStatusInfo(int authorityId) { this.authorityId = authorityId; } @@ -92,7 +92,7 @@ public class SyncStatusInfo implements Parcelable { } } - SyncStatusInfo(Parcel parcel) { + public SyncStatusInfo(Parcel parcel) { int version = parcel.readInt(); if (version != VERSION && version != 1) { Log.w("SyncStatusInfo", "Unknown version: " + version); diff --git a/core/java/android/server/package.html b/core/java/android/server/package.html deleted file mode 100644 index c9f96a6..0000000 --- a/core/java/android/server/package.html +++ /dev/null @@ -1,5 +0,0 @@ -<body> - -{@hide} - -</body> diff --git a/core/java/android/server/search/package.html b/core/java/android/server/search/package.html deleted file mode 100644 index c9f96a6..0000000 --- a/core/java/android/server/search/package.html +++ /dev/null @@ -1,5 +0,0 @@ -<body> - -{@hide} - -</body> diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java index 907b52a..555c7c2 100644 --- a/core/java/com/android/internal/widget/LockPatternUtils.java +++ b/core/java/com/android/internal/widget/LockPatternUtils.java @@ -123,14 +123,14 @@ public class LockPatternUtils { */ public static final int ID_DEFAULT_STATUS_WIDGET = -2; - protected final static String LOCKOUT_PERMANENT_KEY = "lockscreen.lockedoutpermanently"; - protected final static String LOCKOUT_ATTEMPT_DEADLINE = "lockscreen.lockoutattemptdeadline"; - protected final static String PATTERN_EVER_CHOSEN_KEY = "lockscreen.patterneverchosen"; + public final static String LOCKOUT_PERMANENT_KEY = "lockscreen.lockedoutpermanently"; + public final static String LOCKOUT_ATTEMPT_DEADLINE = "lockscreen.lockoutattemptdeadline"; + public final static String PATTERN_EVER_CHOSEN_KEY = "lockscreen.patterneverchosen"; public final static String PASSWORD_TYPE_KEY = "lockscreen.password_type"; public static final String PASSWORD_TYPE_ALTERNATE_KEY = "lockscreen.password_type_alternate"; - protected final static String LOCK_PASSWORD_SALT_KEY = "lockscreen.password_salt"; - protected final static String DISABLE_LOCKSCREEN_KEY = "lockscreen.disabled"; - protected final static String LOCKSCREEN_OPTIONS = "lockscreen.options"; + public final static String LOCK_PASSWORD_SALT_KEY = "lockscreen.password_salt"; + public final static String DISABLE_LOCKSCREEN_KEY = "lockscreen.disabled"; + public final static String LOCKSCREEN_OPTIONS = "lockscreen.options"; public final static String LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK = "lockscreen.biometric_weak_fallback"; public final static String BIOMETRIC_WEAK_EVER_CHOSEN_KEY @@ -138,7 +138,7 @@ public class LockPatternUtils { public final static String LOCKSCREEN_POWER_BUTTON_INSTANTLY_LOCKS = "lockscreen.power_button_instantly_locks"; - protected final static String PASSWORD_HISTORY_KEY = "lockscreen.passwordhistory"; + public final static String PASSWORD_HISTORY_KEY = "lockscreen.passwordhistory"; private final Context mContext; private final ContentResolver mContentResolver; diff --git a/core/java/com/android/internal/widget/LockSettingsService.java b/services/java/com/android/server/LockSettingsService.java index 4ecbd16..e20a21f 100644 --- a/core/java/com/android/internal/widget/LockSettingsService.java +++ b/services/java/com/android/server/LockSettingsService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.internal.widget; +package com.android.server; import android.content.ContentResolver; import android.content.ContentValues; @@ -32,6 +32,9 @@ import android.provider.Settings.Secure; import android.text.TextUtils; import android.util.Slog; +import com.android.internal.widget.ILockSettings; +import com.android.internal.widget.LockPatternUtils; + import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 55885e6..a7b502a 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -16,12 +16,10 @@ package com.android.server; -import android.accounts.AccountManagerService; import android.app.ActivityManagerNative; import android.bluetooth.BluetoothAdapter; import android.content.ComponentName; import android.content.ContentResolver; -import android.content.ContentService; import android.content.Context; import android.content.Intent; import android.content.pm.IPackageManager; @@ -32,13 +30,11 @@ import android.os.Handler; import android.os.HandlerThread; import android.os.Looper; import android.os.RemoteException; -import android.os.SchedulingPolicyService; import android.os.ServiceManager; import android.os.StrictMode; import android.os.SystemClock; import android.os.SystemProperties; import android.os.UserHandle; -import android.server.search.SearchManagerService; import android.service.dreams.DreamService; import android.util.DisplayMetrics; import android.util.EventLog; @@ -48,20 +44,23 @@ import android.view.WindowManager; import com.android.internal.os.BinderInternal; import com.android.internal.os.SamplingProfilerIntegration; -import com.android.internal.widget.LockSettingsService; import com.android.server.accessibility.AccessibilityManagerService; +import com.android.server.accounts.AccountManagerService; import com.android.server.am.ActivityManagerService; import com.android.server.am.BatteryStatsService; +import com.android.server.content.ContentService; import com.android.server.display.DisplayManagerService; import com.android.server.dreams.DreamManagerService; import com.android.server.input.InputManagerService; import com.android.server.net.NetworkPolicyManagerService; import com.android.server.net.NetworkStatsService; +import com.android.server.os.SchedulingPolicyService; import com.android.server.pm.Installer; import com.android.server.pm.PackageManagerService; import com.android.server.pm.UserManagerService; import com.android.server.power.PowerManagerService; import com.android.server.power.ShutdownThread; +import com.android.server.search.SearchManagerService; import com.android.server.usb.UsbService; import com.android.server.wm.WindowManagerService; diff --git a/core/java/android/accounts/AccountAuthenticatorCache.java b/services/java/com/android/server/accounts/AccountAuthenticatorCache.java index f937cde..7552368 100644 --- a/core/java/android/accounts/AccountAuthenticatorCache.java +++ b/services/java/com/android/server/accounts/AccountAuthenticatorCache.java @@ -14,8 +14,11 @@ * limitations under the License. */ -package android.accounts; +package com.android.server.accounts; +import android.accounts.AccountManager; +import android.accounts.AuthenticatorDescription; +import android.accounts.IAccountAuthenticator; import android.content.Context; import android.content.pm.PackageManager; import android.content.pm.RegisteredServicesCache; diff --git a/core/java/android/accounts/AccountManagerService.java b/services/java/com/android/server/accounts/AccountManagerService.java index 2b1a2b2..150df9e 100644 --- a/core/java/android/accounts/AccountManagerService.java +++ b/services/java/com/android/server/accounts/AccountManagerService.java @@ -14,9 +14,19 @@ * limitations under the License. */ -package android.accounts; +package com.android.server.accounts; import android.Manifest; +import android.accounts.Account; +import android.accounts.AccountAndUser; +import android.accounts.AccountAuthenticatorResponse; +import android.accounts.AccountManager; +import android.accounts.AuthenticatorDescription; +import android.accounts.GrantCredentialsPermissionActivity; +import android.accounts.IAccountAuthenticator; +import android.accounts.IAccountAuthenticatorResponse; +import android.accounts.IAccountManager; +import android.accounts.IAccountManagerResponse; import android.app.ActivityManager; import android.app.ActivityManagerNative; import android.app.Notification; diff --git a/core/java/android/accounts/IAccountAuthenticatorCache.java b/services/java/com/android/server/accounts/IAccountAuthenticatorCache.java index 06c2106..bb09687 100644 --- a/core/java/android/accounts/IAccountAuthenticatorCache.java +++ b/services/java/com/android/server/accounts/IAccountAuthenticatorCache.java @@ -14,8 +14,9 @@ * limitations under the License. */ -package android.accounts; +package com.android.server.accounts; +import android.accounts.AuthenticatorDescription; import android.content.pm.RegisteredServicesCache; import android.content.pm.RegisteredServicesCacheListener; import android.os.Handler; diff --git a/core/java/android/content/ContentService.java b/services/java/com/android/server/content/ContentService.java index 8bac888..3b92338 100644 --- a/core/java/android/content/ContentService.java +++ b/services/java/com/android/server/content/ContentService.java @@ -14,10 +14,19 @@ * limitations under the License. */ -package android.content; +package com.android.server.content; +import android.Manifest; import android.accounts.Account; import android.app.ActivityManager; +import android.content.ContentResolver; +import android.content.Context; +import android.content.IContentService; +import android.content.ISyncStatusObserver; +import android.content.PeriodicSync; +import android.content.SyncAdapterType; +import android.content.SyncInfo; +import android.content.SyncStatusInfo; import android.database.IContentObserver; import android.database.sqlite.SQLiteException; import android.net.Uri; @@ -30,7 +39,6 @@ import android.os.ServiceManager; import android.os.UserHandle; import android.util.Log; import android.util.SparseIntArray; -import android.Manifest; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/core/java/android/content/SyncManager.java b/services/java/com/android/server/content/SyncManager.java index e428968..cd66cf2 100644 --- a/core/java/android/content/SyncManager.java +++ b/services/java/com/android/server/content/SyncManager.java @@ -14,18 +14,32 @@ * limitations under the License. */ -package android.content; +package com.android.server.content; import android.accounts.Account; import android.accounts.AccountAndUser; import android.accounts.AccountManager; -import android.accounts.AccountManagerService; import android.app.ActivityManager; import android.app.AlarmManager; import android.app.Notification; import android.app.NotificationManager; import android.app.PendingIntent; -import android.content.SyncStorageEngine.OnSyncRequestListener; +import android.content.BroadcastReceiver; +import android.content.ComponentName; +import android.content.ContentResolver; +import android.content.Context; +import android.content.ISyncAdapter; +import android.content.ISyncContext; +import android.content.ISyncStatusObserver; +import android.content.Intent; +import android.content.IntentFilter; +import android.content.ServiceConnection; +import android.content.SyncActivityTooManyDeletes; +import android.content.SyncAdapterType; +import android.content.SyncAdaptersCache; +import android.content.SyncInfo; +import android.content.SyncResult; +import android.content.SyncStatusInfo; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.ProviderInfo; @@ -55,11 +69,12 @@ import android.text.format.Time; import android.util.EventLog; import android.util.Log; import android.util.Pair; -import android.util.Slog; import com.android.internal.R; import com.android.internal.annotations.GuardedBy; import com.android.internal.util.IndentingPrintWriter; +import com.android.server.accounts.AccountManagerService; +import com.android.server.content.SyncStorageEngine.OnSyncRequestListener; import com.google.android.collect.Lists; import com.google.android.collect.Maps; import com.google.android.collect.Sets; diff --git a/core/java/android/content/SyncOperation.java b/services/java/com/android/server/content/SyncOperation.java index a4c2cff..eaad982 100644 --- a/core/java/android/content/SyncOperation.java +++ b/services/java/com/android/server/content/SyncOperation.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package android.content; +package com.android.server.content; import android.accounts.Account; import android.content.pm.PackageManager; +import android.content.ContentResolver; import android.os.Bundle; import android.os.SystemClock; diff --git a/core/java/android/content/SyncQueue.java b/services/java/com/android/server/content/SyncQueue.java index c09703c..951e92c 100644 --- a/core/java/android/content/SyncQueue.java +++ b/services/java/com/android/server/content/SyncQueue.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package android.content; +package com.android.server.content; import android.accounts.Account; import android.content.pm.PackageManager; import android.content.pm.RegisteredServicesCache; +import android.content.SyncAdapterType; +import android.content.SyncAdaptersCache; import android.content.pm.RegisteredServicesCache.ServiceInfo; import android.os.SystemClock; -import android.os.UserHandle; import android.text.format.DateUtils; import android.util.Log; import android.util.Pair; diff --git a/core/java/android/content/SyncStorageEngine.java b/services/java/com/android/server/content/SyncStorageEngine.java index 8d9b8e0..5b8d26f 100644 --- a/core/java/android/content/SyncStorageEngine.java +++ b/services/java/com/android/server/content/SyncStorageEngine.java @@ -14,18 +14,16 @@ * limitations under the License. */ -package android.content; - -import com.android.internal.annotations.VisibleForTesting; -import com.android.internal.util.ArrayUtils; -import com.android.internal.util.FastXmlSerializer; - -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlPullParserException; -import org.xmlpull.v1.XmlSerializer; +package com.android.server.content; import android.accounts.Account; import android.accounts.AccountAndUser; +import android.content.ContentResolver; +import android.content.Context; +import android.content.ISyncStatusObserver; +import android.content.PeriodicSync; +import android.content.SyncInfo; +import android.content.SyncStatusInfo; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteException; @@ -39,9 +37,17 @@ import android.os.RemoteCallbackList; import android.os.RemoteException; import android.util.AtomicFile; import android.util.Log; +import android.util.Pair; import android.util.SparseArray; import android.util.Xml; -import android.util.Pair; + +import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.util.ArrayUtils; +import com.android.internal.util.FastXmlSerializer; + +import org.xmlpull.v1.XmlPullParser; +import org.xmlpull.v1.XmlPullParserException; +import org.xmlpull.v1.XmlSerializer; import java.io.File; import java.io.FileInputStream; @@ -50,9 +56,9 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.HashMap; import java.util.Iterator; +import java.util.List; import java.util.Random; import java.util.TimeZone; -import java.util.List; /** * Singleton that tracks the sync data and overall sync @@ -107,9 +113,6 @@ public class SyncStorageEngine extends Handler { public static final long NOT_IN_BACKOFF_MODE = -1; - public static final Intent SYNC_CONNECTION_SETTING_CHANGED_INTENT = - new Intent("com.android.sync.SYNC_CONN_STATUS_CHANGED"); - // TODO: i18n -- grab these out of resources. /** String names for the sync source types. */ public static final String[] SOURCES = { "SERVER", @@ -710,7 +713,7 @@ public class SyncStorageEngine extends Handler { for (int i = 0, N = authority.periodicSyncs.size(); i < N; i++) { Pair<Bundle, Long> syncInfo = authority.periodicSyncs.get(i); final Bundle existingExtras = syncInfo.first; - if (equals(existingExtras, extras)) { + if (PeriodicSync.syncExtrasEquals(existingExtras, extras)) { if (syncInfo.second == period) { return; } @@ -734,7 +737,7 @@ public class SyncStorageEngine extends Handler { int i = 0; while (iterator.hasNext()) { Pair<Bundle, Long> syncInfo = iterator.next(); - if (equals(syncInfo.first, extras)) { + if (PeriodicSync.syncExtrasEquals(syncInfo.first, extras)) { iterator.remove(); changed = true; // if we removed an entry from the periodicSyncs array also @@ -800,7 +803,7 @@ public class SyncStorageEngine extends Handler { new Bundle()); } reportChange(ContentResolver.SYNC_OBSERVER_TYPE_SETTINGS); - mContext.sendBroadcast(SYNC_CONNECTION_SETTING_CHANGED_INTENT); + mContext.sendBroadcast(ContentResolver.ACTION_SYNC_CONN_STATUS_CHANGED); } public boolean getMasterSyncAutomatically(int userId) { @@ -1095,24 +1098,6 @@ public class SyncStorageEngine extends Handler { return id; } - public static boolean equals(Bundle b1, Bundle b2) { - if (b1.size() != b2.size()) { - return false; - } - if (b1.isEmpty()) { - return true; - } - for (String key : b1.keySet()) { - if (!b2.containsKey(key)) { - return false; - } - if (!b1.get(key).equals(b2.get(key))) { - return false; - } - } - return true; - } - public void stopSyncEvent(long historyId, long elapsedTime, String resultMessage, long downstreamActivity, long upstreamActivity) { synchronized (mAuthorities) { diff --git a/core/java/android/os/SchedulingPolicyService.java b/services/java/com/android/server/os/SchedulingPolicyService.java index a3fede6..c0123bf 100644 --- a/core/java/android/os/SchedulingPolicyService.java +++ b/services/java/com/android/server/os/SchedulingPolicyService.java @@ -14,13 +14,12 @@ * limitations under the License. */ -package android.os; +package com.android.server.os; -import android.content.Context; import android.content.pm.PackageManager; import android.os.Binder; +import android.os.ISchedulingPolicyService; import android.os.Process; -import android.util.Log; /** * The implementation of the scheduling policy service interface. diff --git a/core/java/android/server/search/SearchManagerService.java b/services/java/com/android/server/search/SearchManagerService.java index 46f2723..132ae79 100644 --- a/core/java/android/server/search/SearchManagerService.java +++ b/services/java/com/android/server/search/SearchManagerService.java @@ -14,10 +14,7 @@ * limitations under the License. */ -package android.server.search; - -import com.android.internal.content.PackageMonitor; -import com.android.internal.util.IndentingPrintWriter; +package com.android.server.search; import android.app.ActivityManager; import android.app.ActivityManagerNative; @@ -45,6 +42,9 @@ import android.util.Log; import android.util.Slog; import android.util.SparseArray; +import com.android.internal.content.PackageMonitor; +import com.android.internal.util.IndentingPrintWriter; + import java.io.FileDescriptor; import java.io.PrintWriter; import java.util.List; diff --git a/core/java/android/server/search/Searchables.java b/services/java/com/android/server/search/Searchables.java index a0095d6..0ffbb7d 100644 --- a/core/java/android/server/search/Searchables.java +++ b/services/java/com/android/server/search/Searchables.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.server.search; +package com.android.server.search; import android.app.AppGlobals; import android.app.SearchManager; diff --git a/core/tests/coretests/src/android/accounts/AccountManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/accounts/AccountManagerServiceTest.java index 84c9957..00c3a67 100644 --- a/core/tests/coretests/src/android/accounts/AccountManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/accounts/AccountManagerServiceTest.java @@ -14,8 +14,10 @@ * limitations under the License. */ -package android.accounts; +package com.android.server.accounts; +import android.accounts.Account; +import android.accounts.AuthenticatorDescription; import android.app.Notification; import android.content.Context; import android.content.pm.PackageManager; diff --git a/core/tests/coretests/src/android/content/SyncOperationTest.java b/services/tests/servicestests/src/com/android/server/content/SyncOperationTest.java index 1fd25d2..f2772c8 100644 --- a/core/tests/coretests/src/android/content/SyncOperationTest.java +++ b/services/tests/servicestests/src/com/android/server/content/SyncOperationTest.java @@ -14,13 +14,15 @@ * limitations under the License. */ -package android.content; +package com.android.server; import android.accounts.Account; import android.os.Bundle; import android.test.AndroidTestCase; import android.test.suitebuilder.annotation.SmallTest; +import com.android.server.content.SyncOperation; + /** * You can run those tests with: * |