summaryrefslogtreecommitdiff
path: root/core/java/android/content/SyncManager.java
Commit message (Collapse)AuthorAgeFilesLines
* Move lingering services to services.jar.Jeff Sharkey2012-12-111-2771/+0
| | | | | | | | This helps reduce the pressure on framework.jar, and makes it clear that it should only be used by the system_server. Bug: 7333397 Change-Id: I0858904239535380fbf30562b793e277d8c3f054
* am 9634e970: am bfea4f04: am f5377a72: Merge "Useful annotations for code ↵Jeff Sharkey2012-11-161-1/+2
|\ | | | | | | | | | | | | documentation." into jb-mr1.1-dev * commit '9634e970679c687572e2da84250adc8baf91a8c3': Useful annotations for code documentation.
| * Useful annotations for code documentation.Jeff Sharkey2012-11-121-1/+2
| | | | | | | | | | Bug: 6537978 Change-Id: I806c3c09e3255f8789455f13bf37c1dde2a93f1f
* | am e78d50b4: am 6eb9844c: am 22788981: Merge "System server should always ↵Amith Yamasani2012-10-221-1/+1
|\| | | | | | | | | | | | | send broadcasts to a specific or all users" into jb-mr1-dev * commit 'e78d50b4a02a8242a99dea4cfacee2a7c9e7f122': System server should always send broadcasts to a specific or all users
| * System server should always send broadcasts to a specific or all usersAmith Yamasani2012-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7368245 Log a warning if the system process calls unqualified sendBroadcast() and other calls. As a result of the logging above, found a few more method calls such as bindService() that would benefit from being more explicit to avoid future confusion and reduce the log warnings. Change-Id: I17f15c8be9adf7becd456d6abbab606f19befdbf
* | am 283d1409: am f624d72c: am 8074e98b: Merge "Fix crashes when quickly ↵Amith Yamasani2012-10-211-1/+3
|\| | | | | | | | | | | | | adding and removing users" into jb-mr1-dev * commit '283d1409ddadd35cd41b5496659d3a24dc365fb0': Fix crashes when quickly adding and removing users
| * Fix crashes when quickly adding and removing usersAmith Yamasani2012-10-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make USER_REMOVED an ordered broadcast and send it before the user's state is completely removed from the system. This gives services the opportunity to clean up their state, while still having access to the user's directory and UserInfo object (such as serial number). Tell SyncManager to skip over dying/partially created users. Improve UserManager tests, waiting for users to be removed fully. Bug: 7382252 Change-Id: I93cfb39c9efe6f15087bf83c569a2d154ef27168
* | Add sync reason to dumpsysAlon Albert2012-10-191-80/+219
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also: * add a second history section that logs * log mesg as text instead of number * dump Sync Status as a table Sample log: Recent Sync History #1 : 2012-10-11 15:06:11 USER 0.4s aagmtest1@gmail.com/com.google u0 com.android.calendar com.google.android.calendar #2 : 2012-10-11 15:06:11 USER 0.1s aagmtest1@gmail.com/com.google u0 subscribedfeeds android.uid.system:1000 mesg=parse-error #3 : 2012-10-11 15:06:11 USER 0.0s aagmtest1@gmail.com/com.google u0 com.google.android.apps.uploader.PicasaUploadProvider android.uid.system:1000 #4 : 2012-10-11 15:06:10 USER 0.1s aagmtest1@gmail.com/com.google u0 com.google.android.gms.plus.action android.uid.system:1000 Recent Sync History Extras #1 : 2012-10-11 15:06:11 USER aagmtest1@gmail.com/com.google u0 com.android.calendar Bundle[{feed=aagmtest1@gmail.com, force=true, ignore_settings=true, ignore_backoff=true}] #2 : 2012-10-11 15:06:11 USER aagmtest1@gmail.com/com.google u0 subscribedfeeds Bundle[{ignore_backoff=true, force=true, ignore_settings=true}] #3 : 2012-10-11 15:06:11 USER aagmtest1@gmail.com/com.google u0 com.google.android.apps.uploader.PicasaUploadProvider Bundle[{ignore_backoff=true, force=true, ignore_settings=true}] #4 : 2012-10-11 15:06:10 USER aagmtest1@gmail.com/com.google u0 com.google.android.gms.plus.action Bundle[{ignore_backoff=true, force=true, ignore_settings=true}] Sync Status Account aagmtest1@gmail.com u0 com.google ======================================================================= Authority Syncable Enabled Delay Loc Poll Per Serv User Tot Time Last Sync Periodic ------------------------------------------------------------------------------------------------------------------------------------------------------------- com.google.android.apps.currents 1 true 0 2 1 2 1 6 0:35 PERIODIC SUCCESS 86400 2012-10-12 14:59:40 2012-10-13 14:58:13 com.google.android.music.MusicContent 1 true 0 0 1 2 1 4 0:09 PERIODIC SUCCESS 86400 2012-10-12 14:59:18 2012-10-13 14:58:13 com.google.android.gms.plus.action 1 true 0 0 1 1 1 3 0:00 PERIODIC SUCCESS 86400 2012-10-12 14:59:15 2012-10-13 14:58:13 com.google.android.apps.magazines 1 true 0 1 1 2 1 5 0:14 PERIODIC SUCCESS 86400 2012-10-12 14:59:00 2012-10-13 14:58:13 Change-Id: Iffeb825e4b4f6217940a39b0dd71e06856f08f3f
* Defer more Account actions until user starting.Jeff Sharkey2012-10-171-6/+5
| | | | | | | | Instead of explicitly scanning OWNER accounts, move to using the "user starting" call path for consistency. Bug: 7358086 Change-Id: Ied3289a074aafa48259d828db1d68804912589b3
* Lock SyncQueue when user starting, copy RSC list.Jeff Sharkey2012-10-161-7/+10
| | | | | | | | | Document SyncQueue locking policy and protect in onUserStarting() and clearAllBackoffs(). Return copy of ServiceInfo list from RegisteredServicesCache instead of exposing locking externally. Bug: 7357776, 7352537 Change-Id: I6a32ca98a355b639d4207a88bde572179beae359
* Database cleanup needs to happen for all users.Jeff Sharkey2012-10-111-3/+14
| | | | | Bug: 6970084 Change-Id: I9a6f1cbaf095b245ec9707a90c518256e0aa1f5f
* Fix a runtime restart when cycling between 4 usersAmith Yamasani2012-10-101-9/+4
| | | | | | | | Some refactoring in Sync Manager caused mUserManager to be initialized too late. Make sure this is initialized in the constructor now. Bug: 7328386 Change-Id: Ic67915e172c3b8ef368852147667287e38c0213b
* Include all accounts in dumpsys.Jeff Sharkey2012-10-101-2/+5
| | | | | | | | | Allow accounts to be loaded when a user is stopped, but always validate accounts against a freshly queried PMS cache when the user actually starts. Bug: 7276595 Change-Id: I0382064c73123c243bc6f6e5da8fc3d0a8b73442
* Make RegisteredServicesCache multi-user aware.Jeff Sharkey2012-10-091-123/+120
| | | | | | | | | | | | | | | | | | RegisteredServicesCache is used to track account authenticators and sync adapters, which can vary based on user. This change requires that callers now provide a userId when making cache requests. It continues persisting into a single file for now, which is keyed based on UID. It now watches for package broadcasts from all users, and scans packages on-demand. It changes cache callers to provide a relevant userId, and evicts cache entries when users are stopped. Changes SyncManager to only work with accounts from running users, only kicking off pending syncs once a user is started. Bug: 7276595, 7316150 Change-Id: I79466a84aa69aa37e4bd9691c5d6221d3662ff29
* Migrate more Secure settings to Global.Jeff Sharkey2012-09-271-2/+2
| | | | | | | | Migrate networking, storage, battery, DropBox, and PackageManager related Secure settings to Global table. Bug: 7232014, 7231331, 7231198 Change-Id: I772c2a9586a2f708c9db95622477f235064b8f4d
* Fix sync problems when setting up a new user and accountAmith Yamasani2012-09-261-2/+11
| | | | | | | | | | | Bug: 7197445 The listener on AccountManager is not sufficient since it only triggers when primary user's accounts change. Switch to watching for LOGIN_ACCOUNTS_CHANGED_ACTION for all users. Change-Id: I63f526aebd70f0ad777490f3e0b6e6894220d26c
* Skip operations for users who are not runningAlon Albert2012-09-211-12/+53
| | | | | | | | Listen to ACTION_USER_FOREGROUND and check alarms when it happens Also add user logging to dumpsys Bug: 7115753 Change-Id: Idb7881b62e31813feec684db8ff2e9d22e65a0f9
* Remove Binder.getOrigCallingUid().Dianne Hackborn2012-08-311-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced all remaining places that used it with explicit user specification. While doing this, I ran into stuff that was creating PendingIntent objects (that now need to specify the explicit user they are for), which are also posting notifications... but have no way to specify the user for the notification. So the notification manager in the system process now also gets a formal concept of a user associated with the notification, which is passed in to all the necessary aidl calls. I also removed the old deprecated aidl interface for posting/cancelling notifications, since we now always need a user supplied. There is more work that needs to be done here, though. For example I think we need to be able to specify USER_ALL for a notification that should be shown to all users (such as low storage or low battery). Along with that, the PendingIntent creation needs to be tweaked to be able to handle USER_CURRENT by evaluating the user at the point the pending intent is sent. That's for another change, however. Change-Id: I468e14dce8def0e13e0870571e7c31ed32b6310c
* UserHandle to UserSerialNo mappingAmith Yamasani2012-08-171-1/+1
| | | | | | | | | Use AtomicFile for usermanager files. Added a MANAGE_USERS permission that apps (signature permission) can use to create/query/modify/remove users. Change-Id: I5cf232232d0539e7508df8ec9b216e29c2351cd9
* Rename UserId to UserHandle.Dianne Hackborn2012-08-161-7/+7
| | | | | | This is the start of turning this into a formal public API. Change-Id: I5786d2c320f1de41a06ed5d0f65adb68967287a0
* User Manager service to manage users and query user detailsAmith Yamasani2012-08-111-6/+11
| | | | | | | | | | Moved a bunch of methods from PackageManager to UserManager. Fix launching of activities from recents to correct user. Guest creation APIs Change-Id: I0733405e6eb2829675665e225c759d6baa2b708f
* fix expedited syncs. there were times when an expedited sync wouldn'tFred Quintana2012-05-061-19/+39
| | | | | | correctly preempt non-expedited syncs Change-Id: Ia88ce6504c06d7c8e50e40362e8bf2b85bd0934b
* Merge "Synchronize/align periodic sync alarms based on a random per device ↵Ashish Sharma2012-04-111-14/+45
|\ | | | | | | seed value."
| * Synchronize/align periodic sync alarms based on a random per device seed value.Ashish Sharma2012-04-111-14/+45
| | | | | | | | | | | | Removes duplicates SyncHandler.MESSAGE_CHECK_ALARM messages from the queue. Change-Id: Ib29a06da904cebdd45ee05c9d9a6bf00b72100eb
* | Fix a race condition in SyncManager.onAccountsUpdated()Amith Yamasani2012-04-111-40/+6
|/ | | | | | | | | Get the full list of accounts from AccountManagerService in one shot instead of getting them per user. Bug: 6263091 Change-Id: I488f24749a96281ef1e2a620820399c97f471024
* User management and switchingAmith Yamasani2012-03-271-0/+23
| | | | | | | | | | | | | | | | | | | Broadcast intents that get sent out when users are added/removed/switched. More work on generating user-specific information in package manager queries. APIs to update user name and query a user by id. Removed Package.mSetStopped and mSetEnabled, since they're not user specific. User removal: - Cleanup ActivityManager, PackageManager, WallpaperManager, AppWidgetService and AccountManager. - Shutdown processes belonging to the user. Don't show vibrate option in long-press power if there's no vibrator. Lock the screen when switching users, to force unlocking. Change-Id: Ib23a721cb75285eef5fd6ba8c7272462764038fa
* Make SyncManager and AccountManagerService multi-user aware.Amith Yamasani2012-03-081-162/+212
| | | | | | | | | | | | | | | | | | | | | | | | | | | AccountManagerService - Maintain multiple account lists, one per user - Keep multiple databases of accounts - Account db moved to /data/system/users/<userid>/ SyncManager - SyncStorageEngine keeps track of multiple users' accounts. - SyncQueue maintained as a single instance, queueing requests from multiple users. - Changed some methods to take userId arguments - Removed some deadc0de - Store the userId in the SyncOperation, so we know which provider instance to bind to when queued operations are processed. ContentService - Pass along the userid to sync manager calls. ActivityManagerService: - Fixed a bug in cancelIntentSender - Don't bring other user's task forward when resetting tasks. Updated tests Change-Id: If317340ef68e902787aa3f5ceb4cf96f14aea695
* Log global autosync on dumpsysAlon Albert2012-01-111-55/+61
| | | | | | Protect dumpsys from divide by zero Change-Id: I3474f2f4b41643ef1e95cbcf835c96b66b13de38
* By default ICS allows two syncs to run in parallel. Make it onlyFred Quintana2011-12-051-2/+8
| | | | | | | | do one at a time for devices that don't have much RAM as defined by the call ActivityManager.isLargeRAM() Bug: 5713224 Change-Id: Ic8c42103f4031e1d7b1db797edcbbd7f7bac1387
* Work on process management.Dianne Hackborn2011-10-281-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a new concept of "B" services. All running services are classified as either A or B. B services are later in the LRU list. Their oom_adj is after the home app. This allows us to better pick services to kill based on how long they have running, and should reduce the amount that we end up killing the home app. This temporarly turns on a debug log when the oom_adj of a process is changed. Sorry, I know it is noisy. This is needed to try to track down why some processes are being killed. Also add a flag to the SyncManager's service binding to allow the syncing process to be more aggressively killed if it has done UI. This is to address cases we have seen where sync is causing an 80MB gmail process to be kept around, preventing other process from running. Now what will happen is that the syncing process will aggressively be killed by the system, and can then be restarted in a much lighter-weight state. Do a little tweak in the power manager to allow us to still do smooth brightness changes even when the fancy TV off animation is in use. And get rid of a debug log in the window manager that was accidentally left in. Change-Id: I64a8eeaaa1f096bab29c665fbff804c7f1d029e2
* Work on issue #5465917: Wakelock *overflow* held for very long timesDianne Hackborn2011-10-181-1/+1
| | | | | | | | | | | | | - Fix ordering problem in sync manager that would cause its wake locks to slightly appear in the system process when they should be fully accounted against the app. - Allow the system process to have more wake lock names in its battery stats. - In the bug report output, print totals of the wake locks for each process, to make it easier to parse what is being printed for things like the system process with a huge number of individual wake locks. Change-Id: I3cf39330f22f3c51c11e65e4124150d73a7da2dd
* Update dumpsys outputAlon Albert2011-10-031-40/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After using the new format for a few days, I decided it's better to ahve the auth & acct info on every row because we will sometimes grep the data and won't see it if the auth/acct is ommited. Also added the "time since last sync" to every row. This is also very useful. Detailed Statistics (Recent history): 31 (# of times) 119s (sync time) ------------------------------------------------------------------------------------- subscribedfeeds : 8/25% 17s/14% aagmtest2@gmail.com/com.google : 5/16% 16s/13% aagmtest1@gmail.com/com.google : 3/9% 1s/0% ------------------------------------------------------------------------------------- com.android.calendar : 5/16% 10s/8% aagmtest2@gmail.com/com.google : 3/9% 0s/0% aagmtest1@gmail.com/com.google : 2/6% 9s/8% ------------------------------------------------------------------------------------- com.google.android.apps.books : 3/9% 26s/22% ------------------------------------------------------------------------------------- com.android.contacts : 3/9% 14s/11% aagmtest1@gmail.com/com.google : 2/6% 9s/7% aagmtest2@gmail.com/com.google : 1/3% 5s/4% ------------------------------------------------------------------------------------- com.android.browser : 3/9% 12s/10% ------------------------------------------------------------------------------------- com.google.android.music.MusicContent : 3/9% 7s/6% ------------------------------------------------------------------------------------- gmail-ls : 2/6% 12s/10% ------------------------------------------------------------------------------------- com.google.android.apps.plus.content.EsGooglePhotoProvider : 2/6% 1s/0% aagmtest2@gmail.com/com.google : 1/3% 1s/0% aagmtest1@gmail.com/com.google : 1/3% 0s/0% ------------------------------------------------------------------------------------- com.google.android.apps.plus.content.EsProvider : 1/3% 10s/9% ------------------------------------------------------------------------------------- com.google.android.gallery3d.GooglePhotoProvider : 1/3% 5s/5% ------------------------------------------------------------------------------------- Recent Sync History #1 : 2011-10-03 13:26:41 SERVER 0.0s aagmtest2@gmail.com/com.google com.android.calendar #2 : 2011-10-03 13:26:40 LOCAL 1.8s aagmtest2@gmail.com/com.google subscribedfeeds #3 : 2011-10-03 13:26:40 LOCAL 0.1s aagmtest1@gmail.com/com.google subscribedfeeds #4 : 2011-10-03 13:26:37 SERVER 0.1s 4 aagmtest2@gmail.com/com.google com.android.calendar #5 : 2011-10-03 13:26:37 LOCAL 0.1s aagmtest2@gmail.com/com.google com.google.android.apps.books #6 : 2011-10-03 13:26:30 SERVER 0.9s 7 aagmtest2@gmail.com/com.google com.google.android.apps.books #7 : 2011-10-03 13:26:25 SERVER 1.1s aagmtest2@gmail.com/com.google gmail-ls #8 : 2011-10-03 13:26:13 SERVER 11.8s 11 aagmtest2@gmail.com/com.google gmail-ls #9 : 2011-10-03 13:26:08 SERVER 5.0s aagmtest2@gmail.com/com.google com.android.contacts #10 : 2011-10-03 13:26:08 SERVER 0.7s 29 aagmtest2@gmail.com/com.google com.android.calendar #11 : 2011-10-03 13:26:07 SERVER 0.7s aagmtest2@gmail.com/com.google com.android.browser #12 : 2011-10-03 13:26:04 SERVER 3.0s 2 aagmtest2@gmail.com/com.google com.android.browser #13 : 2011-10-03 13:26:04 SERVER 25.9s 25 aagmtest2@gmail.com/com.google com.google.android.apps.books Change-Id: I8da004f469d136fd9a86310b262eba61197fd0e7
* Add Detailed Sync Stats SectionAlon Albert2011-09-271-62/+232
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also improve history formatting Here's a smaple of what it looks like: Detailed Statistics (Recent history): 20 40s ------------------------------------------------------------------------------------- com.android.contacts : 9/45% 11/27% aagmtest1@gmail.com/com.google : 3/15% 4/11% aagmtest2@gmail.com/com.google : 3/15% 3/9% aalbert@google.com/com.google : 3/15% 2/6% ------------------------------------------------------------------------------------- gmail-ls : 6/30% 22/56% ------------------------------------------------------------------------------------- com.android.calendar : 3/15% 5/14% aagmtest1@gmail.com/com.google : 1/5% 4/12% aagmtest2@gmail.com/com.google : 1/5% 0/0% aalbert@google.com/com.google : 1/5% 0/0% ------------------------------------------------------------------------------------- com.google.android.apps.plus.content.EsGooglePhotoProvider : 2/10% 0/1% aagmtest1@gmail.com/com.google : 1/5% 0/1% aagmtest2@gmail.com/com.google : 1/5% 0/0% ------------------------------------------------------------------------------------- Recent Sync History #1 : 2011-09-23 15:18:35 SERVER 0.8s aalbert@google.com/com.google gmail-ls #2 : 2011-09-23 15:17:56 SERVER 1.3s 00:38 #3 : 2011-09-23 15:17:52 SERVER 4.6s 00:04 #4 : 2011-09-23 15:17:45 SERVER 1.7s 00:06 #5 : 2011-09-23 15:16:51 LOCAL 0.8s aagmtest2@gmail.com/com.google com.android.contacts #6 : 2011-09-23 15:16:51 LOCAL 0.7s aalbert@google.com/com.google com.android.contacts #7 : 2011-09-23 15:16:50 LOCAL 0.7s aagmtest1@gmail.com/com.google com.android.contacts #8 : 2011-09-23 15:15:35 LOCAL 0.7s aalbert@google.com/com.google com.android.contacts #9 : 2011-09-23 15:15:34 LOCAL 0.8s aagmtest2@gmail.com/com.google com.android.contacts #10 : 2011-09-23 15:15:33 LOCAL 1.9s aagmtest1@gmail.com/com.google com.android.contacts #11 : 2011-09-23 15:14:37 LOCAL 1.3s aalbert@google.com/com.google com.android.contacts #12 : 2011-09-23 15:14:35 LOCAL 2.0s aagmtest1@gmail.com/com.google com.android.contacts #13 : 2011-09-23 15:14:32 LOCAL 2.2s aagmtest2@gmail.com/com.google com.android.contacts #14 : 2011-09-23 15:13:41 SERVER 1.3s aalbert@google.com/com.google gmail-ls #15 : 2011-09-23 15:13:34 LOCAL 0.3s aalbert@google.com/com.google com.android.calendar #16 : 2011-09-23 15:13:34 LOCAL 0.4s aagmtest2@gmail.com/com.google com.android.calendar #17 : 2011-09-23 15:13:33 SERVER 0.1s aagmtest2@gmail.com/com.google com.google.android.apps.plus.content.EsGooglePhotoProvider #18 : 2011-09-23 15:13:33 SERVER 0.5s aagmtest1@gmail.com/com.google com.google.android.apps.plus.content.EsGooglePhotoProvider #19 : 2011-09-23 15:13:29 LOCAL 4.9s aagmtest1@gmail.com/com.google com.android.calendar #20 : 2011-09-23 15:13:28 SERVER 13.1s aalbert@google.com/com.google gmail-ls Change-Id: Idc904e2e18a373b6d2d10af65b02683c11fd8d90
* Revert "Make the SyncManager timeout syncs if it takes too long to bind to ↵Fred Quintana2011-09-121-51/+5
| | | | | | | | | them." This reverts commit bf3c634dc5bea1d6188efaba159b1ecbc038a4f7 Bug: 5290505 Change-Id: I11a681b48360f5c200a0602c4daf30ae82b4209c
* Merge "Make the SyncManager have wakelocks per account, not per account ↵Fred Quintana2011-09-081-5/+5
|\ | | | | | | type, otherwise the parallel sync behavior of gmail can cause the first account to finish to release the wakelock that is used for the other account, which will result in the device going to sleep before the sync is complete."
| * Make the SyncManager have wakelocks per account, not per account type,Fred Quintana2011-09-081-5/+5
| | | | | | | | | | | | | | | | | | otherwise the parallel sync behavior of gmail can cause the first account to finish to release the wakelock that is used for the other account, which will result in the device going to sleep before the sync is complete. Change-Id: I7658465ca0956dfd9bb341de03126869e6217d31
* | Changing the timeout for detecting syncs that are taking too long to bindSubir Jhanb2011-09-081-3/+3
|/ | | | | | BUG: 5222661 Change-Id: I9406980e26a4ee30ac6d5470bc97928e3dc74d24
* Make the SyncManager timeout syncs if it takes too long to bind to them.Fred Quintana2011-08-311-5/+51
| | | | | Bug: 5222661 Change-Id: Ia6b995744860a27d13ad1ee64fa06bef137b7731
* Check for periodic sync that is in the futureAlon Albert2011-08-161-2/+5
| | | | | Bug: 5164762 Change-Id: If578737bcfc4f83756f75c516657afdfc601caf1
* Avoid sync when UID network is disconnected.Jeff Sharkey2011-07-261-2/+18
| | | | | | | | During maybeStartNextSyncLocked(), check the network connectivity for the target UID, and skip when disconnected. Bug: 4519115 Change-Id: I8adee8e04521cb878624b19e557d01869f984c4c
* Rename method to discourage use of this in favor of member fieldAlon Albert2011-02-161-3/+3
| | | | Change-Id: Ie2d1e17e8879ad0f11fe815001fefccdd6603936
* Bring back auto clear backoff on reconnectAlon Albert2011-02-161-3/+20
| | | | | | | Also, make sure it works this time by calling onBackoffChanged() Bug: 3460736 Change-Id: I0470d6cb0aabd798dab4116d5d135c7a2364ed28
* am 3782fe2b: am f728411b: Merge "Fix bug #3395355 ("adb shell dumpsys ↵Fabrice Di Meglio2011-01-261-1/+34
|\ | | | | | | | | | | | | content" should present human readable failure messages instead of error codes)" into honeycomb * commit '3782fe2b23c4a6fa2e512f1d200ffa85c37bfb14': Fix bug #3395355 ("adb shell dumpsys content" should present human readable failure messages instead of error codes)
| * Fix bug #3395355 ("adb shell dumpsys content" should present human readable ↵Fabrice Di Meglio2011-01-261-1/+34
| | | | | | | | | | | | | | | | failure messages instead of error codes) - add human readable error messages Change-Id: Ib6937684e61aca80b2c3bc78fd67b93c3df61d17
* | am 24bc5331: am cef29578: Merge "Change local names for greater clarity." ↵Robert Greenwalt2011-01-111-2/+2
|\| | | | | | | | | | | | | into honeycomb * commit '24bc5331cd302bfdf83ebee14a6acff7b6b48a34': Change local names for greater clarity.
| * Change local names for greater clarity.Robert Greenwalt2011-01-111-2/+2
| | | | | | | | Change-Id: I806284317c0c756260080b6c006b4c338b9cbc6d
* | am 7710465f: am 55ccb887: Merge "Don\'t check for services before ↵Robert Greenwalt2011-01-101-2/+2
|\| | | | | | | | | | | | | boot-complete" into honeycomb * commit '7710465f38217fd452ec6512c2c5d84c65d37729': Don't check for services before boot-complete
| * Don't check for services before boot-completeRobert Greenwalt2011-01-101-2/+2
| | | | | | | | | | | | fixes the build Change-Id: I2ee55d9aaad53dac16fa8182df3a7b43b57eb719
| * Making the sync manager take the data connected value from ↵Subir Jhanb2011-01-101-37/+5
| | | | | | | | | | | | | | | | ConnectivityManager and not from the intent. BUG:3337128 Change-Id: Ife2705569fcdde1b201773d6622a8a9d0b7ccfa1
* | Making the sync manager take the data connected value from ↵Subir Jhanb2011-01-101-37/+6
|/ | | | | | | | | ConnectivityManager and not from the intent. BUG: 3337128 BUG: 3334394 Change-Id: I75b88c7cc0be526e8e7e441aa2668307e2452e62