summaryrefslogtreecommitdiffstats
path: root/services/tests
Commit message (Collapse)AuthorAgeFilesLines
* Remove dead code, mostly DataStateTracker.Paul Jensen2015-03-111-1/+0
| | | | Change-Id: I1433937bffdb29bd42fb1adbfcf0a50ceffac7dd
* Offer to "merge" subscribers for data usage.Jeff Sharkey2014-12-082-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | There are some cases where multiple subscriber identities (IMSI) should be treated as "merged together" from a data usage perspective. This is done by extending the template used for matching purposes to support multiple subscribers. Then, when we query historical usage or set network policies, we normalize the matching template to merge to any other identities that should be included. When normalizing, the "lowest" identity is always used for equality and storage purposes, which allows identities to come and go over time. This change also fixes data usage recording for multi-SIM devices by passing along the concrete subscriber identity for each network interface. Also correctly create default policies for multi-SIM devices. This change also drops setPolicyDataEnable() until it can be wired up to the right underlying NetworkAgent. (This means we still bring up the network, and then rely on iptables rules to block traffic when over the limit, instead of proactively disabling the connection.) Bug: 18012787 Change-Id: If6acf32009fdfea2b836f5aff8e2f3e5e0248b4a
* Eliminate race conditions in UID-based network filtering.Sreeram Ramachandran2014-11-212-4/+4
| | | | | | | | | | | | | | | | | | | The previous code retrieved information from the legacy tracker multiple times for each user query, leading to race conditions where the info could've changed between the calls. Refactors the handling of legacy data types in ConnectivityService and unifies call paths so that APIs that deal with legacy data types (NetworkInfo and int/networkType) and newer types (such as Network) go through common code paths, using NetworkState to hold all the necessary data pieces. This enables follow-on bug fixes to getActiveNetworkInfo(). The changes are limited to public "query" APIs (those that retrieve some network information or the other). More details about the specific changes and their rationale can be found in the code review thread. Bug: 17460017 Change-Id: I656ee7eddf2b8cace5627036452bb5748043406c
* Add LockSettingsStorage testsAdrian Roos2014-11-101-0/+330
| | | | Bug: 18163444 Change-Id: I563276e6d445d43d05bf0d3c633440a8e0109b69
* Merge "Follow API removal." into lmp-mr1-devJeff Sharkey2014-10-271-1/+0
|\
| * Follow API removal.Jeff Sharkey2014-10-271-1/+0
| | | | | | | | | | Bug: 18118003 Change-Id: Iad73ce748e05ba0660246e8dbb041415c187f792
* | Follow ArraySet refactoring.Jeff Sharkey2014-10-271-13/+6
|/ | | | | Bug: 18115729 Change-Id: I2c32965b621b5bb57ff3bde02b00b31b59a5cd6d
* Fix lock ordering in JobSchedulerMatthew Williams2014-09-231-1/+3
| | | | | | | | | | | | | BUG: 17625667 Two part clean-up. 1) Don't try to lock in onControllerStateChanged. Do it in the handleMessage instead where the rest of the locking is. This is sufficient to fix this bug. 2) The other side of the deadlock came b/c we lock when cancelling and calling stopTrackingJob. Controllers handle their own locking so this isn't necessary. B/c of a potential race from the controller side, added an explicit check for the JSS to only run an expired job if it still exists. Change-Id: Iaeebbc19437eb5b73e3ced3168f1fc13e564a4be
* Add some @SystemApi tags for internal user-related APIsAmith Yamasani2014-09-031-1/+2
| | | | | | | Also added an internal isManagedProfile() Bug: 17371392 Change-Id: Ibcc26771d954505cbd530192bf4a8a25a8d4cae0
* Implement API review feedback for JobSchedulerMatthew Williams2014-08-221-12/+12
| | | | | | | | BUG: 17005336 Took the opportunity to clean up some back-off logic Change-Id: Ibc8ae34d1d44dd064ba071e4cbad17872f7e38cf
* Remove a line that was accidentally committed.Narayan Kamath2014-08-221-1/+0
| | | | | | | Prevents the APK from being installed. bug: 17153971 Change-Id: Ic53c94dc6f0583371965d5edb0b12248c915214e
* Fix service tests.Narayan Kamath2014-08-212-1/+4
| | | | | | | | | | | | | Depending on a LOCAL_JAVA_LIBRARY doesn't do anything at runtime unless the library is manually added to the class path. Since system server classes (and the system server) can't be instrumented like a normal app can, we can't really write "real" Instrumentation Tests for its classes. Given that, we can just compile the classes under test into the same jar file as the testcases. Change-Id: Ie4377bf81b9542ceca938e26ac78e30835fc40bc
* Made AlarmClockInfo a nested class in AlarmManagerJose Lima2014-08-141-2/+2
| | | | | Bug: 16959028 Change-Id: I150eaaff765d1e214c3621c1bf50162ec0dac8ec
* Decouple user limit from guest creationAmith Yamasani2014-08-131-0/+35
| | | | | | | | | | | | | Allow Guest to be created even if there are N users. Allow N users to be created even if there are N-1 users and a Guest. Limit number of guests and managed profiles that can be added. Added unit tests. Bug: 15934700 Change-Id: I1a8f0fa38a91d71ef7b2980e05c974244dfc337a
* Remove dead code 2.Robert Greenwalt2014-07-281-141/+142
| | | | | | | | Removing ConnectivityService.NetworkFactory. This requires disabling the ConnectivityServiceTest, but that's been broken since we stopped using NetworkStateTrackers anyway. Change-Id: I9b86bd37eb9d018c40f60dca5b00d62c36d4e3ad
* Fix JobScheduler race conditionMatthew Williams2014-07-231-58/+44
| | | | | | | The loading of jobs from disk is now done sychronously. Bug: 16372824 Change-Id: Ica0592d6de51e89662c9e49ed1eb59209b64356c
* Honor the sort and group keys for notification ranking.Chris Wren2014-07-231-0/+136
| | | | | | | | | | | | | | | Sort notifications naturally, then move group childen to be next their proxy. The group proxy is the summary, or if no summary exists, the lowest-ranked member of the group is chosen as the proxy. Notifications with a sortKey but no group and placed into a synthetic group that consists of all notifications from that package and user in the same priority bucket that also have sortKeys. Expose a new API for listeners to get the group key for the notificaiton. Bug: 15190903 Change-Id: I324ba0c394affdabb3588ca2ebafa7cf0acad2af
* Revert "Honor the sort and group keys for notification ranking."Chris Wren2014-07-231-136/+0
| | | | | | This reverts commit df09d4c348f9f2aea10391b27d157d8b71a9e189. Change-Id: Idbc9ed5c5c83cd0cad5a71872bcc203321a11e9e
* Honor the sort and group keys for notification ranking.Chris Wren2014-07-231-0/+136
| | | | | | | | | | | | | Sort notifications naturally, then move group childen to be next their proxy. The group proxy is the summary, or if no summary exists, the lowest-ranked member of the group is chosen as the proxy. Notifications with a sortKey but no group and placed into a synthetic group that consists of all notifications from that package and user in the same priority bucket that also have sortKeys. Bug: 15190903 Change-Id: I377ed65b9592079446da4a4189f5ab49d28630ec
* Cleanup: Delete dead code.Sreeram Ramachandran2014-07-221-4/+1
| | | | | Bug: 15413389 Change-Id: I315468832ef18ffc84174e54774ab63b86d284dc
* Add job persistance as a setter in the APIMatthew Williams2014-07-101-5/+9
| | | | | Bug: 15936795 Change-Id: I11e5a722bab5838dc151670256ed09dfaa7fdaa7
* Add AlarmClock API to AlarmManagerAdrian Roos2014-07-101-1/+2
| | | | | | | | | Adds a new kind of alarm that represents an alarm clock and a way to query the next scheduled alarm clock. Deprecates Settings.System.NEXT_ALARM_FORMATTED. Bug: 14589952 Change-Id: I297eeeff36d07adcda010afac183d0f5ee37dc99
* am 8e8c1401: Fix build.Matthew Williams2014-06-112-69/+0
|\ | | | | | | | | * commit '8e8c140114cb3a4f1cf448c4492c13769738ca12': Fix build.
| * Fix build.Matthew Williams2014-06-102-69/+0
| | | | | | | | | | | | Two tests were breaking the build. Change-Id: If424a552d3fedb912fa94870b88c60dc3750b69a
* | am d8f71d34: Merge "Out with the old; in with the new" into lmp-preview-devChristopher Tate2014-06-112-44/+48
|\ \ | |/ | | | | | | * commit 'd8f71d34c3c7fb161a1586de8edb52161c32d672': Out with the old; in with the new
| * Out with the old; in with the newChristopher Tate2014-06-102-44/+48
| | | | | | | | | | | | | | | | Switch to the official "JobScheduler" etc naming. Bug 14997851 Change-Id: I73a61aaa9af0740c114d08188bd97c52f3ac86b7
* | am 3b471117: Merge "Add OnNetworkActive to TaskManager and simplify ↵Matthew Williams2014-06-101-2/+2
|\ \ | |/ | | | | | | | | | | locking." into lmp-preview-dev * commit '3b4711176e77640d697e94137e65fa93c8363f5c': Add OnNetworkActive to TaskManager and simplify locking.
| * Add OnNetworkActive to TaskManager and simplify locking.Matthew Williams2014-06-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14993295 Hooks up a ConnectivityManager.NetworkActiveListener.      Previously was using 3 locks where 1 would suffice, negligible to no performance issues b/c most of the previous locks were nested. Added OnNetworkActiveListener so that the ConnectivityController can kick of tasks when it knows that the network is active. Fixed some bugs that stopped timecontroller from executing tasks. Requesting a retry will not add a deadline to that task. However backed-off tasks are run as soon as they are ready, subject to their constraints. Added receiver to listen for package removal and user removal, which will delete any outstanding jobs for that uid. Change-Id: I4c4523af558b927f19b8a215878fcc7198abb93f
* | am 1a2f47d4: Merge "Add persistence of tasks for TaskManager & ↵Matthew Williams2014-06-052-0/+265
|\ \ | |/ | | | | | | | | | | BatteryController" into lmp-preview-dev * commit '1a2f47d4cdc0ea40dff1b88f7976d64c19d687b1': Add persistence of tasks for TaskManager & BatteryController
| * Add persistence of tasks for TaskManager & BatteryControllerMatthew Williams2014-06-052-0/+265
| | | | | | | | | | | | | | | | | | | | | | Tasks are persisted only if the client has the RECEIVE_BOOT_COMPLETED permission. This applies to both periodic and one-off tasks. Write out task as xml, using PersistableBundle for the extras data. Todo: Add persistable bundle to xml when ag/468207 is merged. Also added BatteryController logic. Change-Id: I23eeeb8b3bc6ba155e7fa4ec25857a68ee8b1567
* | Handle saving and restoring ints in application restrictionsAmith Yamasani2014-06-013-1/+175
| | | | | | | | | | | | Unit tests for restrictions types and proper escaping. Change-Id: Iac35521faf5798398a89fecbad82fcdd256a4146
* | add tests for ValidateNotificationPeople.getExtraPeople()Chris Wren2014-05-291-0/+152
|/ | | | Change-Id: Ieb8acce58574c25cccce674b4494f75d96b57125
* Fix build.Sreeram Ramachandran2014-05-141-8/+12
| | | | Change-Id: I5dab09d2d8a9cff56fa17bb4e8c14b365449399b
* Get ConnectivityServiceTest building again after 8f80cc8.Paul Jensen2014-05-141-2/+2
| | | | Change-Id: I4520011ba2076d8fac1ca234cb9a79c774992671
* am 80edaa67: am 24c089a8: Fix build.Narayan Kamath2014-04-111-3/+3
|\ | | | | | | | | * commit '80edaa676bd59409f8a82e12c035bee96e653004': Fix build.
| * Fix build.Narayan Kamath2014-04-111-3/+3
| | | | | | | | | | | | isScreenOn was changed to isInteractive. Change-Id: I381d0b0ca745b61e64ac6309c2a6307696f52be0
| * am 4701b51a: am bb87ac7f: DO NOT MERGE: Downgrade expedited to normal on ↵Matthew Williams2014-03-251-5/+6
| |\ | | | | | | | | | | | | | | | | | | reschedule. * commit '4701b51af216ce2b6fa9fa508ebba47bf13063c7': DO NOT MERGE: Downgrade expedited to normal on reschedule.
| | * DO NOT MERGE: Downgrade expedited to normal on reschedule.Matthew Williams2014-03-241-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 12033540 Expedited was previously tracked by a redundant internal variable, ostensibly as an optimisation. This variable could differ from the value in the bundle depending on how the operation is initialised, which led to confusion. Now an expedited sync will only be treated as such on its first execution. Change-Id: Ibfc4e9e49b86c82f2364a6ef55f887705a053eb6
| * | Include subdirectory Android.mks.Ying Wang2014-01-091-0/+3
| | | | | | | | | | | | Change-Id: I6e6bc721dbcf127b52f2a60f255c9fc677d3be29 (cherry picked from commit c459bfea7e7be4343387dee137d4a5be9742fd91)
* | | Merge "Downgrade expedited to normal on reschedule."Matthew Williams2014-03-212-20/+65
|\ \ \
| * | | Downgrade expedited to normal on reschedule.Matthew Williams2014-02-062-20/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 12033540 Expedited was previously tracked by a redundant internal variable, ostensibly as an optimisation. This variable could differ from the value in the bundle depending on how the operation is initialised, which led to confusion. Now an expedited sync will only be treated as such on its first execution. Change-Id: I9979102317aecbe8bc53a36381d4b2782ac131be Conflicts: services/core/java/com/android/server/content/SyncOperation.java services/core/java/com/android/server/content/SyncQueue.java
* | | | Update the tests to deal with the new timestamps in idletimer module.Ashish Sharma2014-03-181-4/+11
| | | | | | | | | | | | | | | | Change-Id: I1a8368d84ef806f1501b0a1f5e817388a1d10518
* | | | Tabs -> spaces in frameworks/base.John Spurlock2014-02-251-3/+3
| | | | | | | | | | | | | | | | Change-Id: I5a84e8e93ac99b5ed0212b37bf66efa5e53864be
* | | | Merge "Log history of location requests in LocationManager. -Assists with ↵David Christie2014-02-131-0/+175
|\ \ \ \ | | | | | | | | | | | | | | | debugging power issues. Bug: 12824233"
| * | | | Log history of location requests in LocationManager.David Christie2014-02-031-0/+175
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | -Assists with debugging power issues. Bug: 12824233 Change-Id: Iaaef0dbe00154c7668034a166587671b75d1f3c7
* | | | Extend DeviceOwner concept to accommodate ProfileOwnersAdam Connors2014-02-061-0/+88
|/ / / | | | | | | | | | | | | | | | | | | | | | ProfileOwners, like DeviceOwners, are Device Admins that have additional priviledges. ProfileOwners however are scoped per user. Change-Id: I1e22c85878e0672121e6ebbe97fca38591f992b2
* | | Include subdirectory Android.mks.Ying Wang2014-01-091-0/+3
| | | | | | | | | | | | Change-Id: I6e6bc721dbcf127b52f2a60f255c9fc677d3be29
* | | am 263c4788: am 30253d7a: am 2daa0c93: Merge "Add address flags and scope to ↵Lorenzo Colitti2013-12-091-6/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | LinkAddress." * commit '263c4788dcf45f104f8668fd6621d1a7c39689b9': Add address flags and scope to LinkAddress.
| * | Add address flags and scope to LinkAddress.Lorenzo Colitti2013-12-061-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is necessary so that the framework can know whether an IPv6 address is likely to be usable (i.e., if it's global scope and preferred). Also, it will simplify the address notification methods in INetworkManagementEventObserver, which currently take the address, the flags, and the scope as separate arguments. 1. Add flags and scope to the class and update the unit test. Use the IFA_F_* and RT_SCOPE_* constants defined by libcore. Since most callers don't know about flags and scope, provide constructors that default the flags to zero and determine the scope from the address. Addresses notified by the kernel will have these properly set. Make multicast addresses invalid. Update the class documentation. 2. Provide an isSameAddressAs() method that compares only the address and prefix information between two LinkAddress objects. This is necessary because an interface can't have two addresses with the same address/prefix but different flags. 3. Update LinkProperties's addLinkAddress and removeLinkAddress to identify existing addresses to add/remove using isSameAddressAs instead of implicit equals(). Specifically: - If addLinkAddress is called with an address that is already present, the existing address's flags and scope are updated. This allows, for example, an address on an interface to go from preferred to deprecated when it expires, without it having to be removed and re-added. - If removeLinkAddress is called with an address that is present but with different flags, it deletes that address instead of failing to find a match. 4. Update the INetworkManagementEventObserver address notification methods to take just a LinkAddress instead of LinkAddress, flags, and scope. While I'm at it, change the order of the arguments for consistency with the other functions in the interface. Change-Id: Id8fe0f09a7e8f6bee1ea3b52102178b689a9336e
* | | am 4806fdfb: am f226bc60: Merge "Use LinkAddress in address notifications."Lorenzo Colitti2013-12-021-5/+9
|\ \ \ | |/ / | | | | | | | | | * commit '4806fdfbd0fecf91584396fc0f620c97a05ab837': Use LinkAddress in address notifications.