summaryrefslogtreecommitdiffstats
path: root/core/tests
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge "Update WifiManager API"Irfan Sheriff2012-07-253-28/+4
|\ \ \ \
| * | | | Update WifiManager APIIrfan Sheriff2012-07-243-28/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use feedback based on NSD to update WifiManager API Change-Id: I0c1dc74f7e2fa7cd697a995b7194e3e0366d7981
* | | | | Merge "Replace left/right with start/end for Gravity / LayoutParams / Padding"Fabrice Di Meglio2012-07-242-2/+2
|\ \ \ \ \
| * | | | | Replace left/right with start/end for Gravity / LayoutParams / PaddingFabrice Di Meglio2012-07-192-2/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | - see bug #5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi) Change-Id: Id9af5375fb9b0edeae5232c77e52ecd497bd2e67
* | | | | Avoid emitting broken ASCII.Jeff Sharkey2012-07-211-2/+7
|/ / / / | | | | | | | | | | | | | | | | Bug: 6131887 Change-Id: Iff13573aad8128cc7ae3613ab718c81e6d0862a1
* | | | Merge commit '1b003ef0' into mitWink Saville2012-07-111-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * commit '1b003ef0': Create telephony-common and mms-common Change-Id: Ie8876541dbe7f4c933cf7d69910dd204538bc975
| * | | Create telephony-common and mms-commonWink Saville2012-07-111-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These have been created to reduce the size and complexity of frameworks/base. mms-common was created by moving all of frameworks/base/core/java/com/google/android/mms to: frameworks/opt/mms telephony-common was created by moving some of frameworks/base/telephony to: frameworks/opt/telephony Change-Id: If6cb3c6ff952767fc10210f923dc0e4b343cd4ad
| * | Enhance StateMachine Quitting and logging support. DO NOT MERGEWink Saville2012-07-021-236/+366
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make StateMachine#quit non-conditional and remove the need to process the SM_QUIT_CMD it is now private. Rename halting to onHalting. Add onQuitting Change the message specific logging to be more generic and change the xxxProcessedMessagesYyy methods to xxxLogRecXyy names. Also add addLogRec(String) and addLogRec(String, State) as the generic logging methods. bug: 5678189 Change-Id: I22f66d11828bfd70498db625fe1be728b90478b7 Conflicts: services/java/com/android/server/NsdService.java
* | | Merge "Packages for PackageManagerService tests"Kenny Root2012-06-209-0/+152
|\ \ \
| * | | Packages for PackageManagerService testsKenny Root2012-06-189-0/+152
| | | | | | | | | | | | | | | | Change-Id: I3fd96abb0560fd8c596304d9c233e2f8f3fd8089
* | | | am 535d3b3f: am 0cf34218: Merge "Adding test cases for getInstalledPackages"Kenny Root2012-06-157-0/+322
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '535d3b3f3363af6a5f2acb620542baec4cb96b45': Adding test cases for getInstalledPackages
| * | | am 0cf34218: Merge "Adding test cases for getInstalledPackages"Kenny Root2012-06-157-0/+322
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '0cf342184e030ee6f65d87eeba48484725910a8b': Adding test cases for getInstalledPackages
| | * \ \ Merge "Adding test cases for getInstalledPackages"Kenny Root2012-06-157-0/+322
| | |\ \ \
| | | * | | Adding test cases for getInstalledPackagesMartin Wallgren2012-06-077-0/+322
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was an earlier fix for a case where the binder heap would run out of space when calling the getInstalledPackages. This could happen when there were a lot of installed packages. This change adds some test cases to verify that fix. Change-Id: I8e0c5f674bf2098adcff6d40893f94162961031f
* | | | | | Merge "SearchManagerService made multi-user aware"Amith Yamasani2012-06-151-3/+3
|\ \ \ \ \ \
| * | | | | | SearchManagerService made multi-user awareAmith Yamasani2012-06-151-3/+3
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache Searchables per user and query package manager through the private interface. Change-Id: I1d24fdd27cce8c27be45287cbfcb4df1e2ce2cf1
* | | | | | Clean up host tests that have been moved to TF.Tsu Chiang Chuang2012-06-136-2640/+0
|/ / / / / | | | | | | | | | | | | | | | Change-Id: Iebadfc6aefeca18a944079a7e9115a3c53c211ce
* | | | | am d26f7139: Merge "resolved conflicts for merge of 9855f6e2 to ↵Kenny Root2012-06-081-0/+45
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | jb-dev-plus-aosp" into jb-dev-plus-aosp * commit 'd26f7139a7ff42ca1be470657515767f7509955b': Add JNI bindings for some of the libselinux interfaces.
| * | | | resolved conflicts for merge of 9855f6e2 to jb-dev-plus-aospKenny Root2012-06-081-0/+45
| |\ \ \ \ | | |/ / / | | | | | | | | | | Change-Id: I012bd3b5946dedba3439285caa93739d44ebc60f
| | * | | Merge "Add JNI bindings for some of the libselinux interfaces."Kenny Root2012-06-081-0/+45
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Add JNI bindings for some of the libselinux interfaces.Stephen Smalley2012-03-301-0/+45
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifcc68cb06f9f56a04f3bc64dd9906a9436fabc88
* | | | | Enhance StateMachine Quitting and logging support.Wink Saville2012-05-291-236/+366
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make StateMachine#quit non-conditional and remove the need to process the SM_QUIT_CMD it is now private. Rename halting to onHalting. Add onQuitting Change the message specific logging to be more generic and change the xxxProcessedMessagesYyy methods to xxxLogRecXyy names. Also add addLogRec(String) and addLogRec(String, State) as the generic logging methods. bug: 5678189 Change-Id: I22f66d11828bfd70498db625fe1be728b90478b7
* | | | | am 0ddb5d3b: am 9cb376e7: Merge "Change NPN to forbid empty lists of ↵Jesse Wilson2012-05-211-5/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | protocols." into jb-dev * commit '0ddb5d3b5d91ed0b891476e834de5ec4ffafece8': Change NPN to forbid empty lists of protocols.
| * | | | am 9cb376e7: Merge "Change NPN to forbid empty lists of protocols." into jb-devJesse Wilson2012-05-171-5/+8
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit '9cb376e792567b5278e0eb418a3aeb848339a283': Change NPN to forbid empty lists of protocols.
| | * | | Merge "Change NPN to forbid empty lists of protocols." into jb-devJesse Wilson2012-05-171-5/+8
| | |\ \ \
| | | * | | Change NPN to forbid empty lists of protocols.Jesse Wilson2012-05-171-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/6438423 Change-Id: Ie89220e5bc219396c15dbe1feaa2f74fa1b243eb
* | | | | | am 044d40ad: am 824aa860: Merge "Accessibility service needs to request ↵Svetoslav Ganov2012-05-171-1/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permission to be bound to." into jb-dev * commit '044d40ad87f5f6a321aa48f74e05b8355c40f422': Accessibility service needs to request permission to be bound to.
| * | | | | am 824aa860: Merge "Accessibility service needs to request permission to be ↵Svetoslav Ganov2012-05-161-1/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bound to." into jb-dev * commit '824aa860cd0b38b09779aab417612b115fd495a3': Accessibility service needs to request permission to be bound to.
| | * | | | Merge "Accessibility service needs to request permission to be bound to." ↵Svetoslav Ganov2012-05-161-1/+2
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into jb-dev
| | | * | | | Accessibility service needs to request permission to be bound to.Svetoslav Ganov2012-05-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Every accessibility services targeting JellyBean or higher has to request a special permission for the system to bind to it. Change-Id: I6e579326bdf3597f148d6c67317455701ec8af68
* | | | | | | am 3f68e78f: am 1d366274: Merge "Fix issue: Disable soft ap when test ↵Xia Wang2012-05-153-7/+8
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | activity is created. Add timer for soft ap enalbing timer: 6192139" into jb-dev * commit '3f68e78f1b7d43d58e0b0730dfd57f9e6948ff10': Fix issue: Disable soft ap when test activity is created. Add timer for soft ap enalbing timer: 6192139
| * | | | | | am 1d366274: Merge "Fix issue: Disable soft ap when test activity is ↵Xia Wang2012-05-153-7/+8
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | created. Add timer for soft ap enalbing timer: 6192139" into jb-dev * commit '1d366274bac3153123bd37132ab87e3652e7feab': Fix issue: Disable soft ap when test activity is created. Add timer for soft ap enalbing timer: 6192139
| | * | | | | Merge "Fix issue: Disable soft ap when test activity is created. ↵Xia Wang2012-05-153-7/+8
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | Add timer for soft ap enalbing timer: 6192139" into jb-dev
| | | * | | | Fix issue: Disable soft ap when test activity is created.Xia Wang2012-05-153-7/+8
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add timer for soft ap enalbing timer: 6192139 Change-Id: I9f9a6a1f0787efdfbb924af80f7d610c07cd32e5
* | | | | | am adba4f45: am 981bd8a4: Merge "Allow tests to run when bandwidth profiling ↵David Hu2012-05-151-4/+21
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fails" into jb-dev * commit 'adba4f454e102c89bf08cc8bbfcaf9f3751c4bf6': Allow tests to run when bandwidth profiling fails
| * | | | | am 981bd8a4: Merge "Allow tests to run when bandwidth profiling fails" into ↵David Hu2012-05-151-4/+21
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-dev * commit '981bd8a4cdd488abd69e17b275dac08c14f2ec61': Allow tests to run when bandwidth profiling fails
| | * | | | Merge "Allow tests to run when bandwidth profiling fails" into jb-devDavid Hu2012-05-151-4/+21
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Allow tests to run when bandwidth profiling failsDavid Hu2012-05-141-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When bandwidth profiling fails due to lack of kernel module the test should still be able to run. Change-Id: Ib111989d2892b05c147889e562e77035fab05140
* | | | | | am 42a419b4: am 718af32a: Merge "Use long instead of int for file offsets" ↵Kenny Root2012-05-101-1/+11
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '42a419b4c0e7d16145e336ceec709dcefbdcf894': Use long instead of int for file offsets
| * | | | | am 718af32a: Merge "Use long instead of int for file offsets" into jb-devKenny Root2012-05-101-1/+11
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '718af32a191066822262ad05cdd525a09c66094f': Use long instead of int for file offsets
| | * | | | Use long instead of int for file offsetsKenny Root2012-05-101-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use long instead of int so we don't run into a 2GB file limit. Fix possible overflows in offset and length. Change-Id: Idb3a34f5600f9c2372b9c89256f21757049fa43b
* | | | | | am fe9e28cb: am 6367b166: Merge "Recover from Throwable in FileRotator, ↵Jeff Sharkey2012-05-101-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dump." into jb-dev * commit 'fe9e28cba7dabb452fdbadcf421f7f758a859447': Recover from Throwable in FileRotator, dump.
| * | | | | am 6367b166: Merge "Recover from Throwable in FileRotator, dump." into jb-devJeff Sharkey2012-05-101-2/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '6367b1669d41f9fe7cd7abe5e05296edecd50f8e': Recover from Throwable in FileRotator, dump.
| | * | | | Merge "Recover from Throwable in FileRotator, dump." into jb-devJeff Sharkey2012-05-091-2/+2
| | |\ \ \ \
| | | * | | | Recover from Throwable in FileRotator, dump.Jeff Sharkey2012-05-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In rewriteSingle(), catch Throwable to rollback to backup file, instead of just IOException. Also add dumpAll() to pack up contents for later debugging, and use it when encountering bad stats. Bug: 6467868 Change-Id: Ic8e287cf5a235706811a304a88d71d11d3a79cd4
* | | | | | | am cae2b331: am 72e95cfe: Merge "Fix Wifi test" into jb-devXia Wang2012-05-091-2/+5
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'cae2b331b837f6b156aaae83254617a81a21048e': Fix Wifi test
| * | | | | | am 72e95cfe: Merge "Fix Wifi test" into jb-devXia Wang2012-05-091-2/+5
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '72e95cfef014c9354812717982bf312880d2bab5': Fix Wifi test
| | * | | | | Merge "Fix Wifi test" into jb-devXia Wang2012-05-081-2/+5
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Fix Wifi testXia Wang2012-05-061-2/+5
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | bug: http://b/issue?id=6446248 Change-Id: I22783ed3de37bf51aed7cee9617017868f524f0d
* | | | | | am 83ea8609: am 29bb27ef: Merge "Add encryption parameters to package ↵Kenny Root2012-05-093-0/+676
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | installation" into jb-dev * commit '83ea86091bf94571912694c7caf8be1c21727f91': Add encryption parameters to package installation