Created
March 14, 2016 12:30
-
-
Save ghsr/7cb38b3ec218308b9096 to your computer and use it in GitHub Desktop.
This file has been truncated, but you can view the full file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| project art/ | |
| 8d5c5f4 am 163a7bcc: am 54d8f4bc: Fix in reference type propagation | |
| 163a7bc am 54d8f4bc: Fix in reference type propagation | |
| 6d9c13f am 0f717e93: am ddb2a98f: Parse runtime compiler options for JIT | |
| 0f717e9 am ddb2a98f: Parse runtime compiler options for JIT | |
| 9fc2573 am 71c02c38: am f015c2f4: ART: Add missing GetInterfaceMethodIfProxy | |
| 71c02c3 am f015c2f4: ART: Add missing GetInterfaceMethodIfProxy | |
| 2ebed15 am 5606ffa6: am 2602aa86: ART: Decrease dex2oat watchdog timeout | |
| 5606ffa am 2602aa86: ART: Decrease dex2oat watchdog timeout | |
| e62ab9f am f3baa36f: am 22e0ce3a: DO NOT MERGE Add locking to prevent races between setting class methods and marking | |
| f3baa36 am 22e0ce3a: DO NOT MERGE Add locking to prevent races between setting class methods and marking | |
| 2c072a9 am 1c2f38b9: am a13d2e11: Merge "ART: Do not abort on exception in CreatePeer" into mnc-dr-dev | |
| 2930074 am ebaef4c5: am 39795fc5: Merge "ART: Clean up less in dex2oat" into mnc-dr-dev | |
| 1c2f38b am a13d2e11: Merge "ART: Do not abort on exception in CreatePeer" into mnc-dr-dev | |
| ebaef4c am 39795fc5: Merge "ART: Clean up less in dex2oat" into mnc-dr-dev | |
| eb05122 am 9d96bd65: ART: Decrease dex2oat watchdog timeout | |
| 9d96bd6 ART: Decrease dex2oat watchdog timeout | |
| a21d821 am 39becb96: Revert "Fix another source of undeterministic inlining." DO NOT MERGE | |
| e003973 am e4cf5892: ART: Weaken size check in hprof | |
| 1cb93f0 am eb9d1f79: ART: Relax verifier aput checking | |
| 5c0e80e am e682a025: ART: Change UninitializedThis tracking in the verifier | |
| 41f402e am 6aec9dae: [MIPS] Avoid using odd numbered fp registers | |
| bed31d5 am 0d9982da: ART: Fix Quick\'s DCE+GVN | |
| a1e8868 am 168387df: ART: Change UnresolvedMergedType merge | |
| ab3764e am f695a009: ART: Change UnresolvedMergedType internal representation | |
| a76c5ff am 6e9c66e0: Fix a bug in the register allocator around pair allocation. | |
| 95c6649 am d333389c: Tighten default inlining settings when using the space filter. | |
| a1620b7 am f2ea71cd: ART: Fix the simplifier for add/sub | |
| c01d9e9 am ce4b1329: ART: x86_64 RoundDouble/Float intrinsics should initialize out value. | |
| bb1f94f am 2ada67b3: Don\'t dump stack when deleting an invalid local ref | |
| 266ccd0 am 8f96df84: Allow for fine tuning the inliner. | |
| 12e2907 am 681652d8: HDeoptimize should hold values live in env. | |
| 94f2ce5 am af50e415: Bugfix: Java char is 16 bits, can not be treated as boolean. | |
| 3263c26 am 458a7c7a: Merge "ART: Change the stack dump format to be in line with debuggerd" into mnc-dev | |
| cf5ec1c am d021e166: ART: Fix Quick/Optimizing suspend check assumption mismatch. | |
| 1e7fe0e am be86eabe: Merge "Don\'t check code pointer for proxies in ArtMethod::GetQuickFrameInfo" into mnc-dev | |
| 49f64e8 am 3387f397: Get non proxy method for StackDumpVisitor | |
| 75a60c1 am 030f2af2: Reduce space filter threshold to 128. | |
| bb25670 am a2407de1: Merge "ART: Boolean simplifier fix" into mnc-dev | |
| 647a236 am 3b7660de: ART: DCE should know that array-length can throw NPE | |
| 70b236a am 22ee0902: Merge "Fix cfi information for x86." into mnc-dev | |
| 554dc76 am 811cfddf: Re-enable run-test 449-checker-bce on MIPS64. | |
| 57b0107 am 54167205: Merge "Initialize pDeoptimize quick entry pointer for Mips." into mnc-dev | |
| 7977fdd am b0139e85: Merge "Return an invalid StackMap when none can be found." into mnc-dev | |
| 8cbde19 am 99767387: Fix proxy handling in FindDeclaredVirtualMethod | |
| ee7ab8b am 25e1af5b: ART: Change merges with Undefined to Undefined | |
| 30874f2 am c08e0c73: ART: Fix test | |
| 9f5cbb7 am ed8fea78: Merge "ART: Improve the symbolize script" into mnc-dev | |
| c4612a1 am 5ee9454d: Support compiling run-tests with jack | |
| 3df2c48 am c2bf1255: ART: Allow to set and copy conflicts in the verifier | |
| 48fa260 am a3cd834a: ART: Avoid soft- after hard-fail in verifier | |
| 6c88572 am fd6fe84c: Merge "ART: Release inputs in Long.reverse intrinsic in x86" into mnc-dev | |
| 19b60a7 am db05e310: ART: Fix opsize in LoadArgDirect | |
| 141b152 am ccbbda2b: Add implicit null pointer and stack overflow checks for Mips. | |
| 3b3b124 am 3abd4375: Do not create a HBoundType when the instruction is non-null. | |
| 8c50ca9 am 4990f5c1: Merge "ART: Symbolize all oat files in /data folder." into mnc-dev | |
| 09af750 am b46ff2c3: Merge "ART: Fix data loss when symbolizing oat files." into mnc-dev | |
| 9d607c0 am f801a6a6: Merge "Do not replace a live phi with a dead phi." into mnc-dev | |
| 7f2ac9c am ed6193a7: Merge "Revert "Revert "Do not update the type of something we already know.""" into mnc-dev | |
| 1e75986 am e54cd64e: ART: Remove bad FindSymbol call | |
| 285e1d2 am ed40271d: Merge "ART: Unlink target oat file before compiling" into mnc-dev | |
| 524ddfd am e7d876ad: ART: Fix CFI annotation for art_quick_aput_obj | |
| 1107c8f am d735c41e: Merge "MIPS: Initial version of optimizing compiler for MIPS64R6." into mnc-dev | |
| b83240c am a10c713e: Quick: Disable GVN, DCE and LVN for type conflicts. | |
| 2cb5207 am 3ae8da0a: ART: Fix invalid access and DCHECK in verifier | |
| 86b9e90 am ffd43f62: Merge "Require mutator lock for DeleteLocalRef" into mnc-dev | |
| 1ac55c7 am b91205e4: ART: Fix streaming tracing issues | |
| 1f90bf3 am 1ff04abe: ART: Bail out immediately on try/catch | |
| 9aa4b6c am 5597b422: Merge "ART: Fix kEverything compiler filter" into mnc-dev | |
| 1be6044 am ad805685: ART: Only print stripped dex2oat command line | |
| d7dcb25 am 6415013f: ART: Reset runtime_throw_failure flag | |
| e993dfd am 005deb0a: ART: Set methods to preverified in verify-none | |
| c45f922 am 9ae03f09: Merge "Do not try to compile resource-only dex files." into mnc-dev | |
| 85e9888 am 92067896: Hard-fail get-/put-object to a non-reference field. | |
| f717cfc am 20d60dd2: Only do some checks when compiling against the core image. | |
| 02d662d am 559b1cc2: [MIPS64] JNI Compiler: Sign-extend int function arguments | |
| f7cf2dc am 2eb85431: Merge "ART: Fix arm32 instrumentation exit stub" into mnc-dev | |
| b8536f9 am 71e46c1a: Fix force copy | |
| b43189b am 6d20c2e2: Merge "Fix imt conflict trampoline for mips64" into mnc-dev | |
| 2195ea0 am 94e7c05f: Increase alt signal stack to 32K on host. | |
| 65a5cd1 am 466efcc8: Merge "Adding optimizing compiler test case for String.<init>." into mnc-dev | |
| 53cb9da am 28676346: Use a flag from the verifier to know if we should compile. | |
| 923f49c am b5171ff4: BCE: don\'t assume a bounds check always gets a HArrayLength. | |
| 269a766 am 0fd292dd: Fix codegen_test after DCE fix. | |
| 29e83af am 18b236e5: Recompute dominator tree after DCE. | |
| e62c036 am 574cce14: BCE: Narrow instead of unconditionnaly overwrite the range. | |
| 5f5feee am 310b0f5f: Fix another case of un-verified dead code. | |
| 632aaa5 am 1a63351b: Merge "ART: Follow-up to 507cc6f83bf6379728f2dd20391f2ed5fbfe6371" into mnc-dev | |
| a8a9eb0 am 0cffac0c: Merge "Fix field ordering for String in hprof" into mnc-dev | |
| f8b8ab3 am dd32833e: Make dex file verifier check that indexes are increasing. | |
| ecede59 am ad3359e7: Do not overwrite an input register in shift operations. | |
| 11eff2e am 7c19550e: Merge "Fix another miranda method moving GC bug" into mnc-dev | |
| 280e40f am bad9c7b7: New experimental GC stress mode | |
| de72cab am 76952000: Merge "Change GC to allow strings to use large object space." into mnc-dev | |
| e467651 am 67b00a12: Merge "ART: Allow checking RETURN_VOID_NO_BARRIER on unresolved classes" into mnc-dev | |
| 44ca0d5 am 38fafa18: Make large string use large object space. | |
| ce293cd am 421e495c: ART: Don\'t do pre-linked calls to the interpreter bridge. | |
| a83938e am a6efe5e8: ART: Disallow classes that are abstract and final | |
| 564a267 am 88593111: Revert "Revert "Add support for inlining already sharpened interface calls."" | |
| 8166f79 am ee393607: (-s ours) Revert "Add support for inlining already sharpened interface calls. DO NOT MERGE ANYWHERE" | |
| 3cd356f am 042fd002: Revert "Revert "Use IsAssignableFrom instead of IsSubclass for robustness."" | |
| bced2b1 am c48c7e6a: Use compiling class instead of outer class for access checks. | |
| a7b3540 am 7d593094: Use compiling class instead of referrer for access checks. | |
| 6425b37 am 1e256bf2: Be careful with predecessor/successor index. | |
| 15e0965 am bbcec62c: Merge "Don\'t check the return type in the builder." into mnc-dev | |
| c7cf0ee am 39eb41f6: Merge "Do not expect 0 or 1 only when comparing a boolean." into mnc-dev | |
| 1e3055a am 39d40afb: Verifier: check an aput, even if we know it will fail. | |
| 18218b8 am a04e7b7c: Run a simplification pass before code generation. | |
| 15621f6 am 096f357c: Merge "Bailout from compilation if an invoke is malformed." into mnc-dev | |
| a4d847f am c9345cc2: Merge "Fix wrong DCHECK in bounds check elimination." into mnc-dev | |
| 49b8352 am 25fde612: Fix a bug in optimizing when the null constant has been DCE. | |
| ed28671 am ff82263e: Fix String Change baseline compiler errors. | |
| 7060f28 am 7257ece4: Use signed encoding when using relative CFI addresses. | |
| 73ad940 am 673b4302: ART: Check for expected args for instance methods | |
| 3c0ea8b am cbf5d896: ART: Check var-arg count earlier in method verifier | |
| d7f7bf7 am 1bd841a2: Merge "ART: Fix BCE lint issue" into mnc-dev | |
| e11244a am f0ed1f0f: Merge "Fix GC map generation edge case" into mnc-dev | |
| 9e3351d am 31fa4b57: Remove bogus DCHECK in BCE. | |
| f4e6743 am bca381a1: Fix premature deoptimization if the loop body isn\'t entered. | |
| 9900189 am db538d30: Merge "ART stack unwinding fixes for libunwind/gdb/lldb." into mnc-dev | |
| f76b0ff am 3e91a44b: Fix case where block has no predecessor for StringChange. | |
| 9404b85 am e7738e8b: Quick: Handle total high/low register overlap on arm/mips. | |
| a303e25 am 9f7687cb: Quick: Fix optimizations for empty if blocks. | |
| 1863c0e am dd3c7d2d: ART: Remove old DCHECK that trips Baseline | |
| 0a487e7 am 122349a7: Merge "Fix StringChange for optimizing compiler." into mnc-dev | |
| 2812995 am 6e82168b: Fix moving GC bug in DoFilledNewArray | |
| e2e271f am dfc5db6a: Fix moving GC bugs in proxy stub for X86/X86_64 | |
| c82e357 am bf1fa2cc: Follow up on CL 151605 | |
| 23b4fee am ef484d44: Fix nested deoptimization. | |
| 26d53e3 am 07c6f5a3: Quick: Don\'t expect move-exception in every catch block. | |
| 00efb23 am e71eb1d7: Fix some java_lang_Class related moving GC bugs | |
| 4288cc0 am ee9bc65d: Merge "ART: Allow PackedSwitch instructions with zero targets" into mnc-dev | |
| d5fdbc2 am 6ecc2967: Quick: Fix marking unused registers in DCE. | |
| 9e632ba am a8b41003: ART: Fix reporting initialized classes by CompilerDriver. | |
| ad0895d am f61ab978: (-s ours) Merge "Add support for inlining already sharpened interface calls. DO NOT MERGE ANYWHERE" into mnc-dev | |
| project bootable/recovery/ | |
| a5d5082 Revert "Byte swap to support BGRA in recovery mode" | |
| cde7207 am 838768ca: am 15da523e: am 3c7f655b: (-s ours) am 0e804d54: am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE | |
| 8e9c680 recovery: Fix the bug that truncates menu entries. | |
| 337db14 recovery: Factor out wear_ui.{cpp,h} into bootable/recovery. | |
| project build/ | |
| 57d06af "MHC19J" | |
| 087c6f0 "MHC19I" | |
| 4ce2b1d "MHC19H" | |
| f02556d "MHC19G" | |
| 03b5c5d "MHC19F" | |
| 0e99241 "MHC19E" | |
| 8dd7085 "MHC19D" | |
| c782f95 "MHC19C" | |
| 777fab4 "MHC19B" | |
| 6c0d423 "MHC19" | |
| e06ac2c merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| 28fc15a "MHC18" | |
| 02af6c8 merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| 7251731 "MHC17" | |
| 72ec827 merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| 3d7d858 "MHC15" | |
| aecc804 merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| 9257490 "MHC14C" | |
| 9a7d92f "MHC14B" | |
| 3d3546a merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| 7cf7588 "MHC14" | |
| 48f106c merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| 0936632 Merge "remove Exchange2 from core.mk" into mnc-dr1.5-dev | |
| 46e5844 "MHC13" | |
| 478aa9e merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| 1c2c7b6 "MHC12" | |
| 948893d merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| 1b29f2f Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e am: 53e7d9bf7f am: c9da4cce57 am: 6c61548bb7 am: 6facd249d5 | |
| 6facd24 Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e am: 53e7d9bf7f am: c9da4cce57 am: 6c61548bb7 | |
| 6c61548 Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e am: 53e7d9bf7f am: c9da4cce57 | |
| c9da4cc Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e am: 53e7d9bf7f | |
| 53e7d9b Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e | |
| 293887c Updating security patch string to 2016-03-01 am: c24c6ccd4d | |
| c24c6cc Updating security patch string to 2016-03-01 | |
| 56f53d8 "MHC11" | |
| e78c9ff merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| 8871d8c "MHC10" | |
| 4fd3e57 merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| 92c9b39 "MHC08" | |
| abb2a21 merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| 2e51437 "MHC06" | |
| f520e0c merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| e6e7e2a "MHC05B" | |
| b18f384 "MHC05" | |
| 952824b merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| 9c775ee "MHC04" | |
| 1caed32 merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| d6d6135 "MHC03" | |
| b444022 merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| 051988a "MHB91" | |
| 0fc18ec merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| 09601bd "MHB90" | |
| 2b35ecd merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| b905ec4 "MHB89" | |
| 1c0caf3 merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| 1508e31 "MHB88" | |
| c263d5c merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| 00cab88 "MHB84" | |
| e5279ce merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| 4c12b40 "MHB83" | |
| 69a10b6 merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| 7a6495c "MHB82" | |
| 16cac50 merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| 924236a "MHB81" | |
| edf456e merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| b907327 MHB76B | |
| f2988a3 merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| 3e28472 "MHB76" | |
| a38fd28 merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| fe451ab "MHB75" | |
| 91af2d2 merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| 97d4273 "MHB72B" | |
| 844d93f merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| 991ccde MHB72 | |
| 542d1d2 "MHB71B" | |
| 51c74aa "MHB71" | |
| 9801e76 merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| 737dc60 MHB70C | |
| 3a68198 DO NOT MERGE - Update security string to 2016-02-01 am: 929a4abd2b am: af970fb308 am: 41846b0063 -s ours am: db4d57a84c am: 02115bf55a am: 4c51cd1a9b | |
| 4c51cd1 DO NOT MERGE - Update security string to 2016-02-01 am: 929a4abd2b am: af970fb308 am: 41846b0063 -s ours am: db4d57a84c am: 02115bf55a | |
| 1536565 Update Security String to 2016-02-01 am: f0f73c06e2 am: 5e2b003a11 am: 8b5be4dd4f | |
| 8b5be4d Update Security String to 2016-02-01 am: f0f73c06e2 am: 5e2b003a11 | |
| f16bc41 "MHB70B" | |
| 6019adf remove Exchange2 from core.mk | |
| 031349f "MHB70" | |
| 232e1fe merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| 908d0d2 "MHB69B" | |
| 0d8ba9d "MHB69" | |
| 6ff4810 merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| cd118db "MHB68" | |
| 8f72ec2 merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| 912b51b "MHB64" | |
| e04ba2b merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| 782d5b4 "MHB63" | |
| 4fe142b merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| ce8bb2c "MHB62" | |
| 03b1c63 merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| 9425a31 "MHB61" | |
| 26a44b3 merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| d0d9978 "MHB57" | |
| dd754aa merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| a4cdbab "MHB56B" | |
| f7a9f3e merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| a149cf5 "MHB56" | |
| fa78438 merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| e13b13c Shorten TARGET_BRAND from generic_<arch> to Android am: 5806531f92 | |
| 5806531 Shorten TARGET_BRAND from generic_<arch> to Android | |
| e41cd14 "MHB55" | |
| b68af9a merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| cd8553b "MHB54" | |
| 72ea41f merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| 8e97286 Update Security String to 2016-01-01 - DO NOT MERGE am: 58cdbdc5ad am: 645f200ae8 am: 2cd2a76c64 -s ours am: c7b96cdd5e am: 8909bdfc4a am: a68c55822c | |
| a68c558 Update Security String to 2016-01-01 - DO NOT MERGE am: 58cdbdc5ad am: 645f200ae8 am: 2cd2a76c64 -s ours am: c7b96cdd5e am: 8909bdfc4a | |
| 10c8949 Update Security String to 2016-01-01 to mnc-dev am: 170459f438 am: bcf2866fb1 am: 3ce70dfe46 | |
| 3ce70df Update Security String to 2016-01-01 to mnc-dev am: 170459f438 am: bcf2866fb1 | |
| ad74747 "MHB50" | |
| 00036bf merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| bd4a35a "MHB49" | |
| b4ec0a5 merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| 3017459 "MHB48" | |
| fbf07a4 merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| 792f02c MHB47 | |
| 7b67e0d Revert "Change version back to 6.0" am: 55a149b740 am: 550b317688 | |
| e373f06 Change version back to 6.0 am: 970f203b3d am: 3a37a0cefd | |
| 550b317 Revert "Change version back to 6.0" am: 55a149b740 | |
| 3a37a0c Change version back to 6.0 am: 970f203b3d | |
| 796f000 Switch emulator to generate userdebug images by default am: ba740ff57f | |
| ba740ff Switch emulator to generate userdebug images by default | |
| 3943e48 Let qemu_props service set system properties in ro.emu and ro.emulator am: 20ed978ada | |
| 20ed978 Let qemu_props service set system properties in ro.emu and ro.emulator | |
| e23d93a Merge "Update security string to 2015-12-01" into mnc-dev am: 54cb940c4a am: dfd3524f7b am: eca2b655e5 | |
| eca2b65 Merge "Update security string to 2015-12-01" into mnc-dev am: 54cb940c4a am: dfd3524f7b | |
| 3c407e4 Update security string to 2015-12-01 - DO NOT MERGE am: 6575d4a2a8 am: cc9ac27157 am: fe64ce145e -s ours am: 0e8cf97670 am: 07e2c19536 am: a3b35dec78 | |
| a3b35de Update security string to 2015-12-01 - DO NOT MERGE am: 6575d4a2a8 am: cc9ac27157 am: fe64ce145e -s ours am: 0e8cf97670 am: 07e2c19536 | |
| 4919ed4 Bump Android to 6.0.1 am: 0a20c942c4 am: 1f9ba9f89e | |
| 5e994e0 Update security string to 2015-12-01 am: 0f1512bc03 am: 7b4c7fe5b7 | |
| 1f9ba9f Bump Android to 6.0.1 am: 0a20c942c4 | |
| 7b4c7fe Update security string to 2015-12-01 am: 0f1512bc03 | |
| 512d7b8 am 1280fa01: am 09ee6daa: am bc5e85af: Merge "DO NOT MERGE releasetools: Always write the last block if it\'s padded." into mnc-dev | |
| 1280fa0 am 09ee6daa: am bc5e85af: Merge "DO NOT MERGE releasetools: Always write the last block if it\'s padded." into mnc-dev | |
| 9cc6c37 am 5631d5c6: am 46ae586a: am e09359ab: DO NOT MERGE Pass source\'s info_dict to vendor\'s releasetools.py. | |
| 5631d5c am 46ae586a: am e09359ab: DO NOT MERGE Pass source\'s info_dict to vendor\'s releasetools.py. | |
| aaa03ed am b70b496f: am 57a64e01: Add all-named-(dirs|files)-under and related | |
| 1ed3bb7 am 2473c641: am 7a74e5ee: Add all-cpp-files-under | |
| b241508 am 304d073b: am 76a89d3a: Sort all files found via | |
| b70b496 am 57a64e01: Add all-named-(dirs|files)-under and related | |
| 2473c64 am 7a74e5ee: Add all-cpp-files-under | |
| 304d073 am 76a89d3a: Sort all files found via | |
| 0566be6 am 8638de1f: am ab4d8594: Switch from Calculator to ExactCalculator | |
| 8638de1 am ab4d8594: Switch from Calculator to ExactCalculator | |
| 829b2f2 am ed48af8d: am b03d55aa: Merge "DO NOT MERGE: Only use a fixed timestamp when packaging." into mnc-dr-dev | |
| ed48af8 am b03d55aa: Merge "DO NOT MERGE: Only use a fixed timestamp when packaging." into mnc-dr-dev | |
| 85a8592 am 43f24a32: am aecadc06: Merge "Don\'t add build number to apps\' version name for platform build." into mnc-dr-dev | |
| 43f24a3 am aecadc06: Merge "Don\'t add build number to apps\' version name for platform build." into mnc-dr-dev | |
| 761fcbe am fed4cf89: am 1b5eef1b: am b16edb5f: Merge "add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button." into mnc-dev | |
| fed4cf8 am 1b5eef1b: am b16edb5f: Merge "add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button." into mnc-dev | |
| a78d357 am a9b2f303: am 124a59ae: Reverting Android Security Patch Level string back to 2015-10-01 | |
| a9b2f30 am 124a59ae: Reverting Android Security Patch Level string back to 2015-10-01 | |
| b43cf69 am 848b8e9d: am fa2ce3b3: am f73f79f1: Merge "Use /filelist when OUT_DIR is set" into mnc-dev | |
| 848b8e9 am fa2ce3b3: am f73f79f1: Merge "Use /filelist when OUT_DIR is set" into mnc-dev | |
| 8d7715e am 1b045b3d: am 5b08efb7: (-s ours) Don\'t fail build of otatools if there are no device certificates | |
| 1b045b3 am 5b08efb7: (-s ours) Don\'t fail build of otatools if there are no device certificates | |
| dffe42e am d9cdf5be: am 22ff0124: (-s ours) Merge "add otatools-package target" into cw-d-mr1-dev | |
| d9cdf5b am 22ff0124: (-s ours) Merge "add otatools-package target" into cw-d-mr1-dev | |
| e7b833c am 98f3c213: am cb31a535: Dist the otatools package. | |
| 98f3c21 am cb31a535: Dist the otatools package. | |
| 5b08efb Don't fail build of otatools if there are no device certificates | |
| 22ff012 Merge "add otatools-package target" into cw-d-mr1-dev | |
| cb31a53 Dist the otatools package. | |
| 173219d add otatools-package target | |
| 20e017b am b1bee75f: am 3d6e194e: am 393c6254: Really include drawables for all densities. | |
| b1bee75 am 3d6e194e: am 393c6254: Really include drawables for all densities. | |
| 134b372 am 3ab46587: am 92da6bdb: am 5e858e3d: Merge "Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA" into mnc-dev | |
| 3ab4658 am 92da6bdb: am 5e858e3d: Merge "Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA" into mnc-dev | |
| 0e9fd85 am 5e704686: Add ld.mc as a requirement for core_tiny.mk as well. | |
| 5e70468 Add ld.mc as a requirement for core_tiny.mk as well. | |
| 8399d32 am d3d0347b: am 6a0bdb55: am 64685ea3: am ef024064: (-s ours) am 09611509: am 63712481: am bb97ff59: am a7168e1c: am e539537d: (-s ours) am 7f96f4f6: am 4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3 | |
| a9fda51 am 3a5be134: am 22e66b35: am a5842d3e: am f694d378: (-s ours) resolved conflicts for b161297d to lmp-mr1-ub-dev | |
| d3d0347 am 6a0bdb55: am 64685ea3: am ef024064: (-s ours) am 09611509: am 63712481: am bb97ff59: am a7168e1c: am e539537d: (-s ours) am 7f96f4f6: am 4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3 | |
| 3a5be13 am 22e66b35: am a5842d3e: am f694d378: (-s ours) resolved conflicts for b161297d to lmp-mr1-ub-dev | |
| aa3d37a am 5790d54a: am 59f4ff10: Add verity_signer and verity_key flags to add_img_to_target_files. | |
| 5790d54 am 59f4ff10: Add verity_signer and verity_key flags to add_img_to_target_files. | |
| 6d98051 am 8cb586a5: am ca352f36: am 2ad5c0cc: Merge "emulator.mk: Add ethernet permission" into mnc-dev | |
| 8cb586a am ca352f36: am 2ad5c0cc: Merge "emulator.mk: Add ethernet permission" into mnc-dev | |
| f4fc29b am b00f80cc: am a0abf49d: resolved conflicts for a1fcaf86 to mnc-dr-dev | |
| b00f80c am a0abf49d: resolved conflicts for a1fcaf86 to mnc-dr-dev | |
| 1ed87fa am 15b0d0c8: am 07e0af0d: am 91c8c66e: am 17aa06f6: Fix build. | |
| 34863c6 am d0c8ef98: am 1e7f6f74: Fix build. | |
| 15b0d0c am 07e0af0d: am 91c8c66e: am 17aa06f6: Fix build. | |
| d0c8ef9 am 1e7f6f74: Fix build. | |
| 6570b1e am 0cec840c: am 888b6f47: am 47f6a4e7: am 1c1a6d15: am 2c9dfb82: am 1d4ad515: Revert "Add an option to include a full bootloader in incremental OTA." | |
| 0cec840 am 888b6f47: am 47f6a4e7: am 1c1a6d15: am 2c9dfb82: am 1d4ad515: Revert "Add an option to include a full bootloader in incremental OTA." | |
| 89cd35a am fd5330c0: am 160603cf: am 5837f102: am 1753b4e9: resolved conflicts for 00fdede3 to lmp-mr1-ub-dev | |
| fd5330c am 160603cf: am 5837f102: am 1753b4e9: resolved conflicts for 00fdede3 to lmp-mr1-ub-dev | |
| fdd713f am fbecca31: am e35d00d0: am 265d9aeb: releasetools: Update the fingerprint when signing. | |
| fbecca3 am e35d00d0: am 265d9aeb: releasetools: Update the fingerprint when signing. | |
| 8eedce1 am 8eb3ac18: am 28f6f9c3: releasetools: Always write the last block if it\'s padded. | |
| 8eb3ac1 am 28f6f9c3: releasetools: Always write the last block if it\'s padded. | |
| 92e3734 am de4177d8: am a6e6afbc: am 39c322ce: releasetools: Fix the bug in symlink deletion. | |
| de4177d am a6e6afbc: am 39c322ce: releasetools: Fix the bug in symlink deletion. | |
| cf7e78c am 36890dac: am 9f7c3781: am 057831bc: Merge "Set the Security Patch level with Oct 1 for MNC" into mnc-dev | |
| 36890da am 9f7c3781: am 057831bc: Merge "Set the Security Patch level with Oct 1 for MNC" into mnc-dev | |
| 28dd99d am a0eb142a: am dfea066f: Merge "Include init.usb.configfs.rc into rootdir" into mnc-dr-dev | |
| a0eb142 am dfea066f: Merge "Include init.usb.configfs.rc into rootdir" into mnc-dr-dev | |
| 1599e38 am a125075a: am ccad82c5: Merge "Revert "Temporarily use blockimgdiff v2 for OTA."" into mnc-dr-dev | |
| a125075 am ccad82c5: Merge "Revert "Temporarily use blockimgdiff v2 for OTA."" into mnc-dr-dev | |
| 59bc470 am deb3c8c4: am 77c1ff7b: am 4ffdc8fa: Fix bug that caused table of Studio links to result in "stand-alone" tools instructions. bug: 23570662 | |
| deb3c8c am 77c1ff7b: am 4ffdc8fa: Fix bug that caused table of Studio links to result in "stand-alone" tools instructions. bug: 23570662 | |
| 50827e0 am 29c245e8: am e337093e: Merge changes from topic \'stash-size\' into mnc-dr-dev | |
| 29c245e am e337093e: Merge changes from topic \'stash-size\' into mnc-dr-dev | |
| c586468 am 27bc97e6: am f4ad2feb: am 4fc14679: am fc168f84: resolved conflicts for merge of 1a8c6567 to lmp-mr1-ub-dev | |
| 43aff50 am a5223697: am d0cc11e8: am 8f7c08ed: am 1e120181: am 473b6a5f: am fc028e59: Dist the otatools package. | |
| 27bc97e am f4ad2feb: am 4fc14679: am fc168f84: resolved conflicts for merge of 1a8c6567 to lmp-mr1-ub-dev | |
| a522369 am d0cc11e8: am 8f7c08ed: am 1e120181: am 473b6a5f: am fc028e59: Dist the otatools package. | |
| e23a407 am 8239d21b: am 8a1fa158: am c69aa42b: Merge "Set the Security Patch level for MNC" into mnc-dev | |
| 8239d21 am 8a1fa158: am c69aa42b: Merge "Set the Security Patch level for MNC" into mnc-dev | |
| e9a98cd am 87e6b493: am d3a79db8: am afc5ab39: am c6e087ad: resolved conflicts for merge of 2bcfbe7e to lmp-mr1-ub-dev | |
| 87e6b49 am d3a79db8: am afc5ab39: am c6e087ad: resolved conflicts for merge of 2bcfbe7e to lmp-mr1-ub-dev | |
| 43703d8 am 3fd0db83: am 3b8b8657: am ca19158e: am e9a8f465: (-s ours) resolved conflicts for merge of 0287a8f6 to lmp-mr1-ub-dev | |
| 3fd0db8 am 3b8b8657: am ca19158e: am e9a8f465: (-s ours) resolved conflicts for merge of 0287a8f6 to lmp-mr1-ub-dev | |
| 425e1d5 am e24174d2: am 15bb28fc: am ed7e864a: fix a few bugs in the studio download button behavior: - make button text always white (avoid blue on blue during hover) - revise logic to add the platform name to download button to avoid weird duplicity bug on small screens | |
| e24174d am 15bb28fc: am ed7e864a: fix a few bugs in the studio download button behavior: - make button text always white (avoid blue on blue during hover) - revise logic to add the platform name to download button to avoid weird duplicity bug on small screens - remove the | |
| ecb3bbf am 7c4c6f58: sparse_img.py: Divide NONZERO blocks into groups. | |
| 7c4c6f5 sparse_img.py: Divide NONZERO blocks into groups. | |
| 3337d1e am 58aacccb: am 39b32b0d: am 956e4693: Increasing MIPS emulator system image size and user-data image size | |
| 58aaccc am 39b32b0d: am 956e4693: Increasing MIPS emulator system image size and user-data image size | |
| c10e65a Merge "DO NOT MERGE Revert "D.N.M. Revert "Add the ability to display annotations in the generated docs""" into mnc-ub-dev | |
| 23a7114 am 3de73270: am 8ea2636c: am 6a8f88cd: adjust image placement for m hero on medium screens. | |
| 3de7327 am 8ea2636c: am 6a8f88cd: adjust image placement for m hero on medium screens. | |
| bc171e3 DO NOT MERGE Revert "D.N.M. Revert "Add the ability to display annotations in the generated docs"" | |
| e491aea am 251d0ad1: am a2869db8: am 71e0a80c: Merge "doc change: Add hero image for m and css for landing pages." into mnc-dev | |
| 251d0ad am a2869db8: am 71e0a80c: Merge "doc change: Add hero image for m and css for landing pages." into mnc-dev | |
| 795c7aa am 1fd599cb: am 98c570ab: am 743938fb: Merge "Make sure only AppCompat (not it\'s tests) are in the docs" into mnc-dev | |
| 1fd599c am 98c570ab: am 743938fb: Merge "Make sure only AppCompat (not it\'s tests) are in the docs" into mnc-dev | |
| 689c097 am 148839b2: am 17b06910: am 5bf35d06: Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev | |
| 148839b am 17b06910: am 5bf35d06: Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev | |
| 59a7652 am 6ff3e53f: am 897f3ba8: am 25abc5a3: Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev | |
| 6ff3e53 am 897f3ba8: am 25abc5a3: Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev | |
| 35bdf14 am 7e8d6f25: am 0fd879cd: am a0372e20: Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev | |
| 7e8d6f2 am 0fd879cd: am a0372e20: Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev | |
| e4f29f0 am 00e15cd5: am 09baf014: am 745d11cc: Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev | |
| 00e15cd am 09baf014: am 745d11cc: Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev | |
| 71fde72 am af172736: am d95990e6: am 02389bf9: Merge "Include new AOSP messaging app in base builds." into mnc-dev | |
| af17273 am d95990e6: am 02389bf9: Merge "Include new AOSP messaging app in base builds." into mnc-dev | |
| 6866848 am 40578b6a: am a749ea4b: am 11cf92aa: am 1dca55fd: skip the merge of 67e7c661 to lmp-mr1-ub-dev | |
| 40578b6 am a749ea4b: am 11cf92aa: am 1dca55fd: skip the merge of 67e7c661 to lmp-mr1-ub-dev | |
| 2d20e3d DO NOT MERGE Revert "Add the ability to display annotations in the generated docs" | |
| 87eb400 am b4571028: am c055f9b5: am e5a63158: Merge "Increasing arm(64)? emulator partition sizes to 1.5GB" into mnc-dev | |
| b457102 am c055f9b5: am e5a63158: Merge "Increasing arm(64)? emulator partition sizes to 1.5GB" into mnc-dev | |
| 540abfe am 87492b88: am 86e510cc: am 71a33c4d: Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11d6f9e94c90197e7f8adf430c949c86) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev | |
| 87492b8 am 86e510cc: am 71a33c4d: Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11d6f9e94c90197e7f8adf430c949c86) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev | |
| c7e051e am 112f4c07: am 0150dae6: am 073f74d9: Merge "Increasing x86 emulator system partition size" into mnc-dev | |
| 112f4c0 am 0150dae6: am 073f74d9: Merge "Increasing x86 emulator system partition size" into mnc-dev | |
| dfb29da am c396ce62: am c79c7d15: am a18c5028: Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0 | |
| c396ce6 am c79c7d15: am a18c5028: Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0 | |
| a554182 am 817a2d2b: am e2312db1: am 38ffb0cf: Bump PLATFORM_PREVIEW_SDK_VERSION to 4 | |
| 817a2d2 am e2312db1: am 38ffb0cf: Bump PLATFORM_PREVIEW_SDK_VERSION to 4 | |
| 7bb7a5f am f8a714ba: am 9f5c487e: Merge "releasetools: Fix parameters for vboot_signer" into mnc-dr-dev | |
| f8a714b am 9f5c487e: Merge "releasetools: Fix parameters for vboot_signer" into mnc-dr-dev | |
| 449b8a0 am c4904316: am ffe86de5: Merge "vboot_signer: Add kernel subkey required for signing kernel keyblock" into mnc-dr-dev | |
| c490431 am ffe86de5: Merge "vboot_signer: Add kernel subkey required for signing kernel keyblock" into mnc-dr-dev | |
| 734dadd am cd90b3cd: am b1014924: am 736463f8: Merge "Add support-customtabs to the doc build." into mnc-dev | |
| cd90b3c am b1014924: am 736463f8: Merge "Add support-customtabs to the doc build." into mnc-dev | |
| 60df344 am 0247fe72: am 16d0b4cf: am 66c8e8c7: Don\'t prepend CC_WRAPPER to CLANG. | |
| 0247fe7 am 16d0b4cf: am 66c8e8c7: Don\'t prepend CC_WRAPPER to CLANG. | |
| 969016a am f4dbf25a: am 4b4244cb: am 56866c4d: Merge "Remove M codename, version number is 6.0." into mnc-dev | |
| f4dbf25 am 4b4244cb: am 56866c4d: Merge "Remove M codename, version number is 6.0." into mnc-dev | |
| c2a1c8d am b362f89e: am d9bb53f9: am 5915e57d: Merge "Add support preference libraries to docs build" into mnc-dev | |
| b362f89 am d9bb53f9: am 5915e57d: Merge "Add support preference libraries to docs build" into mnc-dev | |
| df7c215 am bba2c512: am 15b42c42: am cce673b6: Read fstab from the source build. | |
| bba2c51 am 15b42c42: am cce673b6: Read fstab from the source build. | |
| 88618b8 am 73f967b7: am b7a3bc56: am fbf80e9d: Merge "[RenderScript] Only upgrade RS target API for compat build." into mnc-dev | |
| 73f967b am b7a3bc56: am fbf80e9d: Merge "[RenderScript] Only upgrade RS target API for compat build." into mnc-dev | |
| 2770497 am 3a6d1290: am 9e8d2278: am 96585b06: Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 3" into mnc-dev | |
| 3a6d129 am 9e8d2278: am 96585b06: Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 3" into mnc-dev | |
| 473a832 am 489d3ea7: am 1a30e036: am 302e944c: [RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets. | |
| 489d3ea am 1a30e036: am 302e944c: [RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets. | |
| 63daab9 am 21d884f6: (-s ours) am 0cd3e17f: (-s ours) am 18cf7136: (-s ours) am 56f7b775: (-s ours) am a5841355: (-s ours) DO NOT MERGE ANYWHERE. Add data binding to built javadoc. | |
| 21d884f am 0cd3e17f: (-s ours) am 18cf7136: (-s ours) am 56f7b775: (-s ours) am a5841355: (-s ours) DO NOT MERGE ANYWHERE. Add data binding to built javadoc. | |
| d7e31a3 am 2183dcb2: am 215959e7: Revert "Revert "Hide unwinder symbols in each binary."" | |
| a0ef498 am 80ba4a3f: am c671a7cf: Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX] | |
| e3927d7 am e9b4605a: am 7ac6cb80: Add LOCAL_NO_LIBGCC. | |
| f943e81 am e421b10f: am e8ecab8d: Merge "Don\'t uncompress/page-align the jni libraries in apps_only build." into mnc-dev | |
| daf97ac am 54152d30: am 087243dd: Merge "Add data binding to built javadoc." into mnc-dev | |
| 7f798c6 am 8d7066c1: am 6b74f21a: oem_image/custom_image: fix missing new parameter to build_image.py | |
| 460a5ab am 70198185: Merge "Build "secdiscard" for securely discarding data from flash devices." into mnc-dr-dev | |
| 0e66c70 am d07bfc51: Temporarily use blockimgdiff v2 for OTA. | |
| d2e77d6 am 7f8ecb7f: Merge "Zero out blocks that may be touched by dm-verity." into mnc-dev | |
| a69dcef am 74a81e66: fix device specific fs_config on build server | |
| 38a534b resolved conflicts for merge of 610754e5 to cw-e-dev | |
| 610754e Scan all init.*.rc files for flash_recovery service. | |
| project cts/ | |
| c238e74 Merge "CTS test for robust handling of invalid cmap" into lollipop-cts-dev am: d8748ad6d4 am: 37ec97501c am: 002b86b103 -s ours am: 7a94d8b8e4 am: b0b034a8f5 am: b25bb87ac7 | |
| b25bb87 Merge "CTS test for robust handling of invalid cmap" into lollipop-cts-dev am: d8748ad6d4 am: 37ec97501c am: 002b86b103 -s ours am: 7a94d8b8e4 am: b0b034a8f5 | |
| b0b034a Merge "CTS test for robust handling of invalid cmap" into lollipop-cts-dev am: d8748ad6d4 am: 37ec97501c am: 002b86b103 -s ours am: 7a94d8b8e4 | |
| 7a94d8b Merge "CTS test for robust handling of invalid cmap" into lollipop-cts-dev am: d8748ad6d4 am: 37ec97501c am: 002b86b103 -s ours | |
| 002b86b Merge "CTS test for robust handling of invalid cmap" into lollipop-cts-dev am: d8748ad6d4 am: 37ec97501c | |
| 37ec975 Merge "CTS test for robust handling of invalid cmap" into lollipop-cts-dev am: d8748ad6d4 | |
| 2d56878 Merge "DO NOT MERGE - Add security test for IEffect binder command" into lollipop-mr1-cts-dev am: 9ec9ffc78a -s ours am: a2f75ef084 -s ours am: 5e66e797a6 am: cd637d1df4 am: 72a13f4578 | |
| 97fbf2f Merge "DO NOT MERGE: rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp" into lollipop-mr1-cts-dev am: 4ccc58b503 -s ours am: 7b7ccd5cf4 -s ours am: 0a1c6ba8c8 am: 10551f4165 am: e9c78737f6 | |
| 8bd89ba Merge "DO NOT MERGE ANYWHERE: Test whether mediaserver leaks info across invalid binder calls" into lollipop-mr1-cts-dev am: 8e42b0e63c -s ours am: c79f6854c7 -s ours am: 832971fd6a -s ours am: 0f45c8172c -s ours am: 4708ef68d8 -s ours | |
| 72a13f4 Merge "DO NOT MERGE - Add security test for IEffect binder command" into lollipop-mr1-cts-dev am: 9ec9ffc78a -s ours am: a2f75ef084 -s ours am: 5e66e797a6 am: cd637d1df4 | |
| e9c7873 Merge "DO NOT MERGE: rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp" into lollipop-mr1-cts-dev am: 4ccc58b503 -s ours am: 7b7ccd5cf4 -s ours am: 0a1c6ba8c8 am: 10551f4165 | |
| 4708ef6 Merge "DO NOT MERGE ANYWHERE: Test whether mediaserver leaks info across invalid binder calls" into lollipop-mr1-cts-dev am: 8e42b0e63c -s ours am: c79f6854c7 -s ours am: 832971fd6a -s ours am: 0f45c8172c -s ours | |
| cd637d1 Merge "DO NOT MERGE - Add security test for IEffect binder command" into lollipop-mr1-cts-dev am: 9ec9ffc78a -s ours am: a2f75ef084 -s ours am: 5e66e797a6 | |
| 10551f4 Merge "DO NOT MERGE: rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp" into lollipop-mr1-cts-dev am: 4ccc58b503 -s ours am: 7b7ccd5cf4 -s ours am: 0a1c6ba8c8 | |
| 0f45c81 Merge "DO NOT MERGE ANYWHERE: Test whether mediaserver leaks info across invalid binder calls" into lollipop-mr1-cts-dev am: 8e42b0e63c -s ours am: c79f6854c7 -s ours am: 832971fd6a -s ours | |
| 5e66e79 Merge "DO NOT MERGE - Add security test for IEffect binder command" into lollipop-mr1-cts-dev am: 9ec9ffc78a -s ours am: a2f75ef084 -s ours | |
| 0a1c6ba Merge "DO NOT MERGE: rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp" into lollipop-mr1-cts-dev am: 4ccc58b503 -s ours am: 7b7ccd5cf4 -s ours | |
| 832971f Merge "DO NOT MERGE ANYWHERE: Test whether mediaserver leaks info across invalid binder calls" into lollipop-mr1-cts-dev am: 8e42b0e63c -s ours am: c79f6854c7 -s ours | |
| a2f75ef Merge "DO NOT MERGE - Add security test for IEffect binder command" into lollipop-mr1-cts-dev am: 9ec9ffc78a -s ours | |
| 7b7ccd5 Merge "DO NOT MERGE: rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp" into lollipop-mr1-cts-dev am: 4ccc58b503 -s ours | |
| c79f685 Merge "DO NOT MERGE ANYWHERE: Test whether mediaserver leaks info across invalid binder calls" into lollipop-mr1-cts-dev am: 8e42b0e63c -s ours | |
| 9ec9ffc Merge "DO NOT MERGE - Add security test for IEffect binder command" into lollipop-mr1-cts-dev | |
| 4ccc58b Merge "DO NOT MERGE: rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp" into lollipop-mr1-cts-dev | |
| 8e42b0e Merge "DO NOT MERGE ANYWHERE: Test whether mediaserver leaks info across invalid binder calls" into lollipop-mr1-cts-dev | |
| ebd79b4 DO NOT MERGE - Add security test for IEffect binder command | |
| f4c1ac4 DO NOT MERGE: rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp | |
| 99b34ec DO NOT MERGE ANYWHERE: Test whether mediaserver leaks info across invalid binder calls | |
| 3557e0a Merge "Additional CTS test for robust handling of invalid cmap" into lmp-dev am: 9b210dff4e am: 90022dd911 am: a66bacd53f am: 816699405c am: 4f04e4a6fb am: ad1d265f67 am: 912c9c6348 am: 32084f5200 | |
| 32084f5 Merge "Additional CTS test for robust handling of invalid cmap" into lmp-dev am: 9b210dff4e am: 90022dd911 am: a66bacd53f am: 816699405c am: 4f04e4a6fb am: ad1d265f67 am: 912c9c6348 | |
| 912c9c6 Merge "Additional CTS test for robust handling of invalid cmap" into lmp-dev am: 9b210dff4e am: 90022dd911 am: a66bacd53f am: 816699405c am: 4f04e4a6fb am: ad1d265f67 | |
| ad1d265 Merge "Additional CTS test for robust handling of invalid cmap" into lmp-dev am: 9b210dff4e am: 90022dd911 am: a66bacd53f am: 816699405c am: 4f04e4a6fb | |
| 4f04e4a Merge "Additional CTS test for robust handling of invalid cmap" into lmp-dev am: 9b210dff4e am: 90022dd911 am: a66bacd53f am: 816699405c | |
| 8166994 Merge "Additional CTS test for robust handling of invalid cmap" into lmp-dev am: 9b210dff4e am: 90022dd911 am: a66bacd53f | |
| a66bacd Merge "Additional CTS test for robust handling of invalid cmap" into lmp-dev am: 9b210dff4e am: 90022dd911 | |
| 90022dd Merge "Additional CTS test for robust handling of invalid cmap" into lmp-dev am: 9b210dff4e | |
| 9b210df Merge "Additional CTS test for robust handling of invalid cmap" into lmp-dev | |
| d8748ad Merge "CTS test for robust handling of invalid cmap" into lollipop-cts-dev | |
| fa86842 CTS test for robust handling of invalid cmap | |
| ee84d7c Merge "CTS test for libmedia OOB write anywhere" into marshmallow-cts-dev am: 9fcbbc7c31 am: b6f7383833 am: dc0524fce0 am: 6272869d94 | |
| 78cc165 Merge "Fixed issue with /" into marshmallow-cts-dev am: 832986fa85 -s ours am: 2209d869ea am: f8ac46c457 am: c73de104fc | |
| 6272869 Merge "CTS test for libmedia OOB write anywhere" into marshmallow-cts-dev am: 9fcbbc7c31 am: b6f7383833 am: dc0524fce0 | |
| c73de10 Merge "Fixed issue with /" into marshmallow-cts-dev am: 832986fa85 -s ours am: 2209d869ea am: f8ac46c457 | |
| c5f1d32 Merge "add more binder tests for AudioFlinger and AudioPolicyService." into marshmallow-cts-dev am: 48e7ed4c9a am: dc26dea4f1 am: 9a359123ac am: a6f89b97ce | |
| dc0524f Merge "CTS test for libmedia OOB write anywhere" into marshmallow-cts-dev am: 9fcbbc7c31 am: b6f7383833 | |
| 03ca549 Merge "DO NOT MERGE - Add security test for IEffect binder command" into marshmallow-cts-dev am: 4309958365 -s ours am: 656371b19a am: 45893dbc26 am: f983b4a9ba | |
| f8ac46c Merge "Fixed issue with /" into marshmallow-cts-dev am: 832986fa85 -s ours am: 2209d869ea | |
| db3ea66 Merge "Test whether mediaserver leaks info across invalid binder calls" into marshmallow-cts-dev am: 51e99e61a7 -s ours am: 583ceb90d2 am: f86d0de9e8 am: 1b19ce52d9 | |
| a6f89b9 Merge "add more binder tests for AudioFlinger and AudioPolicyService." into marshmallow-cts-dev am: 48e7ed4c9a am: dc26dea4f1 am: 9a359123ac | |
| b6f7383 Merge "CTS test for libmedia OOB write anywhere" into marshmallow-cts-dev am: 9fcbbc7c31 | |
| f983b4a Merge "DO NOT MERGE - Add security test for IEffect binder command" into marshmallow-cts-dev am: 4309958365 -s ours am: 656371b19a am: 45893dbc26 | |
| 2209d86 Merge "Fixed issue with /" into marshmallow-cts-dev am: 832986fa85 -s ours | |
| 1b19ce5 Merge "Test whether mediaserver leaks info across invalid binder calls" into marshmallow-cts-dev am: 51e99e61a7 -s ours am: 583ceb90d2 am: f86d0de9e8 | |
| 9a35912 Merge "add more binder tests for AudioFlinger and AudioPolicyService." into marshmallow-cts-dev am: 48e7ed4c9a am: dc26dea4f1 | |
| 45893db Merge "DO NOT MERGE - Add security test for IEffect binder command" into marshmallow-cts-dev am: 4309958365 -s ours am: 656371b19a | |
| 410ade3 Merge "Add CTS tests for IAudioflinger binder checks." into marshmallow-cts-dev am: cf33884d4c -s ours am: 4fad677d38 am: f2e9e7c1ef am: ab8f23c9ee | |
| f86d0de Merge "Test whether mediaserver leaks info across invalid binder calls" into marshmallow-cts-dev am: 51e99e61a7 -s ours am: 583ceb90d2 | |
| dc26dea Merge "add more binder tests for AudioFlinger and AudioPolicyService." into marshmallow-cts-dev am: 48e7ed4c9a | |
| 656371b Merge "DO NOT MERGE - Add security test for IEffect binder command" into marshmallow-cts-dev am: 4309958365 -s ours | |
| 583ceb9 Merge "Test whether mediaserver leaks info across invalid binder calls" into marshmallow-cts-dev am: 51e99e61a7 -s ours | |
| ab8f23c Merge "Add CTS tests for IAudioflinger binder checks." into marshmallow-cts-dev am: cf33884d4c -s ours am: 4fad677d38 am: f2e9e7c1ef | |
| f2e9e7c Merge "Add CTS tests for IAudioflinger binder checks." into marshmallow-cts-dev am: cf33884d4c -s ours am: 4fad677d38 | |
| 4fad677 Merge "Add CTS tests for IAudioflinger binder checks." into marshmallow-cts-dev am: cf33884d4c -s ours | |
| 9fcbbc7 Merge "CTS test for libmedia OOB write anywhere" into marshmallow-cts-dev | |
| 832986f Merge "Fixed issue with /" into marshmallow-cts-dev | |
| 48e7ed4 Merge "add more binder tests for AudioFlinger and AudioPolicyService." into marshmallow-cts-dev | |
| 4309958 Merge "DO NOT MERGE - Add security test for IEffect binder command" into marshmallow-cts-dev | |
| 51e99e6 Merge "Test whether mediaserver leaks info across invalid binder calls" into marshmallow-cts-dev | |
| cf33884 Merge "Add CTS tests for IAudioflinger binder checks." into marshmallow-cts-dev | |
| 37613eb Merge "DO NOT MERGE: BUMP CTS 5.0 to R4" into lollipop-cts-dev am: a586149d31 -s ours am: 54986a2e57 -s ours am: 6219c8d452 -s ours am: a1c99269ee am: 2dc397d709 am: ef4b438e13 | |
| ef4b438 Merge "DO NOT MERGE: BUMP CTS 5.0 to R4" into lollipop-cts-dev am: a586149d31 -s ours am: 54986a2e57 -s ours am: 6219c8d452 -s ours am: a1c99269ee am: 2dc397d709 | |
| 2dc397d Merge "DO NOT MERGE: BUMP CTS 5.0 to R4" into lollipop-cts-dev am: a586149d31 -s ours am: 54986a2e57 -s ours am: 6219c8d452 -s ours am: a1c99269ee | |
| a1c9926 Merge "DO NOT MERGE: BUMP CTS 5.0 to R4" into lollipop-cts-dev am: a586149d31 -s ours am: 54986a2e57 -s ours am: 6219c8d452 -s ours | |
| 6219c8d Merge "DO NOT MERGE: BUMP CTS 5.0 to R4" into lollipop-cts-dev am: a586149d31 -s ours am: 54986a2e57 -s ours | |
| 54986a2 Merge "DO NOT MERGE: BUMP CTS 5.0 to R4" into lollipop-cts-dev am: a586149d31 -s ours | |
| a586149 Merge "DO NOT MERGE: BUMP CTS 5.0 to R4" into lollipop-cts-dev | |
| e311e3f DO NOT MERGE: BUMP CTS 5.0 to R4 | |
| ff8c169 Merge "DO NOT MERGE - add more binder tests for AudioFlinger and AudioPolicyService." into lollipop-cts-dev am: 7f00ee8353 -s ours am: 8c765c0137 -s ours am: 689fae0f9e -s ours am: 90cacea447 am: 21c844d2d4 am: 02b3efbb13 | |
| f2dac21 Merge "DO NOT MERGE: rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp" into lollipop-cts-dev am: 4fa953d62f -s ours am: 736057e6cd -s ours am: 524e6b8474 -s ours am: 99428f54ed am: 6d360fba27 am: 521683ec1c | |
| 8037844 Merge "DO NOT MERGE - Add security test for IEffect binder command" into lollipop-cts-dev am: 25ae787b1f -s ours am: 3ec2be0d35 -s ours am: 4c0937c531 -s ours am: b3d93c205f am: a750ea35d6 am: 53aaad435f | |
| d0c9571 Merge "DO NOT MERGE ANYWHERE: Test whether mediaserver leaks info across invalid binder calls" into lollipop-cts-dev am: eb27e38300 -s ours am: 349efff4d6 -s ours am: 0cb0f2bf62 -s ours am: 73808fd993 -s ours am: aa2e738b44 -s ours am: 59f4c4954f -s ours | |
| 0321313 Merge "DO NOT MERGE - Add CTS tests for IAudioflinger binder checks." into lollipop-cts-dev am: a08da8832c -s ours am: 5bd6970d0d -s ours am: be72c904da -s ours am: 5dbe8ff455 am: bb22d76521 am: 5624da8a1e | |
| 79a70a6 CTS test for libmedia OOB write anywhere | |
| 02b3efb Merge "DO NOT MERGE - add more binder tests for AudioFlinger and AudioPolicyService." into lollipop-cts-dev am: 7f00ee8353 -s ours am: 8c765c0137 -s ours am: 689fae0f9e -s ours am: 90cacea447 am: 21c844d2d4 | |
| 521683e Merge "DO NOT MERGE: rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp" into lollipop-cts-dev am: 4fa953d62f -s ours am: 736057e6cd -s ours am: 524e6b8474 -s ours am: 99428f54ed am: 6d360fba27 | |
| 53aaad4 Merge "DO NOT MERGE - Add security test for IEffect binder command" into lollipop-cts-dev am: 25ae787b1f -s ours am: 3ec2be0d35 -s ours am: 4c0937c531 -s ours am: b3d93c205f am: a750ea35d6 | |
| 59f4c49 Merge "DO NOT MERGE ANYWHERE: Test whether mediaserver leaks info across invalid binder calls" into lollipop-cts-dev am: eb27e38300 -s ours am: 349efff4d6 -s ours am: 0cb0f2bf62 -s ours am: 73808fd993 -s ours am: aa2e738b44 -s ours | |
| 5624da8 Merge "DO NOT MERGE - Add CTS tests for IAudioflinger binder checks." into lollipop-cts-dev am: a08da8832c -s ours am: 5bd6970d0d -s ours am: be72c904da -s ours am: 5dbe8ff455 am: bb22d76521 | |
| cdee325 Fixed issue with / | |
| 21c844d Merge "DO NOT MERGE - add more binder tests for AudioFlinger and AudioPolicyService." into lollipop-cts-dev am: 7f00ee8353 -s ours am: 8c765c0137 -s ours am: 689fae0f9e -s ours am: 90cacea447 | |
| 6d360fb Merge "DO NOT MERGE: rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp" into lollipop-cts-dev am: 4fa953d62f -s ours am: 736057e6cd -s ours am: 524e6b8474 -s ours am: 99428f54ed | |
| a750ea3 Merge "DO NOT MERGE - Add security test for IEffect binder command" into lollipop-cts-dev am: 25ae787b1f -s ours am: 3ec2be0d35 -s ours am: 4c0937c531 -s ours am: b3d93c205f | |
| aa2e738 Merge "DO NOT MERGE ANYWHERE: Test whether mediaserver leaks info across invalid binder calls" into lollipop-cts-dev am: eb27e38300 -s ours am: 349efff4d6 -s ours am: 0cb0f2bf62 -s ours am: 73808fd993 -s ours | |
| bb22d76 Merge "DO NOT MERGE - Add CTS tests for IAudioflinger binder checks." into lollipop-cts-dev am: a08da8832c -s ours am: 5bd6970d0d -s ours am: be72c904da -s ours am: 5dbe8ff455 | |
| 90cacea Merge "DO NOT MERGE - add more binder tests for AudioFlinger and AudioPolicyService." into lollipop-cts-dev am: 7f00ee8353 -s ours am: 8c765c0137 -s ours am: 689fae0f9e -s ours | |
| 99428f5 Merge "DO NOT MERGE: rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp" into lollipop-cts-dev am: 4fa953d62f -s ours am: 736057e6cd -s ours am: 524e6b8474 -s ours | |
| b3d93c2 Merge "DO NOT MERGE - Add security test for IEffect binder command" into lollipop-cts-dev am: 25ae787b1f -s ours am: 3ec2be0d35 -s ours am: 4c0937c531 -s ours | |
| 73808fd Merge "DO NOT MERGE ANYWHERE: Test whether mediaserver leaks info across invalid binder calls" into lollipop-cts-dev am: eb27e38300 -s ours am: 349efff4d6 -s ours am: 0cb0f2bf62 -s ours | |
| 5dbe8ff Merge "DO NOT MERGE - Add CTS tests for IAudioflinger binder checks." into lollipop-cts-dev am: a08da8832c -s ours am: 5bd6970d0d -s ours am: be72c904da -s ours | |
| 689fae0 Merge "DO NOT MERGE - add more binder tests for AudioFlinger and AudioPolicyService." into lollipop-cts-dev am: 7f00ee8353 -s ours am: 8c765c0137 -s ours | |
| 524e6b8 Merge "DO NOT MERGE: rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp" into lollipop-cts-dev am: 4fa953d62f -s ours am: 736057e6cd -s ours | |
| 4c0937c Merge "DO NOT MERGE - Add security test for IEffect binder command" into lollipop-cts-dev am: 25ae787b1f -s ours am: 3ec2be0d35 -s ours | |
| 0cb0f2b Merge "DO NOT MERGE ANYWHERE: Test whether mediaserver leaks info across invalid binder calls" into lollipop-cts-dev am: eb27e38300 -s ours am: 349efff4d6 -s ours | |
| be72c90 Merge "DO NOT MERGE - Add CTS tests for IAudioflinger binder checks." into lollipop-cts-dev am: a08da8832c -s ours am: 5bd6970d0d -s ours | |
| 8c765c0 Merge "DO NOT MERGE - add more binder tests for AudioFlinger and AudioPolicyService." into lollipop-cts-dev am: 7f00ee8353 -s ours | |
| 736057e Merge "DO NOT MERGE: rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp" into lollipop-cts-dev am: 4fa953d62f -s ours | |
| 3ec2be0 Merge "DO NOT MERGE - Add security test for IEffect binder command" into lollipop-cts-dev am: 25ae787b1f -s ours | |
| 349efff Merge "DO NOT MERGE ANYWHERE: Test whether mediaserver leaks info across invalid binder calls" into lollipop-cts-dev am: eb27e38300 -s ours | |
| 5bd6970 Merge "DO NOT MERGE - Add CTS tests for IAudioflinger binder checks." into lollipop-cts-dev am: a08da8832c -s ours | |
| 7f00ee8 Merge "DO NOT MERGE - add more binder tests for AudioFlinger and AudioPolicyService." into lollipop-cts-dev | |
| 3f51455 DO NOT MERGE - add more binder tests for AudioFlinger and AudioPolicyService. | |
| 4fa953d Merge "DO NOT MERGE: rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp" into lollipop-cts-dev | |
| 25ae787 Merge "DO NOT MERGE - Add security test for IEffect binder command" into lollipop-cts-dev | |
| eb27e38 Merge "DO NOT MERGE ANYWHERE: Test whether mediaserver leaks info across invalid binder calls" into lollipop-cts-dev | |
| a08da88 Merge "DO NOT MERGE - Add CTS tests for IAudioflinger binder checks." into lollipop-cts-dev | |
| 01808e7 add more binder tests for AudioFlinger and AudioPolicyService. | |
| e88e845 DO NOT MERGE - Add security test for IEffect binder command | |
| 879adeb Test whether mediaserver leaks info across invalid binder calls | |
| c2b384c Add CTS tests for IAudioflinger binder checks. | |
| 0449073 DO NOT MERGE: rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp | |
| 77137c5 Merge "DO NOT MERGE - add more binder tests for AudioFlinger and AudioPolicyService." into kitkat-cts-dev am: e39cc7ce62 -s ours am: ffc0dcf33d -s ours am: 4c9cf80eb3 -s ours am: 3b80130f1c -s ours am: b513fd3a1a am: bdba0dadf7 am: 798df8e7ae | |
| 8a803f7 Merge "DO NOT MERGE: rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp" into kitkat-cts-dev am: 5961e277eb -s ours am: 06c672a2cb -s ours am: c6945d860e -s ours am: c23e2d6230 -s ours am: 07b1a48d2c am: 63949190c9 am: 4d7e8984c3 | |
| c3aefca Merge "DO NOT MERGE - Add security test for IEffect binder command" into kitkat-cts-dev am: a1e31f3ae9 -s ours am: 83b20f59d5 -s ours am: c539227a67 -s ours am: 0552309c53 -s ours am: 2b88bf7aeb am: f6f33b5743 am: 343fa53f6e | |
| 1445266 Merge "DO NOT MERGE: Test whether mediaserver leaks info across invalid binder calls" into kitkat-cts-dev am: 8f0493ad6e -s ours am: 4bddfaa72b -s ours am: 0272875e39 -s ours am: 282cd9c2f3 -s ours am: 52889523e7 am: 24559ec613 am: e56a26aa76 | |
| e2607d3 Merge "DO NOT MERGE - Add CTS tests for IAudioflinger binder checks." into kitkat-cts-dev am: ab7bf4d3e9 -s ours am: a84bb9bc90 -s ours am: 5166293f9b -s ours am: ba67b18ee3 -s ours am: 67490827ee am: 5eba6e71f8 am: d89edb8b2f | |
| 798df8e Merge "DO NOT MERGE - add more binder tests for AudioFlinger and AudioPolicyService." into kitkat-cts-dev am: e39cc7ce62 -s ours am: ffc0dcf33d -s ours am: 4c9cf80eb3 -s ours am: 3b80130f1c -s ours am: b513fd3a1a am: bdba0dadf7 | |
| 4d7e898 Merge "DO NOT MERGE: rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp" into kitkat-cts-dev am: 5961e277eb -s ours am: 06c672a2cb -s ours am: c6945d860e -s ours am: c23e2d6230 -s ours am: 07b1a48d2c am: 63949190c9 | |
| 343fa53 Merge "DO NOT MERGE - Add security test for IEffect binder command" into kitkat-cts-dev am: a1e31f3ae9 -s ours am: 83b20f59d5 -s ours am: c539227a67 -s ours am: 0552309c53 -s ours am: 2b88bf7aeb am: f6f33b5743 | |
| e56a26a Merge "DO NOT MERGE: Test whether mediaserver leaks info across invalid binder calls" into kitkat-cts-dev am: 8f0493ad6e -s ours am: 4bddfaa72b -s ours am: 0272875e39 -s ours am: 282cd9c2f3 -s ours am: 52889523e7 am: 24559ec613 | |
| d89edb8 Merge "DO NOT MERGE - Add CTS tests for IAudioflinger binder checks." into kitkat-cts-dev am: ab7bf4d3e9 -s ours am: a84bb9bc90 -s ours am: 5166293f9b -s ours am: ba67b18ee3 -s ours am: 67490827ee am: 5eba6e71f8 | |
| bdba0da Merge "DO NOT MERGE - add more binder tests for AudioFlinger and AudioPolicyService." into kitkat-cts-dev am: e39cc7ce62 -s ours am: ffc0dcf33d -s ours am: 4c9cf80eb3 -s ours am: 3b80130f1c -s ours am: b513fd3a1a | |
| 6394919 Merge "DO NOT MERGE: rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp" into kitkat-cts-dev am: 5961e277eb -s ours am: 06c672a2cb -s ours am: c6945d860e -s ours am: c23e2d6230 -s ours am: 07b1a48d2c | |
| f6f33b5 Merge "DO NOT MERGE - Add security test for IEffect binder command" into kitkat-cts-dev am: a1e31f3ae9 -s ours am: 83b20f59d5 -s ours am: c539227a67 -s ours am: 0552309c53 -s ours am: 2b88bf7aeb | |
| 24559ec Merge "DO NOT MERGE: Test whether mediaserver leaks info across invalid binder calls" into kitkat-cts-dev am: 8f0493ad6e -s ours am: 4bddfaa72b -s ours am: 0272875e39 -s ours am: 282cd9c2f3 -s ours am: 52889523e7 | |
| 5eba6e7 Merge "DO NOT MERGE - Add CTS tests for IAudioflinger binder checks." into kitkat-cts-dev am: ab7bf4d3e9 -s ours am: a84bb9bc90 -s ours am: 5166293f9b -s ours am: ba67b18ee3 -s ours am: 67490827ee | |
| b513fd3 Merge "DO NOT MERGE - add more binder tests for AudioFlinger and AudioPolicyService." into kitkat-cts-dev am: e39cc7ce62 -s ours am: ffc0dcf33d -s ours am: 4c9cf80eb3 -s ours am: 3b80130f1c -s ours | |
| 07b1a48 Merge "DO NOT MERGE: rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp" into kitkat-cts-dev am: 5961e277eb -s ours am: 06c672a2cb -s ours am: c6945d860e -s ours am: c23e2d6230 -s ours | |
| 2b88bf7 Merge "DO NOT MERGE - Add security test for IEffect binder command" into kitkat-cts-dev am: a1e31f3ae9 -s ours am: 83b20f59d5 -s ours am: c539227a67 -s ours am: 0552309c53 -s ours | |
| 5288952 Merge "DO NOT MERGE: Test whether mediaserver leaks info across invalid binder calls" into kitkat-cts-dev am: 8f0493ad6e -s ours am: 4bddfaa72b -s ours am: 0272875e39 -s ours am: 282cd9c2f3 -s ours | |
| 6749082 Merge "DO NOT MERGE - Add CTS tests for IAudioflinger binder checks." into kitkat-cts-dev am: ab7bf4d3e9 -s ours am: a84bb9bc90 -s ours am: 5166293f9b -s ours am: ba67b18ee3 -s ours | |
| 3b80130 Merge "DO NOT MERGE - add more binder tests for AudioFlinger and AudioPolicyService." into kitkat-cts-dev am: e39cc7ce62 -s ours am: ffc0dcf33d -s ours am: 4c9cf80eb3 -s ours | |
| c23e2d6 Merge "DO NOT MERGE: rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp" into kitkat-cts-dev am: 5961e277eb -s ours am: 06c672a2cb -s ours am: c6945d860e -s ours | |
| 0552309 Merge "DO NOT MERGE - Add security test for IEffect binder command" into kitkat-cts-dev am: a1e31f3ae9 -s ours am: 83b20f59d5 -s ours am: c539227a67 -s ours | |
| 282cd9c Merge "DO NOT MERGE: Test whether mediaserver leaks info across invalid binder calls" into kitkat-cts-dev am: 8f0493ad6e -s ours am: 4bddfaa72b -s ours am: 0272875e39 -s ours | |
| ba67b18 Merge "DO NOT MERGE - Add CTS tests for IAudioflinger binder checks." into kitkat-cts-dev am: ab7bf4d3e9 -s ours am: a84bb9bc90 -s ours am: 5166293f9b -s ours | |
| 4c9cf80 Merge "DO NOT MERGE - add more binder tests for AudioFlinger and AudioPolicyService." into kitkat-cts-dev am: e39cc7ce62 -s ours am: ffc0dcf33d -s ours | |
| c6945d8 Merge "DO NOT MERGE: rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp" into kitkat-cts-dev am: 5961e277eb -s ours am: 06c672a2cb -s ours | |
| c539227 Merge "DO NOT MERGE - Add security test for IEffect binder command" into kitkat-cts-dev am: a1e31f3ae9 -s ours am: 83b20f59d5 -s ours | |
| 0272875 Merge "DO NOT MERGE: Test whether mediaserver leaks info across invalid binder calls" into kitkat-cts-dev am: 8f0493ad6e -s ours am: 4bddfaa72b -s ours | |
| 5166293 Merge "DO NOT MERGE - Add CTS tests for IAudioflinger binder checks." into kitkat-cts-dev am: ab7bf4d3e9 -s ours am: a84bb9bc90 -s ours | |
| 1eba384 DO NOT MERGE - Add security test for IEffect binder command | |
| 96cdf3c DO NOT MERGE ANYWHERE: Test whether mediaserver leaks info across invalid binder calls | |
| 95959a8 DO NOT MERGE - Add CTS tests for IAudioflinger binder checks. | |
| ffc0dcf Merge "DO NOT MERGE - add more binder tests for AudioFlinger and AudioPolicyService." into kitkat-cts-dev am: e39cc7ce62 -s ours | |
| 06c672a Merge "DO NOT MERGE: rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp" into kitkat-cts-dev am: 5961e277eb -s ours | |
| 83b20f5 Merge "DO NOT MERGE - Add security test for IEffect binder command" into kitkat-cts-dev am: a1e31f3ae9 -s ours | |
| 4bddfaa Merge "DO NOT MERGE: Test whether mediaserver leaks info across invalid binder calls" into kitkat-cts-dev am: 8f0493ad6e -s ours | |
| a84bb9b Merge "DO NOT MERGE - Add CTS tests for IAudioflinger binder checks." into kitkat-cts-dev am: ab7bf4d3e9 -s ours | |
| e39cc7c Merge "DO NOT MERGE - add more binder tests for AudioFlinger and AudioPolicyService." into kitkat-cts-dev | |
| 2566392 DO NOT MERGE - add more binder tests for AudioFlinger and AudioPolicyService. | |
| 5961e27 Merge "DO NOT MERGE: rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp" into kitkat-cts-dev | |
| a1e31f3 Merge "DO NOT MERGE - Add security test for IEffect binder command" into kitkat-cts-dev | |
| 8f0493a Merge "DO NOT MERGE: Test whether mediaserver leaks info across invalid binder calls" into kitkat-cts-dev | |
| ab7bf4d Merge "DO NOT MERGE - Add CTS tests for IAudioflinger binder checks." into kitkat-cts-dev | |
| 0a93ef4 DO NOT MERGE: rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp | |
| 47d7c97 DO NOT MERGE - Add security test for IEffect binder command | |
| ab3b26d DO NOT MERGE: Test whether mediaserver leaks info across invalid binder calls | |
| 184289f DO NOT MERGE - Add CTS tests for IAudioflinger binder checks. | |
| d445772 Merge "Test for mpeg2 decoder bugfix" into mnc-dev am: 6ee5b7e3e2 am: a201a8ac80 am: 539f38218d | |
| 539f382 Merge "Test for mpeg2 decoder bugfix" into mnc-dev am: 6ee5b7e3e2 am: a201a8ac80 | |
| a201a8a Merge "Test for mpeg2 decoder bugfix" into mnc-dev am: 6ee5b7e3e2 | |
| 6ee5b7e Merge "Test for mpeg2 decoder bugfix" into mnc-dev | |
| 3b1b573 Merge "DO NOT MERGE Collect ro.build.reference.fingerprint" into lollipop-cts-dev am: e5a88f069a -s ours am: c478cd9634 -s ours am: d05f05ae14 -s ours am: 3d7d2bbbb8 am: 42eccb42cd am: 7e05df1782 | |
| 40d446a Merge "Collect ro.build.reference.fingerprint" into marshmallow-cts-dev am: 0f11c9c569 am: 24b4aea7d6 am: 9ef4dfdf8e am: 6d815c639f | |
| 7e05df1 Merge "DO NOT MERGE Collect ro.build.reference.fingerprint" into lollipop-cts-dev am: e5a88f069a -s ours am: c478cd9634 -s ours am: d05f05ae14 -s ours am: 3d7d2bbbb8 am: 42eccb42cd | |
| 6d815c6 Merge "Collect ro.build.reference.fingerprint" into marshmallow-cts-dev am: 0f11c9c569 am: 24b4aea7d6 am: 9ef4dfdf8e | |
| 42eccb4 Merge "DO NOT MERGE Collect ro.build.reference.fingerprint" into lollipop-cts-dev am: e5a88f069a -s ours am: c478cd9634 -s ours am: d05f05ae14 -s ours am: 3d7d2bbbb8 | |
| 3d7d2bb Merge "DO NOT MERGE Collect ro.build.reference.fingerprint" into lollipop-cts-dev am: e5a88f069a -s ours am: c478cd9634 -s ours am: d05f05ae14 -s ours | |
| 9ef4dfd Merge "Collect ro.build.reference.fingerprint" into marshmallow-cts-dev am: 0f11c9c569 am: 24b4aea7d6 | |
| d05f05a Merge "DO NOT MERGE Collect ro.build.reference.fingerprint" into lollipop-cts-dev am: e5a88f069a -s ours am: c478cd9634 -s ours | |
| 24b4aea Merge "Collect ro.build.reference.fingerprint" into marshmallow-cts-dev am: 0f11c9c569 | |
| c478cd9 Merge "DO NOT MERGE Collect ro.build.reference.fingerprint" into lollipop-cts-dev am: e5a88f069a -s ours | |
| 0f11c9c Merge "Collect ro.build.reference.fingerprint" into marshmallow-cts-dev | |
| e5a88f0 Merge "DO NOT MERGE Collect ro.build.reference.fingerprint" into lollipop-cts-dev | |
| b6e9afd Collect ro.build.reference.fingerprint | |
| 558dd2c DO NOT MERGE Collect ro.build.reference.fingerprint | |
| f6a9761 Test for mpeg2 decoder bugfix | |
| 477ac36 Merge "Revert "Collect ro.build.reference.fingerprint"" into lollipop-cts-dev am: ccbb14667a am: 8cb1f6f745 am: 028d6cb1c9 am: 5ebdc03db7 am: cdd47ce47b am: d72ef43612 | |
| abb30e9 DO NOT MERGE ANYWHERE Camera: allow more time for AF am: de6a1c5637 -s ours am: 88ecca4826 -s ours am: 1c454deb29 -s ours am: 288d4543b2 -s ours am: 38170989d4 -s ours am: 6cb467fb97 -s ours am: f60ec692ea -s ours am: 9bac2c9980 -s ours | |
| d72ef43 Merge "Revert "Collect ro.build.reference.fingerprint"" into lollipop-cts-dev am: ccbb14667a am: 8cb1f6f745 am: 028d6cb1c9 am: 5ebdc03db7 am: cdd47ce47b | |
| 9bac2c9 DO NOT MERGE ANYWHERE Camera: allow more time for AF am: de6a1c5637 -s ours am: 88ecca4826 -s ours am: 1c454deb29 -s ours am: 288d4543b2 -s ours am: 38170989d4 -s ours am: 6cb467fb97 -s ours am: f60ec692ea -s ours | |
| cdd47ce Merge "Revert "Collect ro.build.reference.fingerprint"" into lollipop-cts-dev am: ccbb14667a am: 8cb1f6f745 am: 028d6cb1c9 am: 5ebdc03db7 | |
| 5ebdc03 Merge "Revert "Collect ro.build.reference.fingerprint"" into lollipop-cts-dev am: ccbb14667a am: 8cb1f6f745 am: 028d6cb1c9 | |
| 046e340 Merge "Revert "Collect ro.build.reference.fingerprint"" into lollipop-cts-dev am: 698cb2e949 am: 2e3b853882 am: 7bc9aede43 am: 711f1ebf2b am: 4bbea4e6b5 am: e23f1ce7f4 | |
| f60ec69 DO NOT MERGE ANYWHERE Camera: allow more time for AF am: de6a1c5637 -s ours am: 88ecca4826 -s ours am: 1c454deb29 -s ours am: 288d4543b2 -s ours am: 38170989d4 -s ours am: 6cb467fb97 -s ours | |
| e9023f8 Merge "DO NOT MERGE: Revert "Collect ro.build.reference.fingerprint"" into mnc-dr1.5-dev | |
| 028d6cb Merge "Revert "Collect ro.build.reference.fingerprint"" into lollipop-cts-dev am: ccbb14667a am: 8cb1f6f745 | |
| f7ef2dc DO NOT MERGE: Revert "Collect ro.build.reference.fingerprint" | |
| e23f1ce Merge "Revert "Collect ro.build.reference.fingerprint"" into lollipop-cts-dev am: 698cb2e949 am: 2e3b853882 am: 7bc9aede43 am: 711f1ebf2b am: 4bbea4e6b5 | |
| 6cb467f DO NOT MERGE ANYWHERE Camera: allow more time for AF am: de6a1c5637 -s ours am: 88ecca4826 -s ours am: 1c454deb29 -s ours am: 288d4543b2 -s ours am: 38170989d4 -s ours | |
| 512363d Merge "CTS: check non-zygote apps are not debuggable DO NOT MERGE" into kitkat-cts-dev am: a602824a95 -s ours am: 71d833b86c -s ours am: 62d29d47b9 -s ours am: 2fc6689f63 -s ours am: dff0ae13be am: 48be7fed49 am: 23020c3abf | |
| 8cb1f6f Merge "Revert "Collect ro.build.reference.fingerprint"" into lollipop-cts-dev am: ccbb14667a | |
| 3817098 DO NOT MERGE ANYWHERE Camera: allow more time for AF am: de6a1c5637 -s ours am: 88ecca4826 -s ours am: 1c454deb29 -s ours am: 288d4543b2 -s ours | |
| 23020c3 Merge "CTS: check non-zygote apps are not debuggable DO NOT MERGE" into kitkat-cts-dev am: a602824a95 -s ours am: 71d833b86c -s ours am: 62d29d47b9 -s ours am: 2fc6689f63 -s ours am: dff0ae13be am: 48be7fed49 | |
| 4bbea4e Merge "Revert "Collect ro.build.reference.fingerprint"" into lollipop-cts-dev am: 698cb2e949 am: 2e3b853882 am: 7bc9aede43 am: 711f1ebf2b | |
| ccbb146 Merge "Revert "Collect ro.build.reference.fingerprint"" into lollipop-cts-dev | |
| 3e92a58 Revert "Collect ro.build.reference.fingerprint" | |
| 711f1eb Merge "Revert "Collect ro.build.reference.fingerprint"" into lollipop-cts-dev am: 698cb2e949 am: 2e3b853882 am: 7bc9aede43 | |
| 288d454 DO NOT MERGE ANYWHERE Camera: allow more time for AF am: de6a1c5637 -s ours am: 88ecca4826 -s ours am: 1c454deb29 -s ours | |
| 48be7fe Merge "CTS: check non-zygote apps are not debuggable DO NOT MERGE" into kitkat-cts-dev am: a602824a95 -s ours am: 71d833b86c -s ours am: 62d29d47b9 -s ours am: 2fc6689f63 -s ours am: dff0ae13be | |
| 7bc9aed Merge "Revert "Collect ro.build.reference.fingerprint"" into lollipop-cts-dev am: 698cb2e949 am: 2e3b853882 | |
| 1c454de DO NOT MERGE ANYWHERE Camera: allow more time for AF am: de6a1c5637 -s ours am: 88ecca4826 -s ours | |
| d5bafbe Merge "Add test for Keystore put overflow" into kitkat-cts-dev am: 3f4ce7b16b am: ab95f50da8 am: 712ed9c5ee am: 8f043e69c1 am: a9504d59ea am: 648e79364c am: 8b67e7b95e | |
| dff0ae1 Merge "CTS: check non-zygote apps are not debuggable DO NOT MERGE" into kitkat-cts-dev am: a602824a95 -s ours am: 71d833b86c -s ours am: 62d29d47b9 -s ours am: 2fc6689f63 -s ours | |
| 2e3b853 Merge "Revert "Collect ro.build.reference.fingerprint"" into lollipop-cts-dev am: 698cb2e949 | |
| 2fc6689 Merge "CTS: check non-zygote apps are not debuggable DO NOT MERGE" into kitkat-cts-dev am: a602824a95 -s ours am: 71d833b86c -s ours am: 62d29d47b9 -s ours | |
| 88ecca4 DO NOT MERGE ANYWHERE Camera: allow more time for AF am: de6a1c5637 -s ours | |
| 698cb2e Merge "Revert "Collect ro.build.reference.fingerprint"" into lollipop-cts-dev | |
| 12813c9 Revert "Collect ro.build.reference.fingerprint" | |
| 8b67e7b Merge "Add test for Keystore put overflow" into kitkat-cts-dev am: 3f4ce7b16b am: ab95f50da8 am: 712ed9c5ee am: 8f043e69c1 am: a9504d59ea am: 648e79364c | |
| 62d29d4 Merge "CTS: check non-zygote apps are not debuggable DO NOT MERGE" into kitkat-cts-dev am: a602824a95 -s ours am: 71d833b86c -s ours | |
| 71d833b Merge "CTS: check non-zygote apps are not debuggable DO NOT MERGE" into kitkat-cts-dev am: a602824a95 -s ours | |
| 648e793 Merge "Add test for Keystore put overflow" into kitkat-cts-dev am: 3f4ce7b16b am: ab95f50da8 am: 712ed9c5ee am: 8f043e69c1 am: a9504d59ea | |
| a602824 Merge "CTS: check non-zygote apps are not debuggable DO NOT MERGE" into kitkat-cts-dev | |
| a9504d5 Merge "Add test for Keystore put overflow" into kitkat-cts-dev am: 3f4ce7b16b am: ab95f50da8 am: 712ed9c5ee am: 8f043e69c1 | |
| 8f043e6 Merge "Add test for Keystore put overflow" into kitkat-cts-dev am: 3f4ce7b16b am: ab95f50da8 am: 712ed9c5ee | |
| 712ed9c Merge "Add test for Keystore put overflow" into kitkat-cts-dev am: 3f4ce7b16b am: ab95f50da8 | |
| de6a1c5 DO NOT MERGE ANYWHERE Camera: allow more time for AF | |
| ab95f50 Merge "Add test for Keystore put overflow" into kitkat-cts-dev am: 3f4ce7b16b | |
| 3f4ce7b Merge "Add test for Keystore put overflow" into kitkat-cts-dev | |
| b50985a Merge "CTS test for mpeg2 decoder bugfix" into mnc-dev am: 6b90065fec am: b28c796df3 am: f8d4e6e1dc | |
| f8d4e6e Merge "CTS test for mpeg2 decoder bugfix" into mnc-dev am: 6b90065fec am: b28c796df3 | |
| b28c796 Merge "CTS test for mpeg2 decoder bugfix" into mnc-dev am: 6b90065fec | |
| 6b90065 Merge "CTS test for mpeg2 decoder bugfix" into mnc-dev | |
| 5a73fc1 Merge "Collect ro.build.reference.fingerprint" into lollipop-cts-dev am: 3fba10eb3c am: d0330bb287 am: 0d68da7632 am: 76e7cea10b am: c754b707c6 am: 919c362039 | |
| 919c362 Merge "Collect ro.build.reference.fingerprint" into lollipop-cts-dev am: 3fba10eb3c am: d0330bb287 am: 0d68da7632 am: 76e7cea10b am: c754b707c6 | |
| c754b70 Merge "Collect ro.build.reference.fingerprint" into lollipop-cts-dev am: 3fba10eb3c am: d0330bb287 am: 0d68da7632 am: 76e7cea10b | |
| 76e7cea Merge "Collect ro.build.reference.fingerprint" into lollipop-cts-dev am: 3fba10eb3c am: d0330bb287 am: 0d68da7632 | |
| 0d68da7 Merge "Collect ro.build.reference.fingerprint" into lollipop-cts-dev am: 3fba10eb3c am: d0330bb287 | |
| d0330bb Merge "Collect ro.build.reference.fingerprint" into lollipop-cts-dev am: 3fba10eb3c | |
| 3fba10e Merge "Collect ro.build.reference.fingerprint" into lollipop-cts-dev | |
| ca6e524 CTS test for mpeg2 decoder bugfix | |
| b3813b3 Merge "Sonivox: add CTS test." into klp-dev am: 9d423cc70e am: 833791527f am: 9cf5ecbe21 am: 4c6e6808a0 am: ba8ebe751f am: 504eec999d am: 6a82be4ab3 am: 03d95d4afb am: c1670e3a64 am: dfb2e28a0a am: e8658b39f6 | |
| e8658b3 Merge "Sonivox: add CTS test." into klp-dev am: 9d423cc70e am: 833791527f am: 9cf5ecbe21 am: 4c6e6808a0 am: ba8ebe751f am: 504eec999d am: 6a82be4ab3 am: 03d95d4afb am: c1670e3a64 am: dfb2e28a0a | |
| dfb2e28 Merge "Sonivox: add CTS test." into klp-dev am: 9d423cc70e am: 833791527f am: 9cf5ecbe21 am: 4c6e6808a0 am: ba8ebe751f am: 504eec999d am: 6a82be4ab3 am: 03d95d4afb am: c1670e3a64 | |
| c1670e3 Merge "Sonivox: add CTS test." into klp-dev am: 9d423cc70e am: 833791527f am: 9cf5ecbe21 am: 4c6e6808a0 am: ba8ebe751f am: 504eec999d am: 6a82be4ab3 am: 03d95d4afb | |
| 03d95d4 Merge "Sonivox: add CTS test." into klp-dev am: 9d423cc70e am: 833791527f am: 9cf5ecbe21 am: 4c6e6808a0 am: ba8ebe751f am: 504eec999d am: 6a82be4ab3 | |
| 6a82be4 Merge "Sonivox: add CTS test." into klp-dev am: 9d423cc70e am: 833791527f am: 9cf5ecbe21 am: 4c6e6808a0 am: ba8ebe751f am: 504eec999d | |
| 504eec9 Merge "Sonivox: add CTS test." into klp-dev am: 9d423cc70e am: 833791527f am: 9cf5ecbe21 am: 4c6e6808a0 am: ba8ebe751f | |
| ba8ebe7 Merge "Sonivox: add CTS test." into klp-dev am: 9d423cc70e am: 833791527f am: 9cf5ecbe21 am: 4c6e6808a0 | |
| 4c6e680 Merge "Sonivox: add CTS test." into klp-dev am: 9d423cc70e am: 833791527f am: 9cf5ecbe21 | |
| 9cf5ecb Merge "Sonivox: add CTS test." into klp-dev am: 9d423cc70e am: 833791527f | |
| 8337915 Merge "Sonivox: add CTS test." into klp-dev am: 9d423cc70e | |
| 9d423cc Merge "Sonivox: add CTS test." into klp-dev | |
| 80ad131 Merge "Fix layout for WebViewTest#testRequestChildRectangleOnScreen" into lollipop-mr1-cts-dev am: a2e58413d5 am: 69a98ee633 am: 8242574205 am: 81986b2cca am: 5fd5dbec1e | |
| 5fd5dbe Merge "Fix layout for WebViewTest#testRequestChildRectangleOnScreen" into lollipop-mr1-cts-dev am: a2e58413d5 am: 69a98ee633 am: 8242574205 am: 81986b2cca | |
| 81986b2 Merge "Fix layout for WebViewTest#testRequestChildRectangleOnScreen" into lollipop-mr1-cts-dev am: a2e58413d5 am: 69a98ee633 am: 8242574205 | |
| 8242574 Merge "Fix layout for WebViewTest#testRequestChildRectangleOnScreen" into lollipop-mr1-cts-dev am: a2e58413d5 am: 69a98ee633 | |
| 69a98ee Merge "Fix layout for WebViewTest#testRequestChildRectangleOnScreen" into lollipop-mr1-cts-dev am: a2e58413d5 | |
| a2e5841 Merge "Fix layout for WebViewTest#testRequestChildRectangleOnScreen" into lollipop-mr1-cts-dev | |
| c84debe Fix layout for WebViewTest#testRequestChildRectangleOnScreen | |
| 9dec71a Merge "CTS fix: HifiUltrasoundSpeakerTestActivity is available with a speaker" into marshmallow-cts-dev am: 0cbbf64216 am: e0f81ff2a8 am: 9e7616ffb1 am: 5bf9a74811 | |
| 5bf9a74 Merge "CTS fix: HifiUltrasoundSpeakerTestActivity is available with a speaker" into marshmallow-cts-dev am: 0cbbf64216 am: e0f81ff2a8 am: 9e7616ffb1 | |
| 9e7616f Merge "CTS fix: HifiUltrasoundSpeakerTestActivity is available with a speaker" into marshmallow-cts-dev am: 0cbbf64216 am: e0f81ff2a8 | |
| e0f81ff Merge "CTS fix: HifiUltrasoundSpeakerTestActivity is available with a speaker" into marshmallow-cts-dev am: 0cbbf64216 | |
| 0cbbf64 Merge "CTS fix: HifiUltrasoundSpeakerTestActivity is available with a speaker" into marshmallow-cts-dev | |
| 5788c52 CTS fix: HifiUltrasoundSpeakerTestActivity is available with a speaker | |
| feb93ca Merge "Should use getSupportedVideoSizes()" into kitkat-cts-dev am: 3b0becee1f -s ours am: a32933f3d4 am: c2ca8bd64e am: 49a587a7e7 am: ac77c0fd32 am: b789733deb am: 3c07b53978 | |
| 04332aa Merge "Fix for LocationModeHighAccuracyTestActivity test." into kitkat-cts-dev am: 3d84f7178b -s ours am: ce81436bec am: b1542cfccc am: 1588f91e1c am: cb8b964942 am: 5de099a4ee am: 8031b67d79 | |
| 3c07b53 Merge "Should use getSupportedVideoSizes()" into kitkat-cts-dev am: 3b0becee1f -s ours am: a32933f3d4 am: c2ca8bd64e am: 49a587a7e7 am: ac77c0fd32 am: b789733deb | |
| b789733 Merge "Should use getSupportedVideoSizes()" into kitkat-cts-dev am: 3b0becee1f -s ours am: a32933f3d4 am: c2ca8bd64e am: 49a587a7e7 am: ac77c0fd32 | |
| 8031b67 Merge "Fix for LocationModeHighAccuracyTestActivity test." into kitkat-cts-dev am: 3d84f7178b -s ours am: ce81436bec am: b1542cfccc am: 1588f91e1c am: cb8b964942 am: 5de099a4ee | |
| ac77c0f Merge "Should use getSupportedVideoSizes()" into kitkat-cts-dev am: 3b0becee1f -s ours am: a32933f3d4 am: c2ca8bd64e am: 49a587a7e7 | |
| 5de099a Merge "Fix for LocationModeHighAccuracyTestActivity test." into kitkat-cts-dev am: 3d84f7178b -s ours am: ce81436bec am: b1542cfccc am: 1588f91e1c am: cb8b964942 | |
| 49a587a Merge "Should use getSupportedVideoSizes()" into kitkat-cts-dev am: 3b0becee1f -s ours am: a32933f3d4 am: c2ca8bd64e | |
| cb8b964 Merge "Fix for LocationModeHighAccuracyTestActivity test." into kitkat-cts-dev am: 3d84f7178b -s ours am: ce81436bec am: b1542cfccc am: 1588f91e1c | |
| c2ca8bd Merge "Should use getSupportedVideoSizes()" into kitkat-cts-dev am: 3b0becee1f -s ours am: a32933f3d4 | |
| 1588f91 Merge "Fix for LocationModeHighAccuracyTestActivity test." into kitkat-cts-dev am: 3d84f7178b -s ours am: ce81436bec am: b1542cfccc | |
| cb8b108 Sonivox: add CTS test. | |
| a32933f Merge "Should use getSupportedVideoSizes()" into kitkat-cts-dev am: 3b0becee1f -s ours | |
| b1542cf Merge "Fix for LocationModeHighAccuracyTestActivity test." into kitkat-cts-dev am: 3d84f7178b -s ours am: ce81436bec | |
| ce81436 Merge "Fix for LocationModeHighAccuracyTestActivity test." into kitkat-cts-dev am: 3d84f7178b -s ours | |
| 238d2e5 Collect ro.build.reference.fingerprint | |
| 587435d Merge "Fixs bugs regarding CTS fails for low performance codec" into lollipop-mr1-cts-dev am: a7e44855a3 -s ours am: f0f2607316 am: c864a18e15 am: 0c3be9ed7d am: 92b63fc32d | |
| 92b63fc Merge "Fixs bugs regarding CTS fails for low performance codec" into lollipop-mr1-cts-dev am: a7e44855a3 -s ours am: f0f2607316 am: c864a18e15 am: 0c3be9ed7d | |
| 0c3be9e Merge "Fixs bugs regarding CTS fails for low performance codec" into lollipop-mr1-cts-dev am: a7e44855a3 -s ours am: f0f2607316 am: c864a18e15 | |
| c864a18 Merge "Fixs bugs regarding CTS fails for low performance codec" into lollipop-mr1-cts-dev am: a7e44855a3 -s ours am: f0f2607316 | |
| f0f2607 Merge "Fixs bugs regarding CTS fails for low performance codec" into lollipop-mr1-cts-dev am: a7e44855a3 -s ours | |
| a7e4485 Merge "Fixs bugs regarding CTS fails for low performance codec" into lollipop-mr1-cts-dev | |
| 2349d1f Merge "Test case to check class loading using custom class loader" into lollipop-cts-dev am: 2c1981de13 am: 14446d26ca am: c57634afe9 am: b8f796a201 am: c17c7bee2d am: 1be28ae12b | |
| 1be28ae Merge "Test case to check class loading using custom class loader" into lollipop-cts-dev am: 2c1981de13 am: 14446d26ca am: c57634afe9 am: b8f796a201 am: c17c7bee2d | |
| c17c7be Merge "Test case to check class loading using custom class loader" into lollipop-cts-dev am: 2c1981de13 am: 14446d26ca am: c57634afe9 am: b8f796a201 | |
| b8f796a Merge "Test case to check class loading using custom class loader" into lollipop-cts-dev am: 2c1981de13 am: 14446d26ca am: c57634afe9 | |
| c57634a Merge "Test case to check class loading using custom class loader" into lollipop-cts-dev am: 2c1981de13 am: 14446d26ca | |
| 14446d2 Merge "Test case to check class loading using custom class loader" into lollipop-cts-dev am: 2c1981de13 | |
| 2c1981d Merge "Test case to check class loading using custom class loader" into lollipop-cts-dev | |
| 51b51aa Test case to check class loading using custom class loader | |
| 390546d Merge "TIF: Allow notifyVideoUnavailable in HardwareSessionTest" into marshmallow-cts-dev am: 6edf9b816c am: fde8fb82e9 am: 45bb4545fa am: 81283dd84a | |
| 81283dd Merge "TIF: Allow notifyVideoUnavailable in HardwareSessionTest" into marshmallow-cts-dev am: 6edf9b816c am: fde8fb82e9 am: 45bb4545fa | |
| fd159fd Merge "Assert android:usesCleartextTraffic attribute works as expected." into marshmallow-cts-dev am: ca613f6090 am: 329d4160fa am: 2d03a2bd78 am: 3eac531e49 | |
| ec8217a Merge "Only reach out to Internet when supported." into marshmallow-cts-dev am: a2b065a8c7 am: a20d0227b5 am: 9653e36e37 am: bb57f3f75f | |
| 45bb454 Merge "TIF: Allow notifyVideoUnavailable in HardwareSessionTest" into marshmallow-cts-dev am: 6edf9b816c am: fde8fb82e9 | |
| 3eac531 Merge "Assert android:usesCleartextTraffic attribute works as expected." into marshmallow-cts-dev am: ca613f6090 am: 329d4160fa am: 2d03a2bd78 | |
| fde8fb8 Merge "TIF: Allow notifyVideoUnavailable in HardwareSessionTest" into marshmallow-cts-dev am: 6edf9b816c | |
| bb57f3f Merge "Only reach out to Internet when supported." into marshmallow-cts-dev am: a2b065a8c7 am: a20d0227b5 am: 9653e36e37 | |
| 3b0bece Merge "Should use getSupportedVideoSizes()" into kitkat-cts-dev | |
| 2d03a2b Merge "Assert android:usesCleartextTraffic attribute works as expected." into marshmallow-cts-dev am: ca613f6090 am: 329d4160fa | |
| 9653e36 Merge "Only reach out to Internet when supported." into marshmallow-cts-dev am: a2b065a8c7 am: a20d0227b5 | |
| 3d84f71 Merge "Fix for LocationModeHighAccuracyTestActivity test." into kitkat-cts-dev | |
| 6edf9b8 Merge "TIF: Allow notifyVideoUnavailable in HardwareSessionTest" into marshmallow-cts-dev | |
| 329d416 Merge "Assert android:usesCleartextTraffic attribute works as expected." into marshmallow-cts-dev am: ca613f6090 | |
| a20d022 Merge "Only reach out to Internet when supported." into marshmallow-cts-dev am: a2b065a8c7 | |
| ca613f6 Merge "Assert android:usesCleartextTraffic attribute works as expected." into marshmallow-cts-dev | |
| a2b065a Merge "Only reach out to Internet when supported." into marshmallow-cts-dev | |
| 59d7064 Only reach out to Internet when supported. | |
| f69b744 Merge "Prevent the PopupWindow from overlapping with the status bar" into lollipop-cts-dev am: 504df1b972 am: 92342c0a59 am: 80d1ac4847 am: 001646a09c am: 8fcc556c3f am: dc8e6c904b | |
| dc8e6c9 Merge "Prevent the PopupWindow from overlapping with the status bar" into lollipop-cts-dev am: 504df1b972 am: 92342c0a59 am: 80d1ac4847 am: 001646a09c am: 8fcc556c3f | |
| 8fcc556 Merge "Prevent the PopupWindow from overlapping with the status bar" into lollipop-cts-dev am: 504df1b972 am: 92342c0a59 am: 80d1ac4847 am: 001646a09c | |
| 001646a Merge "Prevent the PopupWindow from overlapping with the status bar" into lollipop-cts-dev am: 504df1b972 am: 92342c0a59 am: 80d1ac4847 | |
| 80d1ac4 Merge "Prevent the PopupWindow from overlapping with the status bar" into lollipop-cts-dev am: 504df1b972 am: 92342c0a59 | |
| 92342c0 Merge "Prevent the PopupWindow from overlapping with the status bar" into lollipop-cts-dev am: 504df1b972 | |
| 504df1b Merge "Prevent the PopupWindow from overlapping with the status bar" into lollipop-cts-dev | |
| 1833b89 Merge "DO NOT MERGE CTS host-side preconditions for MNC" into marshmallow-cts-dev am: 9821330254 -s ours am: f69bedfac5 am: 5876800eb8 am: 1ed4bc25d4 | |
| 0bff412 Merge "Fix cts api coverage" into marshmallow-cts-dev am: cd8953768f am: c31025c370 am: f97cf1711e am: e83af6f2a7 | |
| 1ed4bc2 Merge "DO NOT MERGE CTS host-side preconditions for MNC" into marshmallow-cts-dev am: 9821330254 -s ours am: f69bedfac5 am: 5876800eb8 | |
| e83af6f Merge "Fix cts api coverage" into marshmallow-cts-dev am: cd8953768f am: c31025c370 am: f97cf1711e | |
| 5876800 Merge "DO NOT MERGE CTS host-side preconditions for MNC" into marshmallow-cts-dev am: 9821330254 -s ours am: f69bedfac5 | |
| f97cf17 Merge "Fix cts api coverage" into marshmallow-cts-dev am: cd8953768f am: c31025c370 | |
| f69bedf Merge "DO NOT MERGE CTS host-side preconditions for MNC" into marshmallow-cts-dev am: 9821330254 -s ours | |
| c31025c Merge "Fix cts api coverage" into marshmallow-cts-dev am: cd8953768f | |
| 9821330 Merge "DO NOT MERGE CTS host-side preconditions for MNC" into marshmallow-cts-dev | |
| cd89537 Merge "Fix cts api coverage" into marshmallow-cts-dev | |
| 346e80f Merge "Bug #1111 CTS-Verifier Crash when rotate the DUT." into marshmallow-cts-dev am: cb12c0bfcf am: 8f2e74fdb3 am: 7cf746b3c8 am: 6fe8ef189d | |
| 12b986f Fix cts api coverage | |
| 6fe8ef1 Merge "Bug #1111 CTS-Verifier Crash when rotate the DUT." into marshmallow-cts-dev am: cb12c0bfcf am: 8f2e74fdb3 am: 7cf746b3c8 | |
| 7cf746b Merge "Bug #1111 CTS-Verifier Crash when rotate the DUT." into marshmallow-cts-dev am: cb12c0bfcf am: 8f2e74fdb3 | |
| 8f2e74f Merge "Bug #1111 CTS-Verifier Crash when rotate the DUT." into marshmallow-cts-dev am: cb12c0bfcf | |
| cb12c0b Merge "Bug #1111 CTS-Verifier Crash when rotate the DUT." into marshmallow-cts-dev | |
| 0d6aa50 Additional CTS test for robust handling of invalid cmap | |
| 727fde6 Assert android:usesCleartextTraffic attribute works as expected. | |
| ef60be7 Prevent the PopupWindow from overlapping with the status bar | |
| a346277 Merge "Add the first window under the status bar in addTwoAppPanelWindows" into lollipop-cts-dev am: b7c656dfc8 am: 74feb0cea8 am: c5fb5b14ad am: dc6f64f985 am: 3ead36742b am: 2ef4ad3015 | |
| 2ef4ad3 Merge "Add the first window under the status bar in addTwoAppPanelWindows" into lollipop-cts-dev am: b7c656dfc8 am: 74feb0cea8 am: c5fb5b14ad am: dc6f64f985 am: 3ead36742b | |
| 3ead367 Merge "Add the first window under the status bar in addTwoAppPanelWindows" into lollipop-cts-dev am: b7c656dfc8 am: 74feb0cea8 am: c5fb5b14ad am: dc6f64f985 | |
| 9b9887d Merge "Modify the y-coordinate of touch events in testTouchEvent" into lollipop-cts-dev am: 3305a6503e am: f5fabf21b0 am: bc5a2d2a3b am: 42083ffdc4 am: 29ef12c984 am: 5b68f5fe7f | |
| dc6f64f Merge "Add the first window under the status bar in addTwoAppPanelWindows" into lollipop-cts-dev am: b7c656dfc8 am: 74feb0cea8 am: c5fb5b14ad | |
| 5b68f5f Merge "Modify the y-coordinate of touch events in testTouchEvent" into lollipop-cts-dev am: 3305a6503e am: f5fabf21b0 am: bc5a2d2a3b am: 42083ffdc4 am: 29ef12c984 | |
| c5fb5b1 Merge "Add the first window under the status bar in addTwoAppPanelWindows" into lollipop-cts-dev am: b7c656dfc8 am: 74feb0cea8 | |
| 29ef12c Merge "Modify the y-coordinate of touch events in testTouchEvent" into lollipop-cts-dev am: 3305a6503e am: f5fabf21b0 am: bc5a2d2a3b am: 42083ffdc4 | |
| 74feb0c Merge "Add the first window under the status bar in addTwoAppPanelWindows" into lollipop-cts-dev am: b7c656dfc8 | |
| 42083ff Merge "Modify the y-coordinate of touch events in testTouchEvent" into lollipop-cts-dev am: 3305a6503e am: f5fabf21b0 am: bc5a2d2a3b | |
| b7c656d Merge "Add the first window under the status bar in addTwoAppPanelWindows" into lollipop-cts-dev | |
| bc5a2d2 Merge "Modify the y-coordinate of touch events in testTouchEvent" into lollipop-cts-dev am: 3305a6503e am: f5fabf21b0 | |
| f5fabf2 Merge "Modify the y-coordinate of touch events in testTouchEvent" into lollipop-cts-dev am: 3305a6503e | |
| 3305a65 Merge "Modify the y-coordinate of touch events in testTouchEvent" into lollipop-cts-dev | |
| 57dc6f6 Merge "Scroll through the spinner of the printer selection" into lollipop-cts-dev am: 72880aa582 am: 303a2d0f58 am: 9d9ef2a3d6 am: b156e1bc20 am: c9646057a7 am: bced545106 | |
| bced545 Merge "Scroll through the spinner of the printer selection" into lollipop-cts-dev am: 72880aa582 am: 303a2d0f58 am: 9d9ef2a3d6 am: b156e1bc20 am: c9646057a7 | |
| c964605 Merge "Scroll through the spinner of the printer selection" into lollipop-cts-dev am: 72880aa582 am: 303a2d0f58 am: 9d9ef2a3d6 am: b156e1bc20 | |
| b156e1b Merge "Scroll through the spinner of the printer selection" into lollipop-cts-dev am: 72880aa582 am: 303a2d0f58 am: 9d9ef2a3d6 | |
| 9d9ef2a Merge "Scroll through the spinner of the printer selection" into lollipop-cts-dev am: 72880aa582 am: 303a2d0f58 | |
| 303a2d0 Merge "Scroll through the spinner of the printer selection" into lollipop-cts-dev am: 72880aa582 | |
| 72880aa Merge "Scroll through the spinner of the printer selection" into lollipop-cts-dev | |
| e27ff96 DO NOT MERGE CTS host-side preconditions for MNC | |
| 10c6429 Merge "DO NOT MERGE relax the iframe interval to 60" into lollipop-cts-dev am: 52479c35cd -s ours am: e5231e37f1 -s ours am: ed0f708e7f -s ours am: 13a689ad82 am: 68056c9deb am: 5e18a13757 | |
| 5e18a13 Merge "DO NOT MERGE relax the iframe interval to 60" into lollipop-cts-dev am: 52479c35cd -s ours am: e5231e37f1 -s ours am: ed0f708e7f -s ours am: 13a689ad82 am: 68056c9deb | |
| 7fdb2de Merge "DO NOT MERGE relax the iframe interval to 60" into lollipop-mr1-cts-dev am: 0d86ad1249 -s ours am: 8b89630d89 -s ours am: c8683cbb45 am: c5c1405d50 am: 0c04027983 | |
| 0c04027 Merge "DO NOT MERGE relax the iframe interval to 60" into lollipop-mr1-cts-dev am: 0d86ad1249 -s ours am: 8b89630d89 -s ours am: c8683cbb45 am: c5c1405d50 | |
| 68056c9 Merge "DO NOT MERGE relax the iframe interval to 60" into lollipop-cts-dev am: 52479c35cd -s ours am: e5231e37f1 -s ours am: ed0f708e7f -s ours am: 13a689ad82 | |
| 13a689a Merge "DO NOT MERGE relax the iframe interval to 60" into lollipop-cts-dev am: 52479c35cd -s ours am: e5231e37f1 -s ours am: ed0f708e7f -s ours | |
| c5c1405 Merge "DO NOT MERGE relax the iframe interval to 60" into lollipop-mr1-cts-dev am: 0d86ad1249 -s ours am: 8b89630d89 -s ours am: c8683cbb45 | |
| ed0f708 Merge "DO NOT MERGE relax the iframe interval to 60" into lollipop-cts-dev am: 52479c35cd -s ours am: e5231e37f1 -s ours | |
| c8683cb Merge "DO NOT MERGE relax the iframe interval to 60" into lollipop-mr1-cts-dev am: 0d86ad1249 -s ours am: 8b89630d89 -s ours | |
| e5231e3 Merge "DO NOT MERGE relax the iframe interval to 60" into lollipop-cts-dev am: 52479c35cd -s ours | |
| 8b89630 Merge "DO NOT MERGE relax the iframe interval to 60" into lollipop-mr1-cts-dev am: 0d86ad1249 -s ours | |
| 52479c3 Merge "DO NOT MERGE relax the iframe interval to 60" into lollipop-cts-dev | |
| 0d86ad1 Merge "DO NOT MERGE relax the iframe interval to 60" into lollipop-mr1-cts-dev | |
| a895918 DO NOT MERGE relax the iframe interval to 60 | |
| 349727d DO NOT MERGE relax the iframe interval to 60 | |
| 3520a1d Fixs bugs regarding CTS fails for low performance codec | |
| 12e4243 Merge "Include all CTS apks and jars in the coverage report" into marshmallow-cts-dev am: e336af52ae am: 5f165f0f14 am: cd9978ea0a am: dd9b116666 | |
| dd9b116 Merge "Include all CTS apks and jars in the coverage report" into marshmallow-cts-dev am: e336af52ae am: 5f165f0f14 am: cd9978ea0a | |
| cd9978e Merge "Include all CTS apks and jars in the coverage report" into marshmallow-cts-dev am: e336af52ae am: 5f165f0f14 | |
| 5f165f0 Merge "Include all CTS apks and jars in the coverage report" into marshmallow-cts-dev am: e336af52ae | |
| e336af5 Merge "Include all CTS apks and jars in the coverage report" into marshmallow-cts-dev | |
| 8126140 Bug #1111 CTS-Verifier Crash when rotate the DUT. | |
| eeb749c Include all CTS apks and jars in the coverage report | |
| 0e95ddc Merge "Revert "Include apks and jars in cts coverage"" into kitkat-cts-dev am: 130bc52f8d am: ed72577282 am: 0dfc895b7d am: b3aba78014 am: d45ba19bf4 am: 9aff5fdcf3 am: 437754b7e5 | |
| 437754b Merge "Revert "Include apks and jars in cts coverage"" into kitkat-cts-dev am: 130bc52f8d am: ed72577282 am: 0dfc895b7d am: b3aba78014 am: d45ba19bf4 am: 9aff5fdcf3 | |
| 9aff5fd Merge "Revert "Include apks and jars in cts coverage"" into kitkat-cts-dev am: 130bc52f8d am: ed72577282 am: 0dfc895b7d am: b3aba78014 am: d45ba19bf4 | |
| d45ba19 Merge "Revert "Include apks and jars in cts coverage"" into kitkat-cts-dev am: 130bc52f8d am: ed72577282 am: 0dfc895b7d am: b3aba78014 | |
| b3aba78 Merge "Revert "Include apks and jars in cts coverage"" into kitkat-cts-dev am: 130bc52f8d am: ed72577282 am: 0dfc895b7d | |
| 0dfc895 Merge "Revert "Include apks and jars in cts coverage"" into kitkat-cts-dev am: 130bc52f8d am: ed72577282 | |
| ed72577 Merge "Revert "Include apks and jars in cts coverage"" into kitkat-cts-dev am: 130bc52f8d | |
| 130bc52 Merge "Revert "Include apks and jars in cts coverage"" into kitkat-cts-dev | |
| f7e8eae Revert "Include apks and jars in cts coverage" | |
| eeaf179 Merge "Include apks and jars in cts coverage" into kitkat-cts-dev am: 371814abb1 am: 3d00c72c6a am: e1665b2848 am: 2ab55e20bb am: 2db7e28346 am: 23d0ae3d43 am: 2bf62329c2 | |
| 2bf6232 Merge "Include apks and jars in cts coverage" into kitkat-cts-dev am: 371814abb1 am: 3d00c72c6a am: e1665b2848 am: 2ab55e20bb am: 2db7e28346 am: 23d0ae3d43 | |
| 23d0ae3 Merge "Include apks and jars in cts coverage" into kitkat-cts-dev am: 371814abb1 am: 3d00c72c6a am: e1665b2848 am: 2ab55e20bb am: 2db7e28346 | |
| 2db7e28 Merge "Include apks and jars in cts coverage" into kitkat-cts-dev am: 371814abb1 am: 3d00c72c6a am: e1665b2848 am: 2ab55e20bb | |
| 2ab55e2 Merge "Include apks and jars in cts coverage" into kitkat-cts-dev am: 371814abb1 am: 3d00c72c6a am: e1665b2848 | |
| e1665b2 Merge "Include apks and jars in cts coverage" into kitkat-cts-dev am: 371814abb1 am: 3d00c72c6a | |
| 3d00c72 Merge "Include apks and jars in cts coverage" into kitkat-cts-dev am: 371814abb1 | |
| 371814a Merge "Include apks and jars in cts coverage" into kitkat-cts-dev | |
| a8ca2ee Include apks and jars in cts coverage | |
| fe9f8f0 Merge "Output XML CTS Coverage report" into kitkat-cts-dev am: f2ce5cef21 am: 301c38ce5d am: eb9de0da37 am: 83e8bb882f am: 6ae1feff50 am: 154f7beab9 am: 4c82cddab2 | |
| 4c82cdd Merge "Output XML CTS Coverage report" into kitkat-cts-dev am: f2ce5cef21 am: 301c38ce5d am: eb9de0da37 am: 83e8bb882f am: 6ae1feff50 am: 154f7beab9 | |
| 154f7be Merge "Output XML CTS Coverage report" into kitkat-cts-dev am: f2ce5cef21 am: 301c38ce5d am: eb9de0da37 am: 83e8bb882f am: 6ae1feff50 | |
| 6ae1fef Merge "Output XML CTS Coverage report" into kitkat-cts-dev am: f2ce5cef21 am: 301c38ce5d am: eb9de0da37 am: 83e8bb882f | |
| 83e8bb8 Merge "Output XML CTS Coverage report" into kitkat-cts-dev am: f2ce5cef21 am: 301c38ce5d am: eb9de0da37 | |
| eb9de0d Merge "Output XML CTS Coverage report" into kitkat-cts-dev am: f2ce5cef21 am: 301c38ce5d | |
| 301c38c Merge "Output XML CTS Coverage report" into kitkat-cts-dev am: f2ce5cef21 | |
| f2ce5ce Merge "Output XML CTS Coverage report" into kitkat-cts-dev | |
| 5f604ce fixed merge issue. am: 104a7ff357 am: 73bc87c12a am: 7bab9630eb am: e57b049cc4 am: 0b6612621e am: f72d944820 am: ad13f29128 am: 5ec5de4f1a | |
| 5ec5de4 fixed merge issue. am: 104a7ff357 am: 73bc87c12a am: 7bab9630eb am: e57b049cc4 am: 0b6612621e am: f72d944820 am: ad13f29128 | |
| c8fc8f9 Merge commit \'8a532e5acb02d80e088a7e9407b61df351fd9b90\' into manual_merge_8a532e5acb am: 9193a0e334 am: 69f0f1ed43 am: 3e2b570214 am: a300215590 am: 5b6904464d am: 24f0de2221 am: b0f1e0f9f2 am: e05d875d4d | |
| ad13f29 fixed merge issue. am: 104a7ff357 am: 73bc87c12a am: 7bab9630eb am: e57b049cc4 am: 0b6612621e am: f72d944820 | |
| e05d875 Merge commit \'8a532e5acb02d80e088a7e9407b61df351fd9b90\' into manual_merge_8a532e5acb am: 9193a0e334 am: 69f0f1ed43 am: 3e2b570214 am: a300215590 am: 5b6904464d am: 24f0de2221 am: b0f1e0f9f2 | |
| f72d944 fixed merge issue. am: 104a7ff357 am: 73bc87c12a am: 7bab9630eb am: e57b049cc4 am: 0b6612621e | |
| b0f1e0f Merge commit \'8a532e5acb02d80e088a7e9407b61df351fd9b90\' into manual_merge_8a532e5acb am: 9193a0e334 am: 69f0f1ed43 am: 3e2b570214 am: a300215590 am: 5b6904464d am: 24f0de2221 | |
| 0b66126 fixed merge issue. am: 104a7ff357 am: 73bc87c12a am: 7bab9630eb am: e57b049cc4 | |
| 24f0de2 Merge commit \'8a532e5acb02d80e088a7e9407b61df351fd9b90\' into manual_merge_8a532e5acb am: 9193a0e334 am: 69f0f1ed43 am: 3e2b570214 am: a300215590 am: 5b6904464d | |
| e57b049 fixed merge issue. am: 104a7ff357 am: 73bc87c12a am: 7bab9630eb | |
| 5b69044 Merge commit \'8a532e5acb02d80e088a7e9407b61df351fd9b90\' into manual_merge_8a532e5acb am: 9193a0e334 am: 69f0f1ed43 am: 3e2b570214 am: a300215590 | |
| 7bab963 fixed merge issue. am: 104a7ff357 am: 73bc87c12a | |
| a300215 Merge commit \'8a532e5acb02d80e088a7e9407b61df351fd9b90\' into manual_merge_8a532e5acb am: 9193a0e334 am: 69f0f1ed43 am: 3e2b570214 | |
| 73bc87c fixed merge issue. am: 104a7ff357 | |
| 3e2b570 Merge commit \'8a532e5acb02d80e088a7e9407b61df351fd9b90\' into manual_merge_8a532e5acb am: 9193a0e334 am: 69f0f1ed43 | |
| 69f0f1e Merge commit \'8a532e5acb02d80e088a7e9407b61df351fd9b90\' into manual_merge_8a532e5acb am: 9193a0e334 | |
| 104a7ff fixed merge issue. | |
| 9193a0e Merge commit '8a532e5acb02d80e088a7e9407b61df351fd9b90' into manual_merge_8a532e5acb | |
| 8a532e5 Merge commit '0249f844e6a757df14b796a0b8a07ca78275948f' into manual_merge_0249f844e6 | |
| 0249f84 Creating the Security Test Plan am: ca350cb853 | |
| ca350cb Creating the Security Test Plan | |
| 4fe8440 Merge "CTS fix: add missing feature flags for API 23" into marshmallow-cts-dev am: ac001d0c41 am: 987ca530bc am: fe8ba9ac6f am: 8b90be4c62 | |
| 8b90be4 Merge "CTS fix: add missing feature flags for API 23" into marshmallow-cts-dev am: ac001d0c41 am: 987ca530bc am: fe8ba9ac6f | |
| fe8ba9a Merge "CTS fix: add missing feature flags for API 23" into marshmallow-cts-dev am: ac001d0c41 am: 987ca530bc | |
| 987ca53 Merge "CTS fix: add missing feature flags for API 23" into marshmallow-cts-dev am: ac001d0c41 | |
| ac001d0 Merge "CTS fix: add missing feature flags for API 23" into marshmallow-cts-dev | |
| c40732a Merge "Explicitly fail when test file is missing" into kitkat-cts-dev am: c16024705d am: 358e7ec740 am: 653ed78f6f am: 45bfa323b2 am: 8b422160ed am: 71e3596130 am: 97133778bf | |
| 9713377 Merge "Explicitly fail when test file is missing" into kitkat-cts-dev am: c16024705d am: 358e7ec740 am: 653ed78f6f am: 45bfa323b2 am: 8b422160ed am: 71e3596130 | |
| 71e3596 Merge "Explicitly fail when test file is missing" into kitkat-cts-dev am: c16024705d am: 358e7ec740 am: 653ed78f6f am: 45bfa323b2 am: 8b422160ed | |
| 8b42216 Merge "Explicitly fail when test file is missing" into kitkat-cts-dev am: c16024705d am: 358e7ec740 am: 653ed78f6f am: 45bfa323b2 | |
| 45bfa32 Merge "Explicitly fail when test file is missing" into kitkat-cts-dev am: c16024705d am: 358e7ec740 am: 653ed78f6f | |
| 653ed78 Merge "Explicitly fail when test file is missing" into kitkat-cts-dev am: c16024705d am: 358e7ec740 | |
| 358e7ec Merge "Explicitly fail when test file is missing" into kitkat-cts-dev am: c16024705d | |
| 0130e90 Output XML CTS Coverage report | |
| dcef84f Merge "resolve merge conflicts of 715ecdadb1 to lollipop-cts-dev." into lollipop-cts-dev am: c6ffd4b897 am: 9f19e07a44 am: 8a775a6080 am: 0dcb774cd2 am: a39240cf8f am: 91025eb383 | |
| 0c418cc Merge "Increased CTS test timeout from 5 sec to 30 sec in ModifyInstallerPackageTest.java" into lollipop-mr1-cts-dev am: 7257c6e1f4 -s ours am: 9f2a6e139f am: 97f3c8cdfe am: 84205c5eb4 am: 0b61b230a8 | |
| 91025eb Merge "resolve merge conflicts of 715ecdadb1 to lollipop-cts-dev." into lollipop-cts-dev am: c6ffd4b897 am: 9f19e07a44 am: 8a775a6080 am: 0dcb774cd2 am: a39240cf8f | |
| db03a9d Merge "Dismiss dialogs during indeterminate progress dialog CTS tests" into lollipop-mr1-cts-dev am: a6b87b80a3 -s ours am: 675403a8a7 am: b9a424bdc8 am: dfb51a2078 am: 0d905c8321 | |
| 0b61b23 Merge "Increased CTS test timeout from 5 sec to 30 sec in ModifyInstallerPackageTest.java" into lollipop-mr1-cts-dev am: 7257c6e1f4 -s ours am: 9f2a6e139f am: 97f3c8cdfe am: 84205c5eb4 | |
| a39240c Merge "resolve merge conflicts of 715ecdadb1 to lollipop-cts-dev." into lollipop-cts-dev am: c6ffd4b897 am: 9f19e07a44 am: 8a775a6080 am: 0dcb774cd2 | |
| 0d905c8 Merge "Dismiss dialogs during indeterminate progress dialog CTS tests" into lollipop-mr1-cts-dev am: a6b87b80a3 -s ours am: 675403a8a7 am: b9a424bdc8 am: dfb51a2078 | |
| 84205c5 Merge "Increased CTS test timeout from 5 sec to 30 sec in ModifyInstallerPackageTest.java" into lollipop-mr1-cts-dev am: 7257c6e1f4 -s ours am: 9f2a6e139f am: 97f3c8cdfe | |
| 0dcb774 Merge "resolve merge conflicts of 715ecdadb1 to lollipop-cts-dev." into lollipop-cts-dev am: c6ffd4b897 am: 9f19e07a44 am: 8a775a6080 | |
| dfb51a2 Merge "Dismiss dialogs during indeterminate progress dialog CTS tests" into lollipop-mr1-cts-dev am: a6b87b80a3 -s ours am: 675403a8a7 am: b9a424bdc8 | |
| 97f3c8c Merge "Increased CTS test timeout from 5 sec to 30 sec in ModifyInstallerPackageTest.java" into lollipop-mr1-cts-dev am: 7257c6e1f4 -s ours am: 9f2a6e139f | |
| 8a775a6 Merge "resolve merge conflicts of 715ecdadb1 to lollipop-cts-dev." into lollipop-cts-dev am: c6ffd4b897 am: 9f19e07a44 | |
| 9f2a6e1 Merge "Increased CTS test timeout from 5 sec to 30 sec in ModifyInstallerPackageTest.java" into lollipop-mr1-cts-dev am: 7257c6e1f4 -s ours | |
| b9a424b Merge "Dismiss dialogs during indeterminate progress dialog CTS tests" into lollipop-mr1-cts-dev am: a6b87b80a3 -s ours am: 675403a8a7 | |
| 675403a Merge "Dismiss dialogs during indeterminate progress dialog CTS tests" into lollipop-mr1-cts-dev am: a6b87b80a3 -s ours | |
| 9f19e07 Merge "resolve merge conflicts of 715ecdadb1 to lollipop-cts-dev." into lollipop-cts-dev am: c6ffd4b897 | |
| c6ffd4b Merge "resolve merge conflicts of 715ecdadb1 to lollipop-cts-dev." into lollipop-cts-dev | |
| 1517d2b resolve merge conflicts of 715ecdadb1 to lollipop-cts-dev. | |
| 557f84a CTS: check non-zygote apps are not debuggable DO NOT MERGE | |
| 55340f8 Add test for Keystore put overflow | |
| 96aef71 Merge "TIF: Allow notifyVideoUnavailable in HardwareSessionTest" into lollipop-mr1-cts-dev am: 1f83e1d595 am: dab799f06a am: e26b808c20 am: e533a05c80 am: bd25f2881e | |
| 4e2702f Merge "Fix testWifiConfigLockdown failure due to wifi not being ready" into marshmallow-cts-dev am: c3e2864349 am: 49230ecdc0 am: 47e360cfea am: 4beef4455f | |
| 211b17d Merge "Change minDuration check in Camera2SurfaceView" into marshmallow-cts-dev am: 6977e427d2 am: 6fa754c1a3 am: 99462d76fb am: 6b4edab9f6 | |
| 631c665 Merge "Fix testExecuteShellCommand test in android.aadb" into marshmallow-cts-dev am: 782c7bd833 am: e64e871046 am: 7cc6683fe0 am: 3c9dc0a6f8 | |
| bd25f28 Merge "TIF: Allow notifyVideoUnavailable in HardwareSessionTest" into lollipop-mr1-cts-dev am: 1f83e1d595 am: dab799f06a am: e26b808c20 am: e533a05c80 | |
| b9199eb Merge "Disable WiredHeadset tests" into marshmallow-cts-dev am: 4c211f2bdf am: 3a7dd4ef06 am: 018e6bf66e am: 4606f69119 | |
| 4b2266a Merge "Add CTS test for DISALLOW_MODIFY_ACCOUNTS" into marshmallow-cts-dev am: 3baf8d9c9b am: 555e242bae am: 1cadf048dc am: 5728f01dc5 | |
| 4beef44 Merge "Fix testWifiConfigLockdown failure due to wifi not being ready" into marshmallow-cts-dev am: c3e2864349 am: 49230ecdc0 am: 47e360cfea | |
| 6b4edab Merge "Change minDuration check in Camera2SurfaceView" into marshmallow-cts-dev am: 6977e427d2 am: 6fa754c1a3 am: 99462d76fb | |
| 3c9dc0a Merge "Fix testExecuteShellCommand test in android.aadb" into marshmallow-cts-dev am: 782c7bd833 am: e64e871046 am: 7cc6683fe0 | |
| 4606f69 Merge "Disable WiredHeadset tests" into marshmallow-cts-dev am: 4c211f2bdf am: 3a7dd4ef06 am: 018e6bf66e | |
| e533a05 Merge "TIF: Allow notifyVideoUnavailable in HardwareSessionTest" into lollipop-mr1-cts-dev am: 1f83e1d595 am: dab799f06a am: e26b808c20 | |
| 5728f01 Merge "Add CTS test for DISALLOW_MODIFY_ACCOUNTS" into marshmallow-cts-dev am: 3baf8d9c9b am: 555e242bae am: 1cadf048dc | |
| 47e360c Merge "Fix testWifiConfigLockdown failure due to wifi not being ready" into marshmallow-cts-dev am: c3e2864349 am: 49230ecdc0 | |
| 99462d7 Merge "Change minDuration check in Camera2SurfaceView" into marshmallow-cts-dev am: 6977e427d2 am: 6fa754c1a3 | |
| 7cc6683 Merge "Fix testExecuteShellCommand test in android.aadb" into marshmallow-cts-dev am: 782c7bd833 am: e64e871046 | |
| 018e6bf Merge "Disable WiredHeadset tests" into marshmallow-cts-dev am: 4c211f2bdf am: 3a7dd4ef06 | |
| e26b808 Merge "TIF: Allow notifyVideoUnavailable in HardwareSessionTest" into lollipop-mr1-cts-dev am: 1f83e1d595 am: dab799f06a | |
| 1cadf04 Merge "Add CTS test for DISALLOW_MODIFY_ACCOUNTS" into marshmallow-cts-dev am: 3baf8d9c9b am: 555e242bae | |
| 49230ec Merge "Fix testWifiConfigLockdown failure due to wifi not being ready" into marshmallow-cts-dev am: c3e2864349 | |
| 6fa754c Merge "Change minDuration check in Camera2SurfaceView" into marshmallow-cts-dev am: 6977e427d2 | |
| dab799f Merge "TIF: Allow notifyVideoUnavailable in HardwareSessionTest" into lollipop-mr1-cts-dev am: 1f83e1d595 | |
| e64e871 Merge "Fix testExecuteShellCommand test in android.aadb" into marshmallow-cts-dev am: 782c7bd833 | |
| 3a7dd4e Merge "Disable WiredHeadset tests" into marshmallow-cts-dev am: 4c211f2bdf | |
| 555e242 Merge "Add CTS test for DISALLOW_MODIFY_ACCOUNTS" into marshmallow-cts-dev am: 3baf8d9c9b | |
| 7257c6e Merge "Increased CTS test timeout from 5 sec to 30 sec in ModifyInstallerPackageTest.java" into lollipop-mr1-cts-dev | |
| a6b87b8 Merge "Dismiss dialogs during indeterminate progress dialog CTS tests" into lollipop-mr1-cts-dev | |
| c160247 Merge "Explicitly fail when test file is missing" into kitkat-cts-dev | |
| 715ecda Merge "collect memory properties in CTS" into kitkat-cts-dev | |
| 1f83e1d Merge "TIF: Allow notifyVideoUnavailable in HardwareSessionTest" into lollipop-mr1-cts-dev | |
| c3e2864 Merge "Fix testWifiConfigLockdown failure due to wifi not being ready" into marshmallow-cts-dev | |
| 6977e42 Merge "Change minDuration check in Camera2SurfaceView" into marshmallow-cts-dev | |
| 782c7bd Merge "Fix testExecuteShellCommand test in android.aadb" into marshmallow-cts-dev | |
| 4c211f2 Merge "Disable WiredHeadset tests" into marshmallow-cts-dev | |
| 3baf8d9 Merge "Add CTS test for DISALLOW_MODIFY_ACCOUNTS" into marshmallow-cts-dev | |
| 7e7c5dc Add CTS test for DISALLOW_MODIFY_ACCOUNTS | |
| cf42918 Merge "Move long string test from TextView to StaticLayoutTest" into marshmallow-cts-dev am: 1f7351fd7f am: 16b1e7a67f am: 7b1dcd303e am: 5016c0e43c | |
| 5016c0e Merge "Move long string test from TextView to StaticLayoutTest" into marshmallow-cts-dev am: 1f7351fd7f am: 16b1e7a67f am: 7b1dcd303e | |
| 7b1dcd3 Merge "Move long string test from TextView to StaticLayoutTest" into marshmallow-cts-dev am: 1f7351fd7f am: 16b1e7a67f | |
| 16b1e7a Merge "Move long string test from TextView to StaticLayoutTest" into marshmallow-cts-dev am: 1f7351fd7f | |
| 1f7351f Merge "Move long string test from TextView to StaticLayoutTest" into marshmallow-cts-dev | |
| 029b66c Merge "Modify strings" into marshmallow-cts-dev am: c0dd3fdeb9 am: 46085ea178 am: 38675d307c am: 619449efb4 | |
| c24b308 Merge "resolve merge conflicts of 35f718e59a to marshmallow-cts-dev." into marshmallow-cts-dev am: 22eee9fde4 -s ours am: fdf6af8070 am: c38a753dd1 am: c33ede3a88 | |
| 619449e Merge "Modify strings" into marshmallow-cts-dev am: c0dd3fdeb9 am: 46085ea178 am: 38675d307c | |
| c33ede3 Merge "resolve merge conflicts of 35f718e59a to marshmallow-cts-dev." into marshmallow-cts-dev am: 22eee9fde4 -s ours am: fdf6af8070 am: c38a753dd1 | |
| 38675d3 Merge "Modify strings" into marshmallow-cts-dev am: c0dd3fdeb9 am: 46085ea178 | |
| c38a753 Merge "resolve merge conflicts of 35f718e59a to marshmallow-cts-dev." into marshmallow-cts-dev am: 22eee9fde4 -s ours am: fdf6af8070 | |
| 46085ea Merge "Modify strings" into marshmallow-cts-dev am: c0dd3fdeb9 | |
| fdf6af8 Merge "resolve merge conflicts of 35f718e59a to marshmallow-cts-dev." into marshmallow-cts-dev am: 22eee9fde4 -s ours | |
| c0dd3fd Merge "Modify strings" into marshmallow-cts-dev | |
| 22eee9f Merge "resolve merge conflicts of 35f718e59a to marshmallow-cts-dev." into marshmallow-cts-dev | |
| 18011ab resolve merge conflicts of 35f718e59a to marshmallow-cts-dev. | |
| 35f718e Merge "CameraITS: check props before applying linear tonemap" into lollipop-mr1-cts-dev | |
| 39ebb4b CameraITS: check props before applying linear tonemap | |
| 3298048 Merge "Cts test fix for shortcode 48000" into marshmallow-cts-dev am: 2ec00566d2 am: 0bfebb1764 am: d4787bde46 am: 0212781f89 | |
| 0212781 Merge "Cts test fix for shortcode 48000" into marshmallow-cts-dev am: 2ec00566d2 am: 0bfebb1764 am: d4787bde46 | |
| d4787bd Merge "Cts test fix for shortcode 48000" into marshmallow-cts-dev am: 2ec00566d2 am: 0bfebb1764 | |
| 0bfebb1 Merge "Cts test fix for shortcode 48000" into marshmallow-cts-dev am: 2ec00566d2 | |
| 2ec0056 Merge "Cts test fix for shortcode 48000" into marshmallow-cts-dev | |
| ac10f21 Cts test fix for shortcode 48000 | |
| a4fab38 Merge "Fix EDI capturing for platform specific values" into marshmallow-cts-dev am: 702489c038 am: 295538e19a am: fbfaf5558b am: b834dc0e35 | |
| bb16331 Disable WiredHeadset tests | |
| b834dc0 Merge "Fix EDI capturing for platform specific values" into marshmallow-cts-dev am: 702489c038 am: 295538e19a am: fbfaf5558b | |
| fbfaf55 Merge "Fix EDI capturing for platform specific values" into marshmallow-cts-dev am: 702489c038 am: 295538e19a | |
| 295538e Merge "Fix EDI capturing for platform specific values" into marshmallow-cts-dev am: 702489c038 | |
| 702489c Merge "Fix EDI capturing for platform specific values" into marshmallow-cts-dev | |
| ff1c623 Fix EDI capturing for platform specific values | |
| 5bea9ee Modify strings | |
| 7180021 Increase delta tolerance in TypefaceTest#testInvalidCmapFont am: 6e53153204 am: e2f1e0f260 am: ac62fbeaab am: 0b3d9e9145 am: ec1ed44c1c am: 7ca3372e23 am: 343e1185c4 am: 1ea3348719 | |
| 1ea3348 Increase delta tolerance in TypefaceTest#testInvalidCmapFont am: 6e53153204 am: e2f1e0f260 am: ac62fbeaab am: 0b3d9e9145 am: ec1ed44c1c am: 7ca3372e23 am: 343e1185c4 | |
| 343e118 Increase delta tolerance in TypefaceTest#testInvalidCmapFont am: 6e53153204 am: e2f1e0f260 am: ac62fbeaab am: 0b3d9e9145 am: ec1ed44c1c am: 7ca3372e23 | |
| 7ca3372 Increase delta tolerance in TypefaceTest#testInvalidCmapFont am: 6e53153204 am: e2f1e0f260 am: ac62fbeaab am: 0b3d9e9145 am: ec1ed44c1c | |
| ec1ed44 Increase delta tolerance in TypefaceTest#testInvalidCmapFont am: 6e53153204 am: e2f1e0f260 am: ac62fbeaab am: 0b3d9e9145 | |
| 0b3d9e9 Increase delta tolerance in TypefaceTest#testInvalidCmapFont am: 6e53153204 am: e2f1e0f260 am: ac62fbeaab | |
| ac62fbe Increase delta tolerance in TypefaceTest#testInvalidCmapFont am: 6e53153204 am: e2f1e0f260 | |
| e2f1e0f Increase delta tolerance in TypefaceTest#testInvalidCmapFont am: 6e53153204 | |
| 61ac3c6 Merge "Fix SensorBatchingFifoTest EOB bug" into marshmallow-cts-dev am: 11078b5bc1 am: d8ca27b727 am: 89085db2be am: 1f14474608 | |
| 1f14474 Merge "Fix SensorBatchingFifoTest EOB bug" into marshmallow-cts-dev am: 11078b5bc1 am: d8ca27b727 am: 89085db2be | |
| 89085db Merge "Fix SensorBatchingFifoTest EOB bug" into marshmallow-cts-dev am: 11078b5bc1 am: d8ca27b727 | |
| d8ca27b Merge "Fix SensorBatchingFifoTest EOB bug" into marshmallow-cts-dev am: 11078b5bc1 | |
| 12b4680 Move long string test from TextView to StaticLayoutTest | |
| 11078b5 Merge "Fix SensorBatchingFifoTest EOB bug" into marshmallow-cts-dev | |
| fd9106a Merge "Add a test for IPv6 connectivity when the screen is off" into marshmallow-cts-dev am: 57698669d9 am: aad9826bb7 am: 6e54ecd7bb am: e6a242c55b | |
| 6e53153 Increase delta tolerance in TypefaceTest#testInvalidCmapFont | |
| e6a242c Merge "Add a test for IPv6 connectivity when the screen is off" into marshmallow-cts-dev am: 57698669d9 am: aad9826bb7 am: 6e54ecd7bb | |
| 6e54ecd Merge "Add a test for IPv6 connectivity when the screen is off" into marshmallow-cts-dev am: 57698669d9 am: aad9826bb7 | |
| aad9826 Merge "Add a test for IPv6 connectivity when the screen is off" into marshmallow-cts-dev am: 57698669d9 | |
| 5769866 Merge "Add a test for IPv6 connectivity when the screen is off" into marshmallow-cts-dev | |
| 38b4762 Change minDuration check in Camera2SurfaceView | |
| 719ac76 DO NOT MERGE ANYWHERE: bumping CTS to 5.1 r5 for security release am: d9865bb49f -s ours am: 78527db428 -s ours am: 4fd4fe9620 -s ours am: 22ccde091e -s ours am: 91c6605caf -s ours am: 8fda49d408 -s ours | |
| 8fda49d DO NOT MERGE ANYWHERE: bumping CTS to 5.1 r5 for security release am: d9865bb49f -s ours am: 78527db428 -s ours am: 4fd4fe9620 -s ours am: 22ccde091e -s ours am: 91c6605caf -s ours | |
| 91c6605 DO NOT MERGE ANYWHERE: bumping CTS to 5.1 r5 for security release am: d9865bb49f -s ours am: 78527db428 -s ours am: 4fd4fe9620 -s ours am: 22ccde091e -s ours | |
| 22ccde0 DO NOT MERGE ANYWHERE: bumping CTS to 5.1 r5 for security release am: d9865bb49f -s ours am: 78527db428 -s ours am: 4fd4fe9620 -s ours | |
| 4fd4fe9 DO NOT MERGE ANYWHERE: bumping CTS to 5.1 r5 for security release am: d9865bb49f -s ours am: 78527db428 -s ours | |
| 6fbf791 Fix testExecuteShellCommand test in android.aadb | |
| 78527db DO NOT MERGE ANYWHERE: bumping CTS to 5.1 r5 for security release am: d9865bb49f -s ours | |
| d9865bb DO NOT MERGE ANYWHERE: bumping CTS to 5.1 r5 for security release | |
| a1d1149 Make PassFailButtons inheritable. am: bb3c86703b | |
| 86c64ea Modify the y-coordinate of touch events in testTouchEvent | |
| bb3c867 Make PassFailButtons inheritable. | |
| 434318f Merge "Let Cts Verifier get authority string at run time." into cw-e-dev am: 2d20f03d61 | |
| 2d20f03 Merge "Let Cts Verifier get authority string at run time." into cw-e-dev | |
| 57668a8 Let Cts Verifier get authority string at run time. | |
| 4afd422 Merge "RECORD_SOUND must be handled by sound recorder app" into marshmallow-cts-dev am: 6ad6500daf am: 66a26ec144 am: e75a70d68b am: bcf2cfeee1 | |
| bcf2cfe Merge "RECORD_SOUND must be handled by sound recorder app" into marshmallow-cts-dev am: 6ad6500daf am: 66a26ec144 am: e75a70d68b | |
| e75a70d Merge "RECORD_SOUND must be handled by sound recorder app" into marshmallow-cts-dev am: 6ad6500daf am: 66a26ec144 | |
| 66a26ec Merge "RECORD_SOUND must be handled by sound recorder app" into marshmallow-cts-dev am: 6ad6500daf | |
| 6ad6500 Merge "RECORD_SOUND must be handled by sound recorder app" into marshmallow-cts-dev | |
| 4018b0b Add a test for IPv6 connectivity when the screen is off | |
| fcbf86f Scroll through the spinner of the printer selection | |
| 1cc42ff Add the first window under the status bar in addTwoAppPanelWindows | |
| ee4e15c Merge "Cherrypick the following CLs from LMP MR1" into lollipop-cts-dev am: 4528128713 -s ours am: 7fc6f38cb1 am: a5d8f5eb9e am: 1c656a46e0 am: fa2dc48cdf am: 65262026c2 | |
| cb98db3 Merge "MonkeyTests assertion failures errors. Limit the amount of error data contained in an assertion failue" into kitkat-cts-dev am: d527cc199f am: 3c12682003 am: e841d86c0a am: 0d24e5587d am: fc384026ed am: fee04d492b am: 639e601e22 | |
| bad9e6b Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a am: 8886278e00 am: 9ec7400810 am: 6a9df45994 am: b18ddf7395 am: a1d21ae719 am: 56c85d031b | |
| d8ee6a8 Merge "Fix bugs regarding TextView layout size with large font scale in ScrollingText" into kitkat-cts-dev am: 54f86cdc66 am: 602ea9bedd am: 8e3c0d3bfb am: 95bcb1915d am: ce38377237 am: a5a3107b26 am: adade48b09 | |
| 66e2af7 Merge "Fixed break #2" into kitkat-cts-dev am: 9053806660 -s ours am: f2b7f84532 am: 906db8099e am: ed2be337f8 am: 8bf14b2169 am: 9d933d9473 am: 0b7028aca6 | |
| 42ba331 Merge "DO NOT MERGE: Fixed breakage" into kitkat-cts-dev am: 89a195fa3c -s ours am: 83213a1453 -s ours am: a54da8e17c -s ours am: 7819e8f2f6 -s ours am: b20019e6ae am: d1045ad4a8 am: 2dea78fe49 | |
| 08a824f Merge "Fix SeedTest for landscape" into kitkat-cts-dev am: 2df3fc6bfb am: cfa3f2cb2c am: 736323c5ff am: a34339c59c am: df10bdf0af am: 13c0e93669 am: 880fb0f02d | |
| 02bbad0 Merge "[PATCH] CTS4.4 : Fix ThemeHostTest#testHoloThemes" into kitkat-cts-dev am: 227b641e88 -s ours am: e1eb4bb28f am: 51620a3d78 am: 0494938eea am: d1173f7cbf am: 7d5dab187d am: 170f523ebb | |
| 111f8b0 Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev am: 50c36b9da2 -s ours am: 188b260f0c am: b3627dacab am: d4d86a95bb am: 8ec5ed995b am: 7e9cef30e7 am: 22fc1c9d7a | |
| 721971a Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into cw-e-dev am: 98fb65c213 | |
| 76bf66b Merge "Fix CTS 4.4 R4 testHoloTheme test failure." into kitkat-cts-dev am: f2a1ab0c8a -s ours am: 9905f0b7e9 am: 743aedb8a7 am: d7605e2398 am: 1254a86511 am: d3cf6e3c6f am: e21cd83b3f | |
| ac6b80f Merge "DO NOT MERGE: Add MyanmarTest#testCompositionSemantics to known failure list" into kitkat-cts-dev am: af18aaf540 -s ours am: d7546b7f3b -s ours am: 1443d75946 -s ours am: dc49cc6fd2 -s ours am: 2577e48f01 am: a7eb20734c am: ee5c9c1104 | |
| 536bb1b Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into cw-e-dev am: f2fb49577d | |
| 6526202 Merge "Cherrypick the following CLs from LMP MR1" into lollipop-cts-dev am: 4528128713 -s ours am: 7fc6f38cb1 am: a5d8f5eb9e am: 1c656a46e0 am: fa2dc48cdf | |
| 4efb96f Merge "Improve the color comparison" into kitkat-cts-dev am: 1510424e14 am: 0a5de00fd4 am: 718d102f76 -s ours am: 11aeb060d4 am: 6d8931ed5d am: 5287f75394 am: 898b83e8a3 | |
| 639e601 Merge "MonkeyTests assertion failures errors. Limit the amount of error data contained in an assertion failue" into kitkat-cts-dev am: d527cc199f am: 3c12682003 am: e841d86c0a am: 0d24e5587d am: fc384026ed am: fee04d492b | |
| 0336ccd Merge "Revert "Changed the size of MockView according to resolution."" into kitkat-cts-dev am: 8f92e3e60c am: af9aff02df am: a8e04b8b4d am: ab448f521b am: 1402e219ee am: e59e98fba4 am: 934091ba0f | |
| 56c85d0 Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a am: 8886278e00 am: 9ec7400810 am: 6a9df45994 am: b18ddf7395 am: a1d21ae719 | |
| adade48 Merge "Fix bugs regarding TextView layout size with large font scale in ScrollingText" into kitkat-cts-dev am: 54f86cdc66 am: 602ea9bedd am: 8e3c0d3bfb am: 95bcb1915d am: ce38377237 am: a5a3107b26 | |
| 78503b6 Merge "DO NOT MERGE: CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend" into kitkat-cts-dev am: d8aada953e -s ours am: 51f4649017 -s ours am: 43703cd5ee -s ours am: 96f5341f0d -s ours am: f51347ea43 am: eea143b960 am: c252123ed4 | |
| 017be55 Merge branch 'mnc-dr1.5-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr1.5-dev | |
| 0b7028a Merge "Fixed break #2" into kitkat-cts-dev am: 9053806660 -s ours am: f2b7f84532 am: 906db8099e am: ed2be337f8 am: 8bf14b2169 am: 9d933d9473 | |
| 36d3b99 Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into cw-e-dev am: 8a95fe92c3 | |
| 9b005bf Merge branch 'mnc-dr1.5-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr1.5-dev | |
| 628d79e Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into kitkat-cts-dev am: 885182dd19 -s ours am: 803eae5fa6 -s ours am: 157726d10f -s ours am: 6c6882b3b7 -s ours am: 0d18798422 am: 4a9a3fd676 am: 423b1a77b9 | |
| 2dea78f Merge "DO NOT MERGE: Fixed breakage" into kitkat-cts-dev am: 89a195fa3c -s ours am: 83213a1453 -s ours am: a54da8e17c -s ours am: 7819e8f2f6 -s ours am: b20019e6ae am: d1045ad4a8 | |
| b0538a4 Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into kitkat-cts-dev am: 885182dd19 -s ours am: 803eae5fa6 -s ours am: 157726d10f -s ours am: 6c6882b3b7 -s ours am: 0d18798422 am: 4a9a3fd676 am: 423b1a77b9 | |
| 880fb0f Merge "Fix SeedTest for landscape" into kitkat-cts-dev am: 2df3fc6bfb am: cfa3f2cb2c am: 736323c5ff am: a34339c59c am: df10bdf0af am: 13c0e93669 | |
| 4cb0e4f Merge "fix ArrowKeyMovementMethodTest KeyEvent inconsistencies" into kitkat-cts-dev am: ec5c384f73 -s ours am: f6cf52311c am: 00c1a13bc5 am: f72ed45287 am: 84b3ea0675 am: 9b67b1cd95 am: bcf2a7c22a | |
| 170f523 Merge "[PATCH] CTS4.4 : Fix ThemeHostTest#testHoloThemes" into kitkat-cts-dev am: 227b641e88 -s ours am: e1eb4bb28f am: 51620a3d78 am: 0494938eea am: d1173f7cbf am: 7d5dab187d | |
| 056e367 Merge "CTS fix: match test to CDD memory requirements" into lollipop-cts-dev am: d941d32a68 -s ours am: d2edfc4b3a am: b08628be52 am: 0627fca99f am: 12828d9cec am: 187ba3f6b9 | |
| 22fc1c9 Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev am: 50c36b9da2 -s ours am: 188b260f0c am: b3627dacab am: d4d86a95bb am: 8ec5ed995b am: 7e9cef30e7 | |
| 771d847 Merge branch 'mnc-dr1.5-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr1.5-dev | |
| 98fb65c Merge branch 'cw-e-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into cw-e-dev | |
| 5c67b0e Merge "DO NOT MERGE: Revert "Camera: cross check camera2 features"" into lollipop-cts-dev am: ffd10c477f -s ours am: 56ba7d81dd -s ours am: 1e39b16fd5 -s ours am: e21d47ca3a am: 7049fd4aa8 am: 25eedd0ec7 | |
| e21cd83 Merge "Fix CTS 4.4 R4 testHoloTheme test failure." into kitkat-cts-dev am: f2a1ab0c8a -s ours am: 9905f0b7e9 am: 743aedb8a7 am: d7605e2398 am: 1254a86511 am: d3cf6e3c6f | |
| d419c7b Merge "DO NOT MERGE: Revert "Camera: cross check camera2 features"" into lollipop-cts-dev am: ffd10c477f -s ours am: 56ba7d81dd -s ours am: 1e39b16fd5 -s ours am: e21d47ca3a am: 7049fd4aa8 am: 25eedd0ec7 | |
| 8ad1145 Merge "Fix CTS 4.4 R4 testHoloTheme test failure." into kitkat-cts-dev am: f2a1ab0c8a -s ours am: 9905f0b7e9 am: 743aedb8a7 am: d7605e2398 am: 1254a86511 am: d3cf6e3c6f | |
| ee5c9c1 Merge "DO NOT MERGE: Add MyanmarTest#testCompositionSemantics to known failure list" into kitkat-cts-dev am: af18aaf540 -s ours am: d7546b7f3b -s ours am: 1443d75946 -s ours am: dc49cc6fd2 -s ours am: 2577e48f01 am: a7eb20734c | |
| b8215d7 Merge "Make sure the next case started after previous case finished" into lollipop-cts-dev am: 3f879d9ba7 am: 584cdc7c9a -s ours am: 4a7ac53f93 am: 791dc72a71 am: f7eeacf7e0 am: d5f5d23269 | |
| f2fb495 Merge branch 'cw-e-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into cw-e-dev | |
| 4acbcc0 Merge "DO NOT MERGE: Fix testVirtualDisplayRecycles fail for no thread racing protection for mNumTextureUpdated" into lollipop-cts-dev am: 3f0bc4502b -s ours am: 53405b51c8 -s ours am: b0b1f447ad -s ours am: 7fae1232f6 am: 0c4999be9e am: 960f5ce52e | |
| 898b83e Merge "Improve the color comparison" into kitkat-cts-dev am: 1510424e14 am: 0a5de00fd4 am: 718d102f76 -s ours am: 11aeb060d4 am: 6d8931ed5d am: 5287f75394 | |
| 169b8a3 Merge "Improve the color comparison" into kitkat-cts-dev am: 1510424e14 am: 0a5de00fd4 am: 718d102f76 -s ours am: 11aeb060d4 am: 6d8931ed5d am: 5287f75394 | |
| 1db4cd1 Merge "Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080" into lollipop-cts-dev am: 71c0d24172 am: 0318e2751d am: bcca855341 am: b1e0468156 am: 39c645a588 am: 7eaa2371b3 | |
| 934091b Merge "Revert "Changed the size of MockView according to resolution."" into kitkat-cts-dev am: 8f92e3e60c am: af9aff02df am: a8e04b8b4d am: ab448f521b am: 1402e219ee am: e59e98fba4 | |
| 964fac3 Merge branch \'mnc-dr-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr-dev am: 5d699eb6fa am: f1ff376b7c | |
| c252123 Merge "DO NOT MERGE: CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend" into kitkat-cts-dev am: d8aada953e -s ours am: 51f4649017 -s ours am: 43703cd5ee -s ours am: 96f5341f0d -s ours am: f51347ea43 am: eea143b960 | |
| ea4c213 Merge "Revert "CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend"" into lollipop-cts-dev am: 983ea5225a am: 391c9582c0 am: 8b823f5064 am: 360e0cd0b4 am: b371e0cf57 am: c34b7b0c8c | |
| 8a95fe9 Merge branch 'cw-e-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into cw-e-dev | |
| 423b1a7 Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into kitkat-cts-dev am: 885182dd19 -s ours am: 803eae5fa6 -s ours am: 157726d10f -s ours am: 6c6882b3b7 -s ours am: 0d18798422 am: 4a9a3fd676 | |
| 91510bb Merge "fix bug in cts verifier testcase(BYOD Managed Provisioning—camera support cross profile image capture)" into lollipop-cts-dev am: 5555241f1e am: ef4c045140 -s ours am: 41f96a4dd8 am: fe0c31b63f am: 636acc997b am: be84267e54 | |
| c64fb6a Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into kitkat-cts-dev am: 885182dd19 -s ours am: 803eae5fa6 -s ours am: 157726d10f -s ours am: 6c6882b3b7 -s ours am: 0d18798422 am: 4a9a3fd676 | |
| c6857f5 Merge "CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend" into lollipop-cts-dev am: 62c2e665a0 am: 219af39669 am: a7cf6debea am: 2efbe0e620 am: 833bca64a9 am: 65b1e70e1c | |
| bcf2a7c Merge "fix ArrowKeyMovementMethodTest KeyEvent inconsistencies" into kitkat-cts-dev am: ec5c384f73 -s ours am: f6cf52311c am: 00c1a13bc5 am: f72ed45287 am: 84b3ea0675 am: 9b67b1cd95 | |
| 648061a Merge "DO NOT MERGE Capture fields in CTS:" into kitkat-cts-dev am: ecd778f841 -s ours am: 62ef32f40c -s ours am: 363b5dc152 -s ours am: 6a35c6ff01 -s ours am: 6f908a91b1 am: a389f2128c | |
| 80d6b8a Merge branch 'mnc-dr1.5-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr1.5-dev | |
| f373530 Merge "Fix for testBadSurfaceDimensions" into lollipop-mr1-cts-dev am: d4444ac554 -s ours am: 053c2547df am: 3be236000f am: 10405d7838 am: 03b8ef2b6f | |
| 7a80424 Merge "Fix for testBadSurfaceDimensions" into lollipop-mr1-cts-dev am: d4444ac554 -s ours am: 053c2547df am: 3be236000f am: 10405d7838 am: 03b8ef2b6f | |
| 187ba3f Merge "CTS fix: match test to CDD memory requirements" into lollipop-cts-dev am: d941d32a68 -s ours am: d2edfc4b3a am: b08628be52 am: 0627fca99f am: 12828d9cec | |
| 2bb0829 Merge "Fix bugs regarding CTS fails for VP8 codec with low performance" into lollipop-mr1-cts-dev am: 3d9381b5f9 am: fe0750d778 am: ad4130f511 am: 9d53d593d8 am: b1f1ab707c | |
| 25eedd0 Merge "DO NOT MERGE: Revert "Camera: cross check camera2 features"" into lollipop-cts-dev am: ffd10c477f -s ours am: 56ba7d81dd -s ours am: 1e39b16fd5 -s ours am: e21d47ca3a am: 7049fd4aa8 | |
| e6b005c Merge "DO NOT MERGE: fixed breakages" into lollipop-mr1-cts-dev am: 842be8f7a2 -s ours am: add775967f -s ours am: 990fdd37ee am: bc3d0877ab am: d52432b744 | |
| d5f5d23 Merge "Make sure the next case started after previous case finished" into lollipop-cts-dev am: 3f879d9ba7 am: 584cdc7c9a -s ours am: 4a7ac53f93 am: 791dc72a71 am: f7eeacf7e0 | |
| 5ae64ed Merge "DO NOT MERGE: disable android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay as it fails on nexus 10" into lollipop-mr1-cts-dev am: 0d61990ce0 -s ours am: 376b4ac337 -s ours am: 5fc4a1a509 am: 138c27abaf am: d23c94a275 | |
| 960f5ce Merge "DO NOT MERGE: Fix testVirtualDisplayRecycles fail for no thread racing protection for mNumTextureUpdated" into lollipop-cts-dev am: 3f0bc4502b -s ours am: 53405b51c8 -s ours am: b0b1f447ad -s ours am: 7fae1232f6 am: 0c4999be9e | |
| 48ef65a Merge "Revert "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage"" into lollipop-mr1-cts-dev am: 78ba3c4677 -s ours am: 11b553c4d0 -s ours am: 66ad4784c1 am: c65193447b am: 63e496e133 | |
| 7eaa237 Merge "Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080" into lollipop-cts-dev am: 71c0d24172 am: 0318e2751d am: bcca855341 am: b1e0468156 am: 39c645a588 | |
| 60a0b17 Merge "DO NOT MERGE: remove duplicate knownfailures" into lollipop-mr1-cts-dev am: 3f88be15ef -s ours am: e31a0cd65e -s ours am: a1f2a73c80 am: 635b5216be am: ce1784f658 | |
| f1ff376 Merge branch \'mnc-dr-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr-dev am: 5d699eb6fa | |
| 77b53ff Merge "DO NOT MERGE: fixed build breakage" into lollipop-mr1-cts-dev am: 97a8cc3c24 -s ours am: 85e06a3704 -s ours am: eca552568a am: ff1871a36d am: ca91f60f38 | |
| c34b7b0 Merge "Revert "CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend"" into lollipop-cts-dev am: 983ea5225a am: 391c9582c0 am: 8b823f5064 am: 360e0cd0b4 am: b371e0cf57 | |
| 66b5815 Merge "DO NOT MERGE: disable camera2 tests" into lollipop-mr1-cts-dev am: 9ddec62e6a -s ours am: 19d6591ef5 -s ours am: 4114e7e79d am: 76d2dab627 am: 5ae52d3fc1 | |
| be84267 Merge "fix bug in cts verifier testcase(BYOD Managed Provisioning—camera support cross profile image capture)" into lollipop-cts-dev am: 5555241f1e am: ef4c045140 -s ours am: 41f96a4dd8 am: fe0c31b63f am: 636acc997b | |
| c2d7436 Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into cw-e-dev am: 5ac4d42ed0 | |
| 65b1e70 Merge "CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend" into lollipop-cts-dev am: 62c2e665a0 am: 219af39669 am: a7cf6debea am: 2efbe0e620 am: 833bca64a9 | |
| cc7a0ef Merge "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage" into lollipop-mr1-cts-dev am: c2aef7dce9 -s ours am: 1ebab33f28 -s ours am: 437ac4cfcc am: b132e46fc4 am: 820d56b3d7 | |
| 03b8ef2 Merge "Fix for testBadSurfaceDimensions" into lollipop-mr1-cts-dev am: d4444ac554 -s ours am: 053c2547df am: 3be236000f am: 10405d7838 | |
| b1f1ab7 Merge "Fix bugs regarding CTS fails for VP8 codec with low performance" into lollipop-mr1-cts-dev am: 3d9381b5f9 am: fe0750d778 am: ad4130f511 am: 9d53d593d8 | |
| 35b85e2 Merge "Revert "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch""" into lollipop-mr1-cts-dev am: a7ed7d707c -s ours am: 1cc811e674 -s ours am: 9f10aa5017 am: c64bdc8741 am: a537fffe67 | |
| d52432b Merge "DO NOT MERGE: fixed breakages" into lollipop-mr1-cts-dev am: 842be8f7a2 -s ours am: add775967f -s ours am: 990fdd37ee am: bc3d0877ab | |
| 19f31ea Merge "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch"" into lollipop-mr1-cts-dev am: 99e595fdf7 -s ours am: 3f8aefb59e -s ours am: 836d82f7a2 am: 5bdc4a6f38 am: 6fd1b008c5 | |
| d23c94a Merge "DO NOT MERGE: disable android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay as it fails on nexus 10" into lollipop-mr1-cts-dev am: 0d61990ce0 -s ours am: 376b4ac337 -s ours am: 5fc4a1a509 am: 138c27abaf | |
| c522a09 Merge "DO NOT MERGE ANYWHERE: bumping CTS 5.1 to R4" into lollipop-mr1-cts-dev am: 0e8212053b -s ours am: 51ebcc78b8 -s ours am: 0f858e5d15 -s ours am: 8b361450a6 -s ours am: 560933dbf2 -s ours | |
| 63e496e Merge "Revert "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage"" into lollipop-mr1-cts-dev am: 78ba3c4677 -s ours am: 11b553c4d0 -s ours am: 66ad4784c1 am: c65193447b | |
| 473d4da Merge "Add FEATURE_CAMERA_EXTERNAL to front-facing camera condition" into lollipop-mr1-cts-dev am: 98990c5fe4 am: 2dcd4c244b am: 76ef33856c am: c031171a11 am: 96e482b4f7 | |
| d337332 Merge "DO NOT MERGE: Disable two multi user tests for TV devices" into lollipop-mr1-cts-dev am: fe0c8f2aaf -s ours am: 12d88fcfed -s ours am: 575de45639 am: 4276ff1c00 am: 38eef14c7b | |
| ce1784f Merge "DO NOT MERGE: remove duplicate knownfailures" into lollipop-mr1-cts-dev am: 3f88be15ef -s ours am: e31a0cd65e -s ours am: a1f2a73c80 am: 635b5216be | |
| ca91f60 Merge "DO NOT MERGE: fixed build breakage" into lollipop-mr1-cts-dev am: 97a8cc3c24 -s ours am: 85e06a3704 -s ours am: eca552568a am: ff1871a36d | |
| c2364f3 Merge "DO NOT MERGE: Fix ION memory leak for camera2 testStillPreviewCombination tstcase" into lollipop-mr1-cts-dev am: dcd796b871 -s ours am: eddf28fcd5 -s ours am: 9f44c733a8 am: e08a6f4b8b am: dd72145c3e | |
| 5ae52d3 Merge "DO NOT MERGE: disable camera2 tests" into lollipop-mr1-cts-dev am: 9ddec62e6a -s ours am: 19d6591ef5 -s ours am: 4114e7e79d am: 76d2dab627 | |
| 1ff180b Merge "DO NOT MERGE: Camera: add testAllOutputYUVResolutions back to known failure" into lollipop-mr1-cts-dev am: 6752d39a3b -s ours am: eda470262e -s ours am: 41a554cf2c am: 94d95bc7b3 am: f38f66a7aa | |
| 5ac4d42 Merge branch 'cw-e-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into cw-e-dev | |
| aea3f0e Merge "TIF: Make sure that Cursor.moveToNext() is called before using Cursor" into lollipop-mr1-cts-dev am: f143e2cec9 am: 28b52f16fd am: 653f0e7aee am: f15e93e446 am: f59bd6dcd2 | |
| 820d56b Merge "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage" into lollipop-mr1-cts-dev am: c2aef7dce9 -s ours am: 1ebab33f28 -s ours am: 437ac4cfcc am: b132e46fc4 | |
| 0843d1c Merge "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage" into lollipop-mr1-cts-dev am: c2aef7dce9 -s ours am: 1ebab33f28 -s ours am: 437ac4cfcc am: b132e46fc4 | |
| a537fff Merge "Revert "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch""" into lollipop-mr1-cts-dev am: a7ed7d707c -s ours am: 1cc811e674 -s ours am: 9f10aa5017 am: c64bdc8741 | |
| 6fd1b00 Merge "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch"" into lollipop-mr1-cts-dev am: 99e595fdf7 -s ours am: 3f8aefb59e -s ours am: 836d82f7a2 am: 5bdc4a6f38 | |
| 560933d Merge "DO NOT MERGE ANYWHERE: bumping CTS 5.1 to R4" into lollipop-mr1-cts-dev am: 0e8212053b -s ours am: 51ebcc78b8 -s ours am: 0f858e5d15 -s ours am: 8b361450a6 -s ours | |
| 96e482b Merge "Add FEATURE_CAMERA_EXTERNAL to front-facing camera condition" into lollipop-mr1-cts-dev am: 98990c5fe4 am: 2dcd4c244b am: 76ef33856c am: c031171a11 | |
| 38eef14 Merge "DO NOT MERGE: Disable two multi user tests for TV devices" into lollipop-mr1-cts-dev am: fe0c8f2aaf -s ours am: 12d88fcfed -s ours am: 575de45639 am: 4276ff1c00 | |
| dd72145 Merge "DO NOT MERGE: Fix ION memory leak for camera2 testStillPreviewCombination tstcase" into lollipop-mr1-cts-dev am: dcd796b871 -s ours am: eddf28fcd5 -s ours am: 9f44c733a8 am: e08a6f4b8b | |
| f38f66a Merge "DO NOT MERGE: Camera: add testAllOutputYUVResolutions back to known failure" into lollipop-mr1-cts-dev am: 6752d39a3b -s ours am: eda470262e -s ours am: 41a554cf2c am: 94d95bc7b3 | |
| f59bd6d Merge "TIF: Make sure that Cursor.moveToNext() is called before using Cursor" into lollipop-mr1-cts-dev am: f143e2cec9 am: 28b52f16fd am: 653f0e7aee am: f15e93e446 | |
| 394caf8 resolve merge conflicts of 819dc2b3ca to mnc-dev. am: 9d2b673a5f am: a4947e505a am: ce975dc68c | |
| ce975dc resolve merge conflicts of 819dc2b3ca to mnc-dev. am: 9d2b673a5f am: a4947e505a | |
| d0bdc3c CTS fix: add missing feature flags for API 23 | |
| 098b488 Merge "DO NOT MERGE CtsVerifier: Remove failed cases in BYOD Disable NFC beam" into lollipop-mr1-cts-dev am: e771efe6f0 -s ours am: c643a1d0d4 -s ours am: a56df60038 am: 2032870025 am: 4a7d093ec3 | |
| 9ca36f1 Merge "Allow number of supported Bitmap to be greater than 4." into lollipop-mr1-cts-dev am: 9b8e6681df am: 97ea8ead55 am: 50359c4ba7 am: 4f6bed9cb1 am: 89139626fb | |
| c2d427a fixed breakage am: 5614190f7b -s ours am: e96247fc5a am: 28f6c0360c am: d6c6ee5c05 am: 5477621991 | |
| 4a7d093 Merge "DO NOT MERGE CtsVerifier: Remove failed cases in BYOD Disable NFC beam" into lollipop-mr1-cts-dev am: e771efe6f0 -s ours am: c643a1d0d4 -s ours am: a56df60038 am: 2032870025 | |
| 8913962 Merge "Allow number of supported Bitmap to be greater than 4." into lollipop-mr1-cts-dev am: 9b8e6681df am: 97ea8ead55 am: 50359c4ba7 am: 4f6bed9cb1 | |
| 5477621 fixed breakage am: 5614190f7b -s ours am: e96247fc5a am: 28f6c0360c am: d6c6ee5c05 | |
| 92239be cts: get video size from CamcorderProfile -- DO NOT MERGE am: 203f6997c6 -s ours am: 0e7cbc3694 -s ours am: 447116f78c am: a3d744fd87 am: 65c4718815 | |
| 7637d16 BUG: 23792027 adding android.hardware.cts.helpers.sensorverification.EventOrderingVerificationTest#testSameTimestamp to knownfailure am: 71fa8dd091 -s ours am: 279c024b23 am: 4f1639acab am: d9ce1f871d am: 1e4209f7dd | |
| 65c4718 cts: get video size from CamcorderProfile -- DO NOT MERGE am: 203f6997c6 -s ours am: 0e7cbc3694 -s ours am: 447116f78c am: a3d744fd87 | |
| a7172b3 BUG: 23954202 fixed minimum memory to be 1099 am: 25360f86ec am: a720724ced am: 12e52fbcb6 am: 5f857888d4 am: fc633ae429 | |
| 1e4209f BUG: 23792027 adding android.hardware.cts.helpers.sensorverification.EventOrderingVerificationTest#testSameTimestamp to knownfailure am: 71fa8dd091 -s ours am: 279c024b23 am: 4f1639acab am: d9ce1f871d | |
| d308577 Add 5-second timeout to testFlacHeapOverflow am: f6483e84dd -s ours am: 201799f5ac am: 57a745da6f am: e721b55cc2 am: 7d53e3b7d9 | |
| fc633ae BUG: 23954202 fixed minimum memory to be 1099 am: 25360f86ec am: a720724ced am: 12e52fbcb6 am: 5f857888d4 | |
| 7d53e3b Add 5-second timeout to testFlacHeapOverflow am: f6483e84dd -s ours am: 201799f5ac am: 57a745da6f am: e721b55cc2 | |
| dd8a2df Remove corrupt test file am: 45eca1ea8c am: ae9460175b am: 9707d657e6 am: 243a7509f7 am: 3f094870b4 | |
| ffbb798 merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev am: a0351d441b am: bb943950ad am: 3ea3777e46 am: d6ec55ffd7 am: d6ce9c139a | |
| fdd2e7b Merge "[DO NOT MERGE] Fix ActivityManagerTest#testGetRunningAppProcesses" into lmp-mr1-dev am: 4eb9032233 -s ours am: 5f6e8c9dfa -s ours am: d62df8c385 am: 61e556e9eb am: 20e29883a9 | |
| d5ab65a DO NOT MERGE: Merged Fixes for CTS Sensor test from master am: 61e3dda0d8 -s ours am: 7b700ba962 -s ours am: cbf61604c2 am: 36e0ebb482 am: f61d83037a | |
| fe38ec0 Merge "resolve merge conflicts of ff69cf01b1 to marshmallow-cts-dev." into marshmallow-cts-dev am: a32b2c3284 am: 2adfd37b0f am: 9755f27c5a am: 59b3f08048 | |
| 3f09487 Remove corrupt test file am: 45eca1ea8c am: ae9460175b am: 9707d657e6 am: 243a7509f7 | |
| d6ce9c1 merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev am: a0351d441b am: bb943950ad am: 3ea3777e46 am: d6ec55ffd7 | |
| 20e2988 Merge "[DO NOT MERGE] Fix ActivityManagerTest#testGetRunningAppProcesses" into lmp-mr1-dev am: 4eb9032233 -s ours am: 5f6e8c9dfa -s ours am: d62df8c385 am: 61e556e9eb | |
| f61d830 DO NOT MERGE: Merged Fixes for CTS Sensor test from master am: 61e3dda0d8 -s ours am: 7b700ba962 -s ours am: cbf61604c2 am: 36e0ebb482 | |
| 59b3f08 Merge "resolve merge conflicts of ff69cf01b1 to marshmallow-cts-dev." into marshmallow-cts-dev am: a32b2c3284 am: 2adfd37b0f am: 9755f27c5a | |
| 258e25e RECORD_SOUND must be handled by sound recorder app | |
| aa887d3 Fix testWifiConfigLockdown failure due to wifi not being ready | |
| f8cd744 Merge "Camera: update FPS range check per spec update" into marshmallow-cts-dev am: fea01e7b23 am: e301ca49d9 am: e596519778 am: 3583b7e3f1 | |
| 3583b7e Merge "Camera: update FPS range check per spec update" into marshmallow-cts-dev am: fea01e7b23 am: e301ca49d9 am: e596519778 | |
| d1f2bfd Merge "Update full alarm test requirements" into marshmallow-cts-dev am: 6f23dda366 am: 9ef3a00a3e am: 6c0c9a0b1a am: 0526ba7c3b | |
| 0526ba7 Merge "Update full alarm test requirements" into marshmallow-cts-dev am: 6f23dda366 am: 9ef3a00a3e am: 6c0c9a0b1a | |
| f6fe336 CTS test for robust handling of invalid cmap am: 57c15f21bd am: a1e319228c am: 03e84e2d00 am: 87eef9b8ce am: f59756e655 am: c8e2241f96 am: 4846ee278c am: 75b20a652a | |
| 75b20a6 CTS test for robust handling of invalid cmap am: 57c15f21bd am: a1e319228c am: 03e84e2d00 am: 87eef9b8ce am: f59756e655 am: c8e2241f96 am: 4846ee278c | |
| 8c4a469 Merge "Revert "CTS: Add testConnectivityConstraintExecutes_withMobile to knownfailures"" into marshmallow-cts-dev am: a327989d03 am: b1c9a7d318 am: d99f6b5bcb am: 4f01f7dc7e | |
| 7eb9574 Merge "DO NOT MERGE: CameraITS: relax test_blackwhite threshold" into marshmallow-cts-dev am: 07629e98df -s ours am: 4dad792513 am: f712e24429 am: 0a3fd39f93 | |
| 94ff378 Merge "resolve merge conflicts of c696e17027 to marshmallow-cts-dev." into marshmallow-cts-dev am: 11712ba2c6 -s ours am: 2638f86979 am: 83661327ba am: f700912011 | |
| 4f01f7d Merge "Revert "CTS: Add testConnectivityConstraintExecutes_withMobile to knownfailures"" into marshmallow-cts-dev am: a327989d03 am: b1c9a7d318 am: d99f6b5bcb | |
| 0a3fd39 Merge "DO NOT MERGE: CameraITS: relax test_blackwhite threshold" into marshmallow-cts-dev am: 07629e98df -s ours am: 4dad792513 am: f712e24429 | |
| f700912 Merge "resolve merge conflicts of c696e17027 to marshmallow-cts-dev." into marshmallow-cts-dev am: 11712ba2c6 -s ours am: 2638f86979 am: 83661327ba | |
| c95084f am a4456f70: am c65bc434: am 62532688: Set a system property stating the device supports multicast. am: c0c7436030 am: 946a31cae6 am: 819e121f26 am: 4f0eacab33 am: 7da187d8a3 | |
| 1c1a144 Merge branch 'mnc-dr1.5-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr1.5-dev | |
| 3b3b2f3 Merge branch \'marshmallow-cts-dev\' of /usr/local/google/game/mirror/android_googlesource_com/platform/cts into marshmallow-cts-dev am: 2bee938d06 am: 324d3048f7 am: d7c479d870 am: f0ee9dea34 | |
| 400707e Merge branch \'marshmallow-cts-dev\' of /usr/local/google/game/mirror/android_googlesource_com/platform/cts into marshmallow-cts-dev am: 2bee938d06 am: 324d3048f7 am: d7c479d870 am: f0ee9dea34 | |
| 25e90de Merge branch \'mnc-dr-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr-dev am: d0c7dbb40c am: a3e5e7e31a | |
| 2ce5cf3 am 72a4d623: am 56538948: am 3673d9f0: CameraITS: Added sensor fusion test. am: 24ec999ad4 am: 8f81d2de06 am: 340fd396ac am: 79a982544d am: 08bb5b5a33 | |
| 00e9369 Merge branch \'mnc-dr-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr-dev am: a1e1caa112 am: 2c14d02bd2 | |
| eeeb5ef am d5f8dc7b: am 276b599e: am 876ede47: CameraITS: Cleaned up and documented script to generate DNG noise model am: 78ca52bb7c am: 553c894d33 am: a7a9aaf4b3 am: 11a4265761 am: 0f4674e529 | |
| 78bb7bb am 59863965: am f7057b97: am 483aa0b6: CameraITS: Added OpenCV to installed module list am: 093e6b6892 am: b1dd82c2eb am: 6c0916ddb5 am: e6c08099fe am: dcdeebe4c9 | |
| 5d3331a am 26e02e2a: am d05409d8: am 2f54c52b: Add "-v" to any logcat commands run from within CTS tests am: e4286de95c am: 313000556f am: b468ad7f96 am: e9f5c8525a am: d7003b068a | |
| b2d2993 Merge branch \'mnc-dr-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr-dev am: 1fe95c4e5a am: 14bd0e5d51 | |
| 7da187d am a4456f70: am c65bc434: am 62532688: Set a system property stating the device supports multicast. am: c0c7436030 am: 946a31cae6 am: 819e121f26 am: 4f0eacab33 | |
| 8cda5f7 am bcd0e58d: am 57e5c0da: am 8a893be3: Merge "Fix failing CTS tests." into lmp-sprout-dev am: 05b1093f71 am: fbc186de1e am: 1848b0c221 am: c9e2a31ad4 am: 98cd177075 | |
| 927de3e Merge branch \'marshmallow-cts-dev\' of /usr/local/google/game/mirror/android_googlesource_com/platform/cts into marshmallow-cts-dev am: 8545b26608 am: 519137d8cd am: 61b5423c43 | |
| f0ee9de Merge branch \'marshmallow-cts-dev\' of /usr/local/google/game/mirror/android_googlesource_com/platform/cts into marshmallow-cts-dev am: 2bee938d06 am: 324d3048f7 am: d7c479d870 | |
| a3e5e7e Merge branch \'mnc-dr-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr-dev am: d0c7dbb40c | |
| c5aeab7 am 784bdd8f: am 16e8e01f: am 9610d4a3: Merge "CamcorderProfile: guard unknown profile qualities" into lmp-sprout-dev am: 65c4783bac am: 1c7f92cbb7 am: d0362b32e2 am: 660a77315b am: 904b3f3615 | |
| 85e5d6d Merge branch \'mnc-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dev am: eb803d2a4c am: a2e6d6d45e am: ff427d2358 | |
| 08bb5b5 am 72a4d623: am 56538948: am 3673d9f0: CameraITS: Added sensor fusion test. am: 24ec999ad4 am: 8f81d2de06 am: 340fd396ac am: 79a982544d | |
| a95b38c am c45414f6: am 0cd1d99f: am 46d5f094: Merge "CameraITS: allow more time for AE converge" into lmp-sprout-dev am: 173e06387f am: a7944f07a0 am: 7c90a7427a am: 54a9448a53 am: f42b34316c | |
| 2c14d02 Merge branch \'mnc-dr-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr-dev am: a1e1caa112 | |
| 7afb21e am 50d6f79f: am af521804: am 168154f1: Merge "Camera2: skip AE compensation test on legacy devices" into lmp-sprout-dev am: 3764dcbf96 am: 5cdac69a3d am: 15542bdd93 am: 634cb9336a am: 71eed52e23 | |
| 0f4674e am d5f8dc7b: am 276b599e: am 876ede47: CameraITS: Cleaned up and documented script to generate DNG noise model am: 78ca52bb7c am: 553c894d33 am: a7a9aaf4b3 am: 11a4265761 | |
| dcdeebe am 59863965: am f7057b97: am 483aa0b6: CameraITS: Added OpenCV to installed module list am: 093e6b6892 am: b1dd82c2eb am: 6c0916ddb5 am: e6c08099fe | |
| 0259599 Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into cw-e-dev am: 55fa07d3a7 | |
| d7003b0 am 26e02e2a: am d05409d8: am 2f54c52b: Add "-v" to any logcat commands run from within CTS tests am: e4286de95c am: 313000556f am: b468ad7f96 am: e9f5c8525a | |
| 3f54666 am e028209f: am c2c7420c: am 336efd31: Merge "Fix various Wear media CTS failures." into lmp-sprout-dev am: e2502c1514 am: 7204d98b84 am: a6f4965920 am: 56b773c13b am: 59d382a2bf | |
| 14bd0e5 Merge branch \'mnc-dr-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr-dev am: 1fe95c4e5a | |
| 98b4a62 am df5dc917: am 04b6548f: am 61998484: Merge "CameraITS: fix manual capture request" into lmp-sprout-dev am: d22fcb615d am: 2824fe736d am: a65e489992 am: 979554443d am: 19e21884bf | |
| 28db17b am e8769ba1: am 7f20f7d6: am 1b16d5ce: Don’t run RingtoneMangerTest tests on devices without audio output. am: 12dda9f3e8 am: 8f63b71dd8 am: 827ff8b623 am: 327d917385 am: e03063b161 | |
| 98cd177 am bcd0e58d: am 57e5c0da: am 8a893be3: Merge "Fix failing CTS tests." into lmp-sprout-dev am: 05b1093f71 am: fbc186de1e am: 1848b0c221 am: c9e2a31ad4 | |
| a9dcda6 am 882ec2e4: am 436acb71: am f9e09d47: Don’t run Ringtone test if the devices without audio output. am: c36c8e2669 am: ea1587cf13 am: 9d9ff617a0 am: 6ce9e8ea1f am: e67a126935 | |
| 904b3f3 am 784bdd8f: am 16e8e01f: am 9610d4a3: Merge "CamcorderProfile: guard unknown profile qualities" into lmp-sprout-dev am: 65c4783bac am: 1c7f92cbb7 am: d0362b32e2 am: 660a77315b | |
| ff427d2 Merge branch \'mnc-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dev am: eb803d2a4c am: a2e6d6d45e | |
| 851c48b am 6e757b83: am aa05d868: am 354ff1ba: am c059bc6f: Merge "Update Data Backup description to accommodate more devices." into lmp-dev am: 7487e81b29 am: 89dca90601 am: 4e46832fb1 am: 71341094f7 am: 94de1b118d | |
| f42b343 am c45414f6: am 0cd1d99f: am 46d5f094: Merge "CameraITS: allow more time for AE converge" into lmp-sprout-dev am: 173e06387f am: a7944f07a0 am: 7c90a7427a am: 54a9448a53 | |
| b589c06 am 4b6f2421: am e442282a: am 2cd838d6: am 47a20d81: resolve merge conflicts of 6c1149d to klp-modular-dev-plus-aosp. automerge: f6f6d69 am: b304f03f84 am: e9f94e23b8 am: 7b76ff868d am: 391c45f385 am: 79f525345b | |
| 71eed52 am 50d6f79f: am af521804: am 168154f1: Merge "Camera2: skip AE compensation test on legacy devices" into lmp-sprout-dev am: 3764dcbf96 am: 5cdac69a3d am: 15542bdd93 am: 634cb9336a | |
| 200ad29 am 14be49bf: resolved conflicts for merge of 1cad200a to lmp-sprout-dev am: 29abecfce5 am: 9d32e93991 am: 43b2789f98 am: 4443bcd779 am: 0f55c05e6e | |
| 55fa07d Merge branch 'cw-e-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into cw-e-dev | |
| 59d382a am e028209f: am c2c7420c: am 336efd31: Merge "Fix various Wear media CTS failures." into lmp-sprout-dev am: e2502c1514 am: 7204d98b84 am: a6f4965920 am: 56b773c13b | |
| 5234595 am c06afd8c: am e9cf4cb5: am 74b936fb: Fix failing CTS tests. am: d51efae715 am: 59ecf8add9 am: b327f3dfa7 am: 6a1bc5750b | |
| 1c29a72 am 9eb379a5: resolved conflicts for merge of 20874173 to lmp-sprout-dev am: 5e0965e587 am: fe0cadc5e8 am: 07cbdd099c am: 96faead416 am: bbf9dd20c3 | |
| 19e2188 am df5dc917: am 04b6548f: am 61998484: Merge "CameraITS: fix manual capture request" into lmp-sprout-dev am: d22fcb615d am: 2824fe736d am: a65e489992 am: 979554443d | |
| e003ccb am c4551f02: Merge "CameraITS: only use analog gain for RAW gain test" into lollipop-mr1-cts-dev am: f9a28b1cf6 am: 3b4cb7633a am: e3fe03a6db am: 97e68b1b9e am: ebe1e3cc4a | |
| e03063b am e8769ba1: am 7f20f7d6: am 1b16d5ce: Don’t run RingtoneMangerTest tests on devices without audio output. am: 12dda9f3e8 am: 8f63b71dd8 am: 827ff8b623 am: 327d917385 | |
| 1f0fb72 am f00c6d17: am 9065626e: am 2914d50c: (-s ours) resolved conflicts for merge of 4992891b to klp-modular-dev am: 33773b3021 am: 3b1c9788af am: 2cc0a8134c am: 31b46dcf4c am: c56916f16e | |
| 6f6fa03 Merge branch 'mnc-dr1.5-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dr1.5-dev | |
| 9962356 am 2cf4b1ad: am 9c2e83ea: Merge "DO NOT MERGE - Add CTS tests for IAudioflinger binder checks." into lmp-dev am: 83a0daa2c8 -s ours am: 4c54f79503 -s ours am: 506e502d56 am: 6884e616a0 am: e7811b2218 | |
| e67a126 am 882ec2e4: am 436acb71: am f9e09d47: Don’t run Ringtone test if the devices without audio output. am: c36c8e2669 am: ea1587cf13 am: 9d9ff617a0 am: 6ce9e8ea1f | |
| 16b36d5 am 2cf4b1ad: am 9c2e83ea: Merge "DO NOT MERGE - Add CTS tests for IAudioflinger binder checks." into lmp-dev am: 83a0daa2c8 -s ours am: 4c54f79503 -s ours am: 506e502d56 am: 6884e616a0 am: e7811b2218 | |
| 94de1b1 am 6e757b83: am aa05d868: am 354ff1ba: am c059bc6f: Merge "Update Data Backup description to accommodate more devices." into lmp-dev am: 7487e81b29 am: 89dca90601 am: 4e46832fb1 am: 71341094f7 | |
| 79f5253 am 4b6f2421: am e442282a: am 2cd838d6: am 47a20d81: resolve merge conflicts of 6c1149d to klp-modular-dev-plus-aosp. automerge: f6f6d69 am: b304f03f84 am: e9f94e23b8 am: 7b76ff868d am: 391c45f385 | |
| 0f55c05 am 14be49bf: resolved conflicts for merge of 1cad200a to lmp-sprout-dev am: 29abecfce5 am: 9d32e93991 am: 43b2789f98 am: 4443bcd779 | |
| 6669146 Merge branch \'mnc-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-dev am: fc443e2421 am: 72aa893b70 | |
| c931702 am 5b92c7de: am bd93e696: am c455860c: Add processes to root WL am: 08764e7fb3 am: d8731c10b8 am: 11f9c45b36 am: 8a115c36fc | |
| bbf9dd2 am 9eb379a5: resolved conflicts for merge of 20874173 to lmp-sprout-dev am: 5e0965e587 am: fe0cadc5e8 am: 07cbdd099c am: 96faead416 | |
| ebe1e3c am c4551f02: Merge "CameraITS: only use analog gain for RAW gain test" into lollipop-mr1-cts-dev am: f9a28b1cf6 am: 3b4cb7633a am: e3fe03a6db am: 97e68b1b9e | |
| c56916f am f00c6d17: am 9065626e: am 2914d50c: (-s ours) resolved conflicts for merge of 4992891b to klp-modular-dev am: 33773b3021 am: 3b1c9788af am: 2cc0a8134c am: 31b46dcf4c | |
| e7811b2 am 2cf4b1ad: am 9c2e83ea: Merge "DO NOT MERGE - Add CTS tests for IAudioflinger binder checks." into lmp-dev am: 83a0daa2c8 -s ours am: 4c54f79503 -s ours am: 506e502d56 am: 6884e616a0 | |
| f88e03a Merge "Fix for testBadSurfaceDimensions" into lollipop-mr1-cts-dev am: d4444ac554 am: cb3a4ff072 am: 3c5db1ebb5 am: 36dd8b7c0b -s ours am: 539f4224b5 am: 650f5461a3 am: 0f30688a38 | |
| 0f30688 Merge "Fix for testBadSurfaceDimensions" into lollipop-mr1-cts-dev am: d4444ac554 am: cb3a4ff072 am: 3c5db1ebb5 am: 36dd8b7c0b -s ours am: 539f4224b5 am: 650f5461a3 | |
| 7c035f3 TIF: Allow notifyVideoUnavailable in HardwareSessionTest | |
| 1636857 Merge "Revert "MediaMetadataRetrieverTest: add new test to handle overflowed padding."" into mnc-dr-dev am: a03b088227 am: 252574a051 | |
| 252574a Merge "Revert "MediaMetadataRetrieverTest: add new test to handle overflowed padding."" into mnc-dr-dev am: a03b088227 | |
| c2d2a94 Merge "CTS fix: match test to CDD memory requirements" into lollipop-cts-dev am: d941d32a68 am: e2a79f622f am: a58f7e6a73 -s ours am: befad72b95 am: 85fc50c1f6 am: a355c51355 am: 224384ae06 am: 410eddc547 am: 22efc7f91b | |
| 22efc7f Merge "CTS fix: match test to CDD memory requirements" into lollipop-cts-dev am: d941d32a68 am: e2a79f622f am: a58f7e6a73 -s ours am: befad72b95 am: 85fc50c1f6 am: a355c51355 am: 224384ae06 am: 410eddc547 | |
| 9f29b84 Merge "DO NOT MERGE: Revert "Camera: cross check camera2 features"" into lollipop-cts-dev am: ffd10c477f -s ours am: f8db80ea9e am: 72733de4c2 -s ours am: 324e7aff0b am: 3bfce70ec8 am: 930dcf490c -s ours am: 37dabf9e9c am: 82d9da35ea am: ddf1b1b39a | |
| ddf1b1b Merge "DO NOT MERGE: Revert "Camera: cross check camera2 features"" into lollipop-cts-dev am: ffd10c477f -s ours am: f8db80ea9e am: 72733de4c2 -s ours am: 324e7aff0b am: 3bfce70ec8 am: 930dcf490c -s ours am: 37dabf9e9c am: 82d9da35ea | |
| 85d2ae2 MediaMetadataRetrieverTest: remove unused import to fix compile error. am: 83275559a0 am: eb798f8c61 am: d669482441 am: 84e397df30 am: 9297ae8d00 am: afe30f1801 am: a44d029c4b am: 095321cdcb am: 98f352f2e6 am: 0f2c94b5e0 am: 64cf609f11 | |
| 64cf609 MediaMetadataRetrieverTest: remove unused import to fix compile error. am: 83275559a0 am: eb798f8c61 am: d669482441 am: 84e397df30 am: 9297ae8d00 am: afe30f1801 am: a44d029c4b am: 095321cdcb am: 98f352f2e6 am: 0f2c94b5e0 | |
| 17399d1 Merge "CTS: Add testConnectivityConstraintExecutes_withMobile to knownfailures" into marshmallow-cts-dev am: cc7738ed56 am: 5c38f2f97c am: fac47328e8 am: 36a7dd840d | |
| 4ca9364 Merge "fix failure line handling for VideEncoderDecoderTest." into marshmallow-cts-dev am: 93a62f44b7 am: 6fe8595ce5 am: b472e33b4d am: 7e104211f7 | |
| 0c9f790 Merge "Enable SPEAKERPHONE CTS tests." into marshmallow-cts-dev am: 28490ac2b8 am: f6cb5e778a am: 94452f256a am: 747475c342 | |
| 84e7106 Merge "Reduce EGLCleanup test iterations" into marshmallow-cts-dev am: 55449c5b67 am: 28547fcf48 am: 2639191084 am: 9d0193fa09 | |
| b4652d7 Merge "Make copy_media.sh POSIX compatible" into marshmallow-cts-dev am: 4d8a2820cc am: 2872f85e03 am: 16ef035a62 am: 2e194f5a94 | |
| a803622 Merge "Enable test of events occuring after AudioRecord.stop" into marshmallow-cts-dev am: 977b792416 am: 42bb01df12 am: b567243ed6 am: d27633bd4b | |
| e297212 Merge "Fix timestamps sort in UiAutomationTest.testWindowContentFrameStats" into marshmallow-cts-dev am: 7e2024b3a3 am: 45693f41ea am: 052a8b5248 am: dd3eb8bfd8 | |
| 5a42a24 Merge "Fix report latency overflow in DeviceSuspendTest" into marshmallow-cts-dev am: 5593c07d82 am: a0a7aa520c am: 0202eb1a55 am: 7030d3d7b5 | |
| 36a7dd8 Merge "CTS: Add testConnectivityConstraintExecutes_withMobile to knownfailures" into marshmallow-cts-dev am: cc7738ed56 am: 5c38f2f97c am: fac47328e8 | |
| 7c97e45 Merge "Reduce CTS audio requirements for low memory devices" into marshmallow-cts-dev am: 97b1eaec60 am: f4d997fb68 am: 2ff04bc836 am: a95384662d | |
| 7e10421 Merge "fix failure line handling for VideEncoderDecoderTest." into marshmallow-cts-dev am: 93a62f44b7 am: 6fe8595ce5 am: b472e33b4d | |
| 747475c Merge "Enable SPEAKERPHONE CTS tests." into marshmallow-cts-dev am: 28490ac2b8 am: f6cb5e778a am: 94452f256a | |
| 9d0193f Merge "Reduce EGLCleanup test iterations" into marshmallow-cts-dev am: 55449c5b67 am: 28547fcf48 am: 2639191084 | |
| 2e194f5 Merge "Make copy_media.sh POSIX compatible" into marshmallow-cts-dev am: 4d8a2820cc am: 2872f85e03 am: 16ef035a62 | |
| d27633b Merge "Enable test of events occuring after AudioRecord.stop" into marshmallow-cts-dev am: 977b792416 am: 42bb01df12 am: b567243ed6 | |
| dd3eb8b Merge "Fix timestamps sort in UiAutomationTest.testWindowContentFrameStats" into marshmallow-cts-dev am: 7e2024b3a3 am: 45693f41ea am: 052a8b5248 | |
| 7030d3d Merge "Fix report latency overflow in DeviceSuspendTest" into marshmallow-cts-dev am: 5593c07d82 am: a0a7aa520c am: 0202eb1a55 | |
| a953846 Merge "Reduce CTS audio requirements for low memory devices" into marshmallow-cts-dev am: 97b1eaec60 am: f4d997fb68 am: 2ff04bc836 | |
| 18887c8 Merge "MediaMetadataRetrieverTest: add new test to handle overflowed padding." into klp-dev am: dbbf638438 am: e186732d3c am: 8d92d809ae am: 7e058bde18 am: b8d2096fbc am: e6e8987d67 am: bf1d44f3c8 am: e006c2bb6b am: 464942ae00 am: 41c305b598 am: 0f1f00e837 | |
| 0f1f00e Merge "MediaMetadataRetrieverTest: add new test to handle overflowed padding." into klp-dev am: dbbf638438 am: e186732d3c am: 8d92d809ae am: 7e058bde18 am: b8d2096fbc am: e6e8987d67 am: bf1d44f3c8 am: e006c2bb6b am: 464942ae00 am: 41c305b598 | |
| b53b58a Merge "DO NOT MERGE CTS device-side preconditions for MNC" into marshmallow-cts-dev am: d7fbebc695 -s ours am: d9f7da15c8 am: 4178f44fe7 am: 7598d437d6 | |
| 7598d43 Merge "DO NOT MERGE CTS device-side preconditions for MNC" into marshmallow-cts-dev am: d7fbebc695 -s ours am: d9f7da15c8 am: 4178f44fe7 | |
| 8dff9f7 DO NOT MERGE - MediaServerCrashTest: add testDrmManagerClientReset. am: 0612101597 am: 8cedf07200 -s ours am: 4480afc2e7 am: 84df684b28 am: 56e4e8b52a -s ours am: ae9375f5da am: 90f1ebdbb7 am: ecc4163a1f | |
| ecc4163 DO NOT MERGE - MediaServerCrashTest: add testDrmManagerClientReset. am: 0612101597 am: 8cedf07200 -s ours am: 4480afc2e7 am: 84df684b28 am: 56e4e8b52a -s ours am: ae9375f5da am: 90f1ebdbb7 | |
| e1c5feb MediaServerCrashTest: add testDrmManagerClientReset. am: a74beb1a12 am: 9841ef744f am: 774d260dcc | |
| 774d260 MediaServerCrashTest: add testDrmManagerClientReset. am: a74beb1a12 am: 9841ef744f | |
| 6c27dbe Merge "Camera: create camera test package" into marshmallow-cts-dev am: aa8fbe2018 am: af8c6a3023 am: d1253c74d3 am: 419ea3081b | |
| 419ea30 Merge "Camera: create camera test package" into marshmallow-cts-dev am: aa8fbe2018 am: af8c6a3023 am: d1253c74d3 | |
| 648ca45 TIF: Allow notifyVideoUnavailable in HardwareSessionTest | |
| b7eb06c Merge "Do not test AudioPlayback if system doesn\'t have audio out" into marshmallow-cts-dev am: 90d0d52c04 am: 398724c523 am: eae5a58ffb am: da1e92c938 | |
| da1e92c Merge "Do not test AudioPlayback if system doesn\'t have audio out" into marshmallow-cts-dev am: 90d0d52c04 am: 398724c523 am: eae5a58ffb | |
| 3dba1b7 Fix SensorBatchingFifoTest EOB bug | |
| ec6639d Merge "Camera: remove FREEFORM cropping check for FULL device" into marshmallow-cts-dev am: 1581976913 am: dd14acb21c am: 95b3a8a610 am: f76320341a | |
| f763203 Merge "Camera: remove FREEFORM cropping check for FULL device" into marshmallow-cts-dev am: 1581976913 am: dd14acb21c am: 95b3a8a610 | |
| 2a56b01 Merge "Enforce the valid range of psc, pci and lac/cid for primary cells." into marshmallow-cts-dev am: 492e4f4938 am: 35f3f86955 am: f22107e885 am: ee1e62c211 | |
| ee1e62c Merge "Enforce the valid range of psc, pci and lac/cid for primary cells." into marshmallow-cts-dev am: 492e4f4938 am: 35f3f86955 am: f22107e885 | |
| 598df8d Merge "SensorBatching Test Fixes" into marshmallow-cts-dev am: f3b0e41117 am: 65c8c0289d am: 109447ce2d am: 2cb17bb762 | |
| 2cb17bb Merge "SensorBatching Test Fixes" into marshmallow-cts-dev am: f3b0e41117 am: 65c8c0289d am: 109447ce2d | |
| c042f2d Merge "DO NOT MERGE: Revert "Add build number into CTS Verifier."" into marshmallow-cts-dev am: 27425c8e96 -s ours am: a4bb6d45e3 am: 18cca1fde1 am: 2c3054d463 | |
| 2c3054d Merge "DO NOT MERGE: Revert "Add build number into CTS Verifier."" into marshmallow-cts-dev am: 27425c8e96 -s ours am: a4bb6d45e3 am: 18cca1fde1 | |
| 1a972da Merge "Add new keyguard disable features tests for primary profile to CTS Verifier" into marshmallow-cts-dev am: 5ccc5c2d52 am: 629986b283 am: 6fbcdba3dc am: 475e49ec84 | |
| 475e49e Merge "Add new keyguard disable features tests for primary profile to CTS Verifier" into marshmallow-cts-dev am: 5ccc5c2d52 am: 629986b283 am: 6fbcdba3dc | |
| 85c44d5 Merge "Camera: read exposure value range if possible" into marshmallow-cts-dev am: 1b542eab39 am: 9ea3cb8007 am: f03f756343 am: 41094aca3f | |
| 41094ac Merge "Camera: read exposure value range if possible" into marshmallow-cts-dev am: 1b542eab39 am: 9ea3cb8007 am: f03f756343 | |
| bdc7c41 Merge "Increase timeout for gtest runs." into marshmallow-cts-dev am: 5be25df345 am: bbb8a41787 am: 289a772b9c am: 39dd8e689a | |
| 39dd8e6 Merge "Increase timeout for gtest runs." into marshmallow-cts-dev am: 5be25df345 am: bbb8a41787 am: 289a772b9c | |
| 9c15a3d Merge "Make sure the next case started after previous case finished" into lollipop-cts-dev am: 3f879d9ba7 am: 9a3f7b9230 am: 5768d3249b am: e09abc059d am: db2400fc07 am: 7c33c16114 -s ours am: 66686dbb43 am: eb69339260 am: 705cc160f5 | |
| 705cc16 Merge "Make sure the next case started after previous case finished" into lollipop-cts-dev am: 3f879d9ba7 am: 9a3f7b9230 am: 5768d3249b am: e09abc059d am: db2400fc07 am: 7c33c16114 -s ours am: 66686dbb43 am: eb69339260 | |
| 1c980ac Merge "Add fingerprint feature to cts verifier app" into marshmallow-cts-dev am: d1b93e3750 am: 47557c524d am: b73ee83085 am: 38f0abcd99 | |
| 38f0abc Merge "Add fingerprint feature to cts verifier app" into marshmallow-cts-dev am: d1b93e3750 am: 47557c524d am: b73ee83085 | |
| 0218a8d Merge "Remove cts-verifier tests for two intents." into marshmallow-cts-dev am: ea02935362 am: f60cffa984 am: b782734098 am: 91171201c6 | |
| 9117120 Merge "Remove cts-verifier tests for two intents." into marshmallow-cts-dev am: ea02935362 am: f60cffa984 am: b782734098 | |
| 3e56913 Merge "Fix for Job Scheduler Charging test case" into marshmallow-cts-dev am: f127404330 am: 3231b4ca1c am: 627d1faff1 am: 4d634dc927 | |
| 4d634dc Merge "Fix for Job Scheduler Charging test case" into marshmallow-cts-dev am: f127404330 am: 3231b4ca1c am: 627d1faff1 | |
| 38ddc6b Merge "Fix bugs regarding CTS fails for VP8 codec with low performance" into lollipop-mr1-cts-dev am: 3d9381b5f9 am: 7410ffbe21 am: 8a017dc88a am: 8575f8995d am: b2de036e3b am: a4f15c619b am: 79dae3ced2 | |
| 79dae3c Merge "Fix bugs regarding CTS fails for VP8 codec with low performance" into lollipop-mr1-cts-dev am: 3d9381b5f9 am: 7410ffbe21 am: 8a017dc88a am: 8575f8995d am: b2de036e3b am: a4f15c619b | |
| 9474f0f Merge "Media tests should use redirector.gvt1.com" into marshmallow-cts-dev am: 11932dad29 am: 9be7520e64 am: 21692b5ff0 am: bcaec77565 | |
| bcaec77 Merge "Media tests should use redirector.gvt1.com" into marshmallow-cts-dev am: 11932dad29 am: 9be7520e64 am: 21692b5ff0 | |
| c55af07 Merge "Fix testSetPreviewTextureBothCallbacks wait timeout" into marshmallow-cts-dev am: ceff2940f4 am: efb60623a2 am: 1287e36c8d am: bffd3ad0cf | |
| bffd3ad Merge "Fix testSetPreviewTextureBothCallbacks wait timeout" into marshmallow-cts-dev am: ceff2940f4 am: efb60623a2 am: 1287e36c8d | |
| fa404d7 Merge "Change an attribute name from layout_box to ctsv_layout_box." into cw-e-dev am: f262b0e381 | |
| f262b0e Merge "Change an attribute name from layout_box to ctsv_layout_box." into cw-e-dev | |
| 4d93a0e Change an attribute name from layout_box to ctsv_layout_box. | |
| 6d20f86 Merge "Selectively delete files from the sdcard" into marshmallow-cts-dev am: 2a2c06e583 am: b69e36ace5 am: 917d65495b am: 64fe747b36 | |
| 64fe747 Merge "Selectively delete files from the sdcard" into marshmallow-cts-dev am: 2a2c06e583 am: b69e36ace5 am: 917d65495b | |
| 36e143f Merge "Add FileSystemPermissionTest exception for /dev/dri/renderD129." into marshmallow-cts-dev am: dcd7934387 am: 147d9b83c7 am: a147433f43 am: 36d5a0772d | |
| 36d5a07 Merge "Add FileSystemPermissionTest exception for /dev/dri/renderD129." into marshmallow-cts-dev am: dcd7934387 am: 147d9b83c7 am: a147433f43 | |
| 04f65ba Bump CTS 6.0R3 for Security Releases. am: 15dbbfab8b am: 6dd6876fee am: fbf06a6094 | |
| fbf06a6 Bump CTS 6.0R3 for Security Releases. am: 15dbbfab8b am: 6dd6876fee | |
| 70fc008 Revert "Add build number into CTS Verifier." am: dd58e481b0 am: 4175e96920 am: 02028da190 | |
| 02028da Revert "Add build number into CTS Verifier." am: dd58e481b0 am: 4175e96920 | |
| fa50194 Merge "CTS: PO tests for DISALLOW_CONFIG_VPN" into marshmallow-cts-dev am: 865c2f206b am: e1c3b60895 am: cdeb73f30b am: 180d83ebc8 | |
| 180d83e Merge "CTS: PO tests for DISALLOW_CONFIG_VPN" into marshmallow-cts-dev am: 865c2f206b am: e1c3b60895 am: cdeb73f30b | |
| 69fe09b Merge "Revert "Revert "CTS: Tests for DISALLOW_CONFIG_VPN""" into marshmallow-cts-dev am: a928b53b06 am: aa03ed198b am: 1e3c356762 am: 833868b5e0 | |
| 833868b Merge "Revert "Revert "CTS: Tests for DISALLOW_CONFIG_VPN""" into marshmallow-cts-dev am: a928b53b06 am: aa03ed198b am: 1e3c356762 | |
| 5048b7f Merge commit \'845e32c6c1d3ec2d4fcdc08ad6e4e49663ec7018\' into manual_merge_845e32c6c1 am: fdc22a795d am: 7069f77c95 am: 501c31e442 | |
| 501c31e Merge commit \'845e32c6c1d3ec2d4fcdc08ad6e4e49663ec7018\' into manual_merge_845e32c6c1 am: fdc22a795d am: 7069f77c95 | |
| 065743e Merge "Revert "DO NOT MERGE: Fix Bitmap and NinePatch drawable tests for non-mdpi devices"" into marshmallow-cts-dev am: 3d84f4f5e2 -s ours am: 4e88667cce am: a9036d5973 am: 1574a173f9 | |
| 1574a17 Merge "Revert "DO NOT MERGE: Fix Bitmap and NinePatch drawable tests for non-mdpi devices"" into marshmallow-cts-dev am: 3d84f4f5e2 -s ours am: 4e88667cce am: a9036d5973 | |
| 16f2c28 Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a am: 29e4a3bedf am: 8a27d7aab3 am: c2114b471d am: c36419080e am: a9abb916f5 am: 96bb88c274 am: b2561e7cf4 am: c16242429e am: dee2733f7d am: a700c60aa2 am: 58e13630f9 | |
| 58e1363 Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a am: 29e4a3bedf am: 8a27d7aab3 am: c2114b471d am: c36419080e am: a9abb916f5 am: 96bb88c274 am: b2561e7cf4 am: c16242429e am: dee2733f7d am: a700c60aa2 | |
| 0e5981f Merge "Revert "CTS: Tests for DISALLOW_CONFIG_VPN"" into marshmallow-cts-dev am: 67d39dc603 am: eed7e988cd am: 7b0e0d9871 am: 48e5b54a3e | |
| 48e5b54 Merge "Revert "CTS: Tests for DISALLOW_CONFIG_VPN"" into marshmallow-cts-dev am: 67d39dc603 am: eed7e988cd am: 7b0e0d9871 | |
| d0d1e7d Merge "DO NOT MERGE media: add mpeg4 qcif test to VideoDecoderPerfTest." into marshmallow-cts-dev am: d9efe7ad69 -s ours am: 1295860cc4 am: 108a509683 am: 7a44253e66 | |
| 28bcd76 Merge "Adjust telecom setup timeout values to be more generous" into marshmallow-cts-dev am: 113e063967 am: 634f4bb07a am: c79ac4591a am: 241684a428 | |
| e20bcbe Merge "CTS Verifier fix latency estimation for Loopback test" into marshmallow-cts-dev am: 90a18e9974 am: 9b8e0bc99d am: 738d64f6c7 am: d7bab33be5 | |
| a6f0d08 Merge "media: DecoderTest: make sure we call AudioTrack.stop()" into marshmallow-cts-dev am: c600e14564 am: 92c77216ca am: d63af2521f am: b7e8aa3bfc | |
| 1252eef Merge "Add FileSystemPermissionTest exception for DRM-based GPU drivers." into marshmallow-cts-dev am: 153d57e312 am: 812739b3ed am: d458df54f5 am: a553ea386f | |
| 337b70f Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/cts into mnc-ub-dev | |
| 7bcf6a5 Merge "Skip assist CTS tests on low ram devices" into marshmallow-cts-dev am: b8a3542cb6 am: 346f603555 am: ff8586ecb9 am: 6524500b11 | |
| dfa70fc Merge "Skip assist CTS tests on low ram devices" into marshmallow-cts-dev am: b8a3542cb6 am: 346f603555 am: ff8586ecb9 am: 6524500b11 | |
| 1030056 Merge "CTS: Tests for DISALLOW_CONFIG_VPN" into marshmallow-cts-dev am: 668b86b642 am: afed23029b am: e15411fef7 am: a46b03af36 | |
| 6941880 Merge "Runtime hint for android.adminhostside CTS test" into marshmallow-cts-dev am: 2ea49fcb72 am: 6e428d5944 am: c973aeebf0 am: a7553da755 | |
| c3a4dcc Merge "Fix the issue in testCalculateLength" into marshmallow-cts-dev am: 842dc6f9a1 am: cbcdf86bcd am: cdbd5e403a am: 3d1593bb83 | |
| 32efe85 Merge "Camera: skip unsupported stream combination" into marshmallow-cts-dev am: fd3744e698 am: 837d080baa am: 11d0034659 am: ca6bd44b9b | |
| 66a21b2 Merge "Update 320dpi & 360dpi small/normal memory requirements" into marshmallow-cts-dev am: 9dcf6c22c6 am: 9ab687bbb8 am: 21a1f5f01c am: 92d940afc0 | |
| bd600fa Merge "camera2: Clean up render script context" into marshmallow-cts-dev am: 6339786e6d am: 154a2bf8f1 am: e6f37514e6 am: 86db5c55db | |
| f508e4b Merge "DO NOT MERGE: Fix Bitmap and NinePatch drawable tests for non-mdpi devices" into marshmallow-cts-dev am: fc3bb206d4 -s ours am: f8257b2be8 am: dd50ade04f am: 45b6c5c3b5 | |
| 1e41523 Merge "Use FLAG_RECEIVER_FOREGROUND for ordered broadcasts" into marshmallow-cts-dev am: 4f0c862eba am: 6d7f541688 am: 0c670b405f am: 61c937b50f | |
| 8bc633e Merge "media: Add volatile to mThreadStarted to make sure the thread can stop properly." into marshmallow-cts-dev am: b358cbfe8b am: 62310b9918 am: c5139d9b7b am: d636fb8c6d | |
| ab8837f Merge "Fix timeout for testCanInstallValidRsaKeypair in hostsidetests" into marshmallow-cts-dev am: 7f1cd78501 am: e026066b3a am: 5965676a42 am: 59f409c20d | |
| 741f78c Merge "Refactoring the updatePassButton methods" into marshmallow-cts-dev am: 0fb4da0212 am: d284431258 am: 5f4766704c am: 0caa5d1bc4 | |
| 6c3a826 Merge "Added location tests for BYOD in cts-verfier." into marshmallow-cts-dev am: d9d90a75d9 am: 890b0dd13d am: f171422333 am: 3d2ed85d88 | |
| a7f776a Merge "Fix android.os.cts.SeccompTest#testKernelBasicTests under Android Native Bridge." into marshmallow-cts-dev am: b10d15a525 am: bca1c46872 am: 8be5d4edc0 am: fb3682fe8c | |
| 9d25913 Merge "EncodeDecodeTest: use timeout for decoder.dequeueInputBuffer" into marshmallow-cts-dev am: 6b33b0add8 am: 5a854f3083 am: 70e20db093 am: cc3a3a95ad | |
| df3a267 Merge "Don\'t run Wifi scan timestamp tests when location is turned off." into marshmallow-cts-dev am: 57031aa47e am: a4e71a5304 am: 9bfb43c08f am: 3b7e1623b3 | |
| 380b597 Merge "remove TYPE_ORIENTATION sensor requirement." into marshmallow-cts-dev am: 6a54530ce3 am: 8cbe5a1120 am: 9256959176 am: 0e03f166bb | |
| ee27cbc Merge "Relieve Sensor Event Gap Test Criterion" into marshmallow-cts-dev am: 15853f5dcb am: 299095c410 am: 9693eeacdb am: 92e598a1f3 | |
| 0da1dfa Merge "Make AES*CipherTest explicitly use Android Keystore Provider." into marshmallow-cts-dev am: 3ea94e9bc4 am: cc79c8942b am: f82199a424 am: da1cb74b29 | |
| da4b7c2 Merge "Remove a cross-profile app linking test." into marshmallow-cts-dev am: 4cc519da7f am: 34e8f24ced am: c87b260d08 am: 5d6e80cb92 | |
| 7a44253 Merge "DO NOT MERGE media: add mpeg4 qcif test to VideoDecoderPerfTest." into marshmallow-cts-dev am: d9efe7ad69 -s ours am: 1295860cc4 am: 108a509683 | |
| 241684a Merge "Adjust telecom setup timeout values to be more generous" into marshmallow-cts-dev am: 113e063967 am: 634f4bb07a am: c79ac4591a | |
| d7bab33 Merge "CTS Verifier fix latency estimation for Loopback test" into marshmallow-cts-dev am: 90a18e9974 am: 9b8e0bc99d am: 738d64f6c7 | |
| b7e8aa3 Merge "media: DecoderTest: make sure we call AudioTrack.stop()" into marshmallow-cts-dev am: c600e14564 am: 92c77216ca am: d63af2521f | |
| a553ea3 Merge "Add FileSystemPermissionTest exception for DRM-based GPU drivers." into marshmallow-cts-dev am: 153d57e312 am: 812739b3ed am: d458df54f5 | |
| 6524500 Merge "Skip assist CTS tests on low ram devices" into marshmallow-cts-dev am: b8a3542cb6 am: 346f603555 am: ff8586ecb9 | |
| a46b03a Merge "CTS: Tests for DISALLOW_CONFIG_VPN" into marshmallow-cts-dev am: 668b86b642 am: afed23029b am: e15411fef7 | |
| a7553da Merge "Runtime hint for android.adminhostside CTS test" into marshmallow-cts-dev am: 2ea49fcb72 am: 6e428d5944 am: c973aeebf0 | |
| 3d1593bb Merge "Fix the issue in testCalculateLength" into marshmallow-cts-dev am: 842dc6f9a1 am: cbcdf86bcd am: cdbd5e403a | |
| ca6bd44 Merge "Camera: skip unsupported stream combination" into marshmallow-cts-dev am: fd3744e698 am: 837d080baa am: 11d0034659 | |
| 92d940a Merge "Update 320dpi & 360dpi small/normal memory requirements" into marshmallow-cts-dev am: 9dcf6c22c6 am: 9ab687bbb8 am: 21a1f5f01c | |
| 86db5c5 Merge "camera2: Clean up render script context" into marshmallow-cts-dev am: 6339786e6d am: 154a2bf8f1 am: e6f37514e6 | |
| 45b6c5c Merge "DO NOT MERGE: Fix Bitmap and NinePatch drawable tests for non-mdpi devices" into marshmallow-cts-dev am: fc3bb206d4 -s ours am: f8257b2be8 am: dd50ade04f | |
| 61c937b Merge "Use FLAG_RECEIVER_FOREGROUND for ordered broadcasts" into marshmallow-cts-dev am: 4f0c862eba am: 6d7f541688 am: 0c670b405f | |
| d636fb8c Merge "media: Add volatile to mThreadStarted to make sure the thread can stop properly." into marshmallow-cts-dev am: b358cbfe8b am: 62310b9918 am: c5139d9b7b | |
| 59f409c Merge "Fix timeout for testCanInstallValidRsaKeypair in hostsidetests" into marshmallow-cts-dev am: 7f1cd78501 am: e026066b3a am: 5965676a42 | |
| 0caa5d1 Merge "Refactoring the updatePassButton methods" into marshmallow-cts-dev am: 0fb4da0212 am: d284431258 am: 5f4766704c | |
| 3d2ed85 Merge "Added location tests for BYOD in cts-verfier." into marshmallow-cts-dev am: d9d90a75d9 am: 890b0dd13d am: f171422333 | |
| fb3682f Merge "Fix android.os.cts.SeccompTest#testKernelBasicTests under Android Native Bridge." into marshmallow-cts-dev am: b10d15a525 am: bca1c46872 am: 8be5d4edc0 | |
| cc3a3a9 Merge "EncodeDecodeTest: use timeout for decoder.dequeueInputBuffer" into marshmallow-cts-dev am: 6b33b0add8 am: 5a854f3083 am: 70e20db093 | |
| 3b7e162 Merge "Don\'t run Wifi scan timestamp tests when location is turned off." into marshmallow-cts-dev am: 57031aa47e am: a4e71a5304 am: 9bfb43c08f | |
| 0e03f16 Merge "remove TYPE_ORIENTATION sensor requirement." into marshmallow-cts-dev am: 6a54530ce3 am: 8cbe5a1120 am: 9256959176 | |
| 92e598a Merge "Relieve Sensor Event Gap Test Criterion" into marshmallow-cts-dev am: 15853f5dcb am: 299095c410 am: 9693eeacdb | |
| da1cb74 Merge "Make AES*CipherTest explicitly use Android Keystore Provider." into marshmallow-cts-dev am: 3ea94e9bc4 am: cc79c8942b am: f82199a424 | |
| 5d6e80c Merge "Remove a cross-profile app linking test." into marshmallow-cts-dev am: 4cc519da7f am: 34e8f24ced am: c87b260d08 | |
| a62abd1 Merge "Dynamically load the list of runtime permissions." into marshmallow-cts-dev am: ee2729e3af am: adcf4cad1c am: d1666cd056 am: b07b5f175c | |
| b07b5f1 Merge "Dynamically load the list of runtime permissions." into marshmallow-cts-dev am: ee2729e3af am: adcf4cad1c am: d1666cd056 | |
| 5583e7a Merge "Add a build for CTS Verifier framework library." into marshmallow-cts-dev am: 11ec8ef692 am: 3794510f52 am: 3c0a17566f am: 5a80d98161 | |
| 5a80d98 Merge "Add a build for CTS Verifier framework library." into marshmallow-cts-dev am: 11ec8ef692 am: 3794510f52 am: 3c0a17566f | |
| f45cf0c Merge "TIF: Make sure that Cursor.moveToNext() is called before using Cursor" into marshmallow-cts-dev am: 7275f1f3e8 am: 5ec45a8527 am: 96005e1d86 am: 4d3c74f585 | |
| 4d3c74f Merge "TIF: Make sure that Cursor.moveToNext() is called before using Cursor" into marshmallow-cts-dev am: 7275f1f3e8 am: 5ec45a8527 am: 96005e1d86 | |
| 0c912a7 Merge "Fix for Idle Mode Constraint test" into marshmallow-cts-dev am: 24da8dba7b am: 620ca9ee85 am: 165d828eda am: 346ac3d86c | |
| 346ac3d Merge "Fix for Idle Mode Constraint test" into marshmallow-cts-dev am: 24da8dba7b am: 620ca9ee85 am: 165d828eda | |
| 1b43736 Explicitly fail when test file is missing | |
| 0feb934 Merge "removing android.security.cts.ServicePermissionsTest#testDumpProtected from knownfailures" into marshmallow-cts-dev am: 4f978f8a35 am: 8e441d75cd am: 7006810c93 am: f3855e2ac3 | |
| 8e1ad65 Merge "DO NOT MERGE: Remove DeadObjectException from dumpservice failure condition." into marshmallow-cts-dev am: db790aa7a7 -s ours am: b4449ed4ee am: ee6dc83395 am: 1d0a2193ae | |
| f3855e2 Merge "removing android.security.cts.ServicePermissionsTest#testDumpProtected from knownfailures" into marshmallow-cts-dev am: 4f978f8a35 am: 8e441d75cd am: 7006810c93 | |
| 1d0a219 Merge "DO NOT MERGE: Remove DeadObjectException from dumpservice failure condition." into marshmallow-cts-dev am: db790aa7a7 -s ours am: b4449ed4ee am: ee6dc83395 | |
| b60ab30 Merge "Revert "Camera: mark testFocusDistanceControl known failure"" into marshmallow-cts-dev am: 6f314234ad am: 784ff552fa am: e9475c7c5a am: 56ccc9ba4b | |
| 56ccc9b Merge "Revert "Camera: mark testFocusDistanceControl known failure"" into marshmallow-cts-dev am: 6f314234ad am: 784ff552fa am: e9475c7c5a | |
| 3701c7c Merge "disable a bunch of test failures for CTS 6.0R2" into marshmallow-cts-dev am: ce931517cf am: ac3911bcbc am: 0cbc5fb8d9 am: eea505eb8e | |
| eea505e Merge "disable a bunch of test failures for CTS 6.0R2" into marshmallow-cts-dev am: ce931517cf am: ac3911bcbc am: 0cbc5fb8d9 | |
| f2e5669 Merge "Camera: mark testFocusDistanceControl known failure" into marshmallow-cts-dev am: a22cea93e9 am: cde77b727e am: 9038d7682a am: 52c0737697 | |
| 52c0737 Merge "Camera: mark testFocusDistanceControl known failure" into marshmallow-cts-dev am: a22cea93e9 am: cde77b727e am: 9038d7682a | |
| 0f66b0a Merge "Revert "DO NOT MERGE CTS device-side preconditions for MNC"" into marshmallow-cts-dev am: 9c3c69817a -s ours am: 9f7ae7b5e4 am: 734775ead8 am: 95c86bdded | |
| 10cdb66 Merge "Revert "DO NOT MERGE CTS host-side preconditions for MNC"" into marshmallow-cts-dev am: b9ac18d7a2 -s ours am: 25947fc8ad am: 36a0d009ff am: 0043015e5b | |
| 95c86bd Merge "Revert "DO NOT MERGE CTS device-side preconditions for MNC"" into marshmallow-cts-dev am: 9c3c69817a -s ours am: 9f7ae7b5e4 am: 734775ead8 | |
| 0043015 Merge "Revert "DO NOT MERGE CTS host-side preconditions for MNC"" into marshmallow-cts-dev am: b9ac18d7a2 -s ours am: 25947fc8ad am: 36a0d009ff | |
| 8ce5454 Merge "Fix bugs regarding TextView layout size with large font scale in ScrollingText" into kitkat-cts-dev am: 54f86cdc66 am: 2cdf6479e0 am: ae71d6268f am: c199dab921 am: 0734828650 am: 56ac7caf69 am: fc7616b515 am: b21a2116c4 am: ed36e478ca am: d53e2d2d11 am: 007172b6f1 am: fd2afc034d | |
| fd2afc0 Merge "Fix bugs regarding TextView layout size with large font scale in ScrollingText" into kitkat-cts-dev am: 54f86cdc66 am: 2cdf6479e0 am: ae71d6268f am: c199dab921 am: 0734828650 am: 56ac7caf69 am: fc7616b515 am: b21a2116c4 am: ed36e478ca am: d53e2d2d11 am: 007172b6f1 | |
| 45de28e Merge "DO NOT MERGE: Fix testVirtualDisplayRecycles fail for no thread racing protection for mNumTextureUpdated" into lollipop-cts-dev am: 3f0bc4502b -s ours am: 3d594391ac am: 16bb8c76e5 -s ours am: 460c8904b4 am: 234fe8392c am: abb94388be -s ours am: 0cf72418a0 am: 75a580a425 am: b01ca8dbfa | |
| b01ca8d Merge "DO NOT MERGE: Fix testVirtualDisplayRecycles fail for no thread racing protection for mNumTextureUpdated" into lollipop-cts-dev am: 3f0bc4502b -s ours am: 3d594391ac am: 16bb8c76e5 -s ours am: 460c8904b4 am: 234fe8392c am: abb94388be -s ours am: 0cf72418a0 am: 75a580a425 | |
| f004aee Merge "Fixed break #2" into kitkat-cts-dev am: 9053806660 -s ours am: cad57ae53f am: ca1ed7e779 am: 497751de92 am: 3dd9583a57 am: 5e77afceaa am: 1fcb7b5ac6 am: a9bcb2103e am: 980efdf981 am: b003b55b79 am: c568d09ee4 am: 5dbfb72d6d | |
| 5dbfb72 Merge "Fixed break #2" into kitkat-cts-dev am: 9053806660 -s ours am: cad57ae53f am: ca1ed7e779 am: 497751de92 am: 3dd9583a57 am: 5e77afceaa am: 1fcb7b5ac6 am: a9bcb2103e am: 980efdf981 am: b003b55b79 am: c568d09ee4 | |
| ec6c617 Merge "DO NOT MERGE: Fixed breakage" into kitkat-cts-dev am: 89a195fa3c -s ours am: e05bb2becf am: 417ffa8c95 am: fa4a4db81d -s ours am: 678fcaf0f7 am: fd6e228df1 -s ours am: cc5cd07ec7 am: b80bf27f2e am: ca9b8d50dd -s ours am: 3fba208ec5 am: 303c980152 am: b84ec736d8 | |
| b84ec73 Merge "DO NOT MERGE: Fixed breakage" into kitkat-cts-dev am: 89a195fa3c -s ours am: e05bb2becf am: 417ffa8c95 am: fa4a4db81d -s ours am: 678fcaf0f7 am: fd6e228df1 -s ours am: cc5cd07ec7 am: b80bf27f2e am: ca9b8d50dd -s ours am: 3fba208ec5 am: 303c980152 | |
| 97b6c24 Merge "DO NOT MERGE: Bumping CTS/CTS Verifier version to CTS 6.0R2." into marshmallow-cts-dev am: 02ef3b38f6 -s ours am: 24b25aafdf am: a25247bee6 am: bb251acb60 | |
| bb251ac Merge "DO NOT MERGE: Bumping CTS/CTS Verifier version to CTS 6.0R2." into marshmallow-cts-dev am: 02ef3b38f6 -s ours am: 24b25aafdf am: a25247bee6 | |
| 171f430 Merge "DO NOT MERGE CTS host-side preconditions for MNC" into marshmallow-cts-dev am: 40c0d8911f -s ours am: dd53911f31 am: 90d1390ce5 am: 29702cb4c0 | |
| 29702cb Merge "DO NOT MERGE CTS host-side preconditions for MNC" into marshmallow-cts-dev am: 40c0d8911f -s ours am: dd53911f31 am: 90d1390ce5 | |
| 843ba68 Merge "DO NOT MERGE CTS device-side preconditions for MNC" into marshmallow-cts-dev am: 4de401fe0d -s ours am: 44523978b4 am: 0d39451068 am: 7acb80e513 | |
| 7acb80e Merge "DO NOT MERGE CTS device-side preconditions for MNC" into marshmallow-cts-dev am: 4de401fe0d -s ours am: 44523978b4 am: 0d39451068 | |
| 296437e Merge "CTS: android.text.method.cts related tests failing" into marshmallow-cts-dev am: ca29aea82c am: 73fdcf2adf am: 289f4fb50d am: 5e166a117b | |
| 5e166a1 Merge "CTS: android.text.method.cts related tests failing" into marshmallow-cts-dev am: ca29aea82c am: 73fdcf2adf am: 289f4fb50d | |
| 817ddc6 Merge "Add reference url to XML reports" into marshmallow-cts-dev am: 4318078f65 am: 889cea6c52 am: 989dc34697 am: eba9aacf98 | |
| eba9aac Merge "Add reference url to XML reports" into marshmallow-cts-dev am: 4318078f65 am: 889cea6c52 am: 989dc34697 | |
| 5539eb9 Merge "DO NOT MERGE: fixed breakages" into lollipop-mr1-cts-dev am: 842be8f7a2 -s ours am: cfdcba2b58 am: 90bbb968a1 am: 6e5f6e27e7 -s ours am: 3322c282fd am: acb962ebda am: 9e6fe47d73 | |
| 9e6fe47 Merge "DO NOT MERGE: fixed breakages" into lollipop-mr1-cts-dev am: 842be8f7a2 -s ours am: cfdcba2b58 am: 90bbb968a1 am: 6e5f6e27e7 -s ours am: 3322c282fd am: acb962ebda | |
| 0734080 Merge "DO NOT MERGE: disable android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay as it fails on nexus 10" into lollipop-mr1-cts-dev am: 0d61990ce0 -s ours am: d6dc24dbc7 am: fbe5db808e am: 3e5dbafc5d -s ours am: e179f1528e am: 03fd9a1c84 am: cf2efdc4b1 | |
| cf2efdc Merge "DO NOT MERGE: disable android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay as it fails on nexus 10" into lollipop-mr1-cts-dev am: 0d61990ce0 -s ours am: d6dc24dbc7 am: fbe5db808e am: 3e5dbafc5d -s ours am: e179f1528e am: 03fd9a1c84 | |
| 4fb2316 Merge "Test for issue #16013164: protect app ops setMode()." into klp-dev am: d87db0f829 am: 85c2298bb1 am: 490c486659 am: 4a350f5746 am: 3afc0fa665 am: b677598d1e am: ddff8ff737 am: bc884dcbec am: d0ad09166a am: 2d4a2aba7f am: 5a8b3770fa | |
| 5a8b377 Merge "Test for issue #16013164: protect app ops setMode()." into klp-dev am: d87db0f829 am: 85c2298bb1 am: 490c486659 am: 4a350f5746 am: 3afc0fa665 am: b677598d1e am: ddff8ff737 am: bc884dcbec am: d0ad09166a am: 2d4a2aba7f | |
| 9056e7d Merge "Revert "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage"" into lollipop-mr1-cts-dev am: 78ba3c4677 -s ours am: 19cf4d69c5 am: c5372ede9c am: 49226d07bf -s ours am: 1ce9ab41b8 am: fb0f421bf6 am: 0030ee1e93 | |
| 0030ee1 Merge "Revert "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage"" into lollipop-mr1-cts-dev am: 78ba3c4677 -s ours am: 19cf4d69c5 am: c5372ede9c am: 49226d07bf -s ours am: 1ce9ab41b8 am: fb0f421bf6 | |
| 17f3c1e Merge "DO NOT MERGE: remove duplicate knownfailures" into lollipop-mr1-cts-dev am: 3f88be15ef -s ours am: 681cdc950d am: 40a50b1bf6 am: 6770e5deda -s ours am: 669174c3b6 am: 742e61bc84 am: 0596890e0b | |
| 9763098 Merge "DO NOT MERGE: fixed build breakage" into lollipop-mr1-cts-dev am: 97a8cc3c24 -s ours am: 7e68f84f72 am: 3a3dbd810f am: 8781815f7c -s ours am: 0ab7a44f64 am: 02f95411b8 am: c6c85b9210 | |
| c4e55b5 Merge "DO NOT MERGE: disable camera2 tests" into lollipop-mr1-cts-dev am: 9ddec62e6a -s ours am: fa186e7877 am: a83b9ec4b7 am: c2e872c7df -s ours am: dc932f3208 am: fd4715567d am: 355cbae7c9 | |
| 605631e Merge "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage" into lollipop-mr1-cts-dev am: c2aef7dce9 -s ours am: f73a030750 am: ae699fc8d5 am: edb1b07ee8 -s ours am: d837fd83a6 am: 543d7125fb am: f1cd94133f | |
| ab9aba9 Merge "Revert "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch""" into lollipop-mr1-cts-dev am: a7ed7d707c -s ours am: a37171db7e am: 5224a8af10 am: c0090c720c -s ours am: 458b1752c2 am: 19cb8b2857 am: 0c5eeca02c | |
| 24dc651 Merge "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch"" into lollipop-mr1-cts-dev am: 99e595fdf7 -s ours am: ec587e37d9 am: 8d81e80d9a am: e6b53e4ce9 -s ours am: 72b71f5fa1 am: 39fe30960d am: 5aad947a8a | |
| 0596890 Merge "DO NOT MERGE: remove duplicate knownfailures" into lollipop-mr1-cts-dev am: 3f88be15ef -s ours am: 681cdc950d am: 40a50b1bf6 am: 6770e5deda -s ours am: 669174c3b6 am: 742e61bc84 | |
| c6c85b9 Merge "DO NOT MERGE: fixed build breakage" into lollipop-mr1-cts-dev am: 97a8cc3c24 -s ours am: 7e68f84f72 am: 3a3dbd810f am: 8781815f7c -s ours am: 0ab7a44f64 am: 02f95411b8 | |
| 355cbae Merge "DO NOT MERGE: disable camera2 tests" into lollipop-mr1-cts-dev am: 9ddec62e6a -s ours am: fa186e7877 am: a83b9ec4b7 am: c2e872c7df -s ours am: dc932f3208 am: fd4715567d | |
| f1cd941 Merge "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage" into lollipop-mr1-cts-dev am: c2aef7dce9 -s ours am: f73a030750 am: ae699fc8d5 am: edb1b07ee8 -s ours am: d837fd83a6 am: 543d7125fb | |
| 0c5eeca Merge "Revert "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch""" into lollipop-mr1-cts-dev am: a7ed7d707c -s ours am: a37171db7e am: 5224a8af10 am: c0090c720c -s ours am: 458b1752c2 am: 19cb8b2857 | |
| 5aad947 Merge "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch"" into lollipop-mr1-cts-dev am: 99e595fdf7 -s ours am: ec587e37d9 am: 8d81e80d9a am: e6b53e4ce9 -s ours am: 72b71f5fa1 am: 39fe30960d | |
| 826e625 Merge "Fix for Frequency Tests to match CDD requirements" into marshmallow-cts-dev am: cb22094bb7 am: c44af58813 am: 87c61e81b9 am: 972df20cd8 | |
| 972df20 Merge "Fix for Frequency Tests to match CDD requirements" into marshmallow-cts-dev am: cb22094bb7 am: c44af58813 am: 87c61e81b9 | |
| 3b226f4 Merge "Update the build version to 6.0.1." into marshmallow-cts-dev am: a5df6e2e80 am: 8ef336e140 am: 46ab834c4d am: 553111c91b | |
| 553111c Merge "Update the build version to 6.0.1." into marshmallow-cts-dev am: a5df6e2e80 am: 8ef336e140 am: 46ab834c4d | |
| 68c85f0 Merge "DO NOT MERGE Fix CTS failures on AudioFlingerBinderTest for case where remote submix audio HAL is not included test_setMasterMute test_setMasterVolume" into mnc-dev am: 2d69f4688e am: ae6b48d442 am: 8b8a3bf767 | |
| 8b8a3bf Merge "DO NOT MERGE Fix CTS failures on AudioFlingerBinderTest for case where remote submix audio HAL is not included test_setMasterMute test_setMasterVolume" into mnc-dev am: 2d69f4688e am: ae6b48d442 | |
| 613ffd5 Merge "Revert "DO NOT MERGE ANYWHERE: mark known failure camera tests"" into marshmallow-cts-dev am: c4ade203c7 -s ours am: 629c116137 -s ours am: 8cd4eb58c3 -s ours am: 899555e16b -s ours | |
| 899555e Merge "Revert "DO NOT MERGE ANYWHERE: mark known failure camera tests"" into marshmallow-cts-dev am: c4ade203c7 -s ours am: 629c116137 -s ours am: 8cd4eb58c3 -s ours | |
| 05d553c Merge "DO NOT MERGE ANYWHERE: mark known failure camera tests" into marshmallow-cts-dev am: 2111d51659 -s ours am: c6e71faef4 -s ours am: c0256314df -s ours am: 0829e3348e -s ours | |
| 0829e33 Merge "DO NOT MERGE ANYWHERE: mark known failure camera tests" into marshmallow-cts-dev am: 2111d51659 -s ours am: c6e71faef4 -s ours am: c0256314df -s ours | |
| afe1284 Merge "DO NOT MERGE ANYWHERE: bumping CTS 5.1 to R4" into lollipop-mr1-cts-dev am: 0e8212053b -s ours am: 2a72b1b08e -s ours am: c1f6baf9ec -s ours am: ba72ac87a7 -s ours am: e9e56b476b -s ours am: 04d23e6526 -s ours am: c413ca02ab -s ours | |
| ae91638 Merge "Add FEATURE_CAMERA_EXTERNAL to front-facing camera condition" into lollipop-mr1-cts-dev am: 98990c5fe4 am: c77e5aa3d2 am: a002536612 am: 83f87f183c am: 41093f860c am: a19e37ebdd am: 939876f3a9 | |
| 023811d Merge "DO NOT MERGE: Add FEATURE_CAMERA_EXTERNAL to front-facing camera condition" into marshmallow-cts-dev am: 4a889caa51 -s ours am: a07888db26 am: 344d7305fe am: ee8fe6d3c5 | |
| 91c410d Merge "DO NOT MERGE: Disable two multi user tests for TV devices" into lollipop-mr1-cts-dev am: fe0c8f2aaf -s ours am: e82a02d553 am: 683ec675df am: 75b97739ef -s ours am: b5cb7e0157 am: 7e588594ec am: 9d5ea74ad1 | |
| f2b4d4d Merge "DO NOT MERGE: Fix ION memory leak for camera2 testStillPreviewCombination tstcase" into lollipop-mr1-cts-dev am: dcd796b871 -s ours am: 99c0cb2140 am: 3a8037d6b8 am: 34e4be660f -s ours am: 17c058a2ee am: 786b72dfe4 am: 357686eebb | |
| 4becc1d Merge "DO NOT MERGE: Camera: add testAllOutputYUVResolutions back to known failure" into lollipop-mr1-cts-dev am: 6752d39a3b -s ours am: 7692a1005f am: ef025b0604 am: 2507720476 -s ours am: e9a611324f am: f8335aa514 am: d18a97cad8 | |
| c413ca0 Merge "DO NOT MERGE ANYWHERE: bumping CTS 5.1 to R4" into lollipop-mr1-cts-dev am: 0e8212053b -s ours am: 2a72b1b08e -s ours am: c1f6baf9ec -s ours am: ba72ac87a7 -s ours am: e9e56b476b -s ours am: 04d23e6526 -s ours | |
| 939876f Merge "Add FEATURE_CAMERA_EXTERNAL to front-facing camera condition" into lollipop-mr1-cts-dev am: 98990c5fe4 am: c77e5aa3d2 am: a002536612 am: 83f87f183c am: 41093f860c am: a19e37ebdd | |
| ee8fe6d Merge "DO NOT MERGE: Add FEATURE_CAMERA_EXTERNAL to front-facing camera condition" into marshmallow-cts-dev am: 4a889caa51 -s ours am: a07888db26 am: 344d7305fe | |
| 9d5ea74 Merge "DO NOT MERGE: Disable two multi user tests for TV devices" into lollipop-mr1-cts-dev am: fe0c8f2aaf -s ours am: e82a02d553 am: 683ec675df am: 75b97739ef -s ours am: b5cb7e0157 am: 7e588594ec | |
| 357686e Merge "DO NOT MERGE: Fix ION memory leak for camera2 testStillPreviewCombination tstcase" into lollipop-mr1-cts-dev am: dcd796b871 -s ours am: 99c0cb2140 am: 3a8037d6b8 am: 34e4be660f -s ours am: 17c058a2ee am: 786b72dfe4 | |
| d18a97c Merge "DO NOT MERGE: Camera: add testAllOutputYUVResolutions back to known failure" into lollipop-mr1-cts-dev am: 6752d39a3b -s ours am: 7692a1005f am: ef025b0604 am: 2507720476 -s ours am: e9a611324f am: f8335aa514 | |
| c8de4c8 Merge "Fix CameraManagerTest logic." into marshmallow-cts-dev am: 7a4b1f97e0 am: b53acd946d am: 3c165229b0 am: 6caa1fa532 | |
| 6caa1fa Merge "Fix CameraManagerTest logic." into marshmallow-cts-dev am: 7a4b1f97e0 am: b53acd946d am: 3c165229b0 | |
| 1e9c143 Merge "CTS: DO tests for DISALLOW_CONFIG_VPN" into marshmallow-cts-dev am: dd2f703e28 am: 045cfb1011 am: 0b1b94583c am: b95d096362 | |
| b95d096 Merge "CTS: DO tests for DISALLOW_CONFIG_VPN" into marshmallow-cts-dev am: dd2f703e28 am: 045cfb1011 am: 0b1b94583c | |
| cecc156 Merge "CTS: Test for sound capture" into marshmallow-cts-dev am: 4b30300ca0 am: dfc649502f am: 29514750e8 am: 62f893551a | |
| 62f8935 Merge "CTS: Test for sound capture" into marshmallow-cts-dev am: 4b30300ca0 am: dfc649502f am: 29514750e8 | |
| 6a05862 Merge "Increase wait timeout for ContextWrapperTest" into marshmallow-cts-dev am: baaa70bbdd am: 1e8c735d83 am: 201f50eeb3 am: dd108232a9 | |
| dd10823 Merge "Increase wait timeout for ContextWrapperTest" into marshmallow-cts-dev am: baaa70bbdd am: 1e8c735d83 am: 201f50eeb3 | |
| acd48f3 Merge "Change CTS verifier HifiUltrasound Tests text to be consistent with CDD text" into marshmallow-cts-dev am: 56e9aebc59 am: 02e4fd2d77 am: bcf83a8d08 am: b636ba3d66 | |
| b636ba3 Merge "Change CTS verifier HifiUltrasound Tests text to be consistent with CDD text" into marshmallow-cts-dev am: 56e9aebc59 am: 02e4fd2d77 am: bcf83a8d08 | |
| dbf8682 Merge "add get_achievable_rates.py under cts-media tools" into marshmallow-cts-dev am: 4e0bf59401 am: af9e742727 am: c956983884 am: 9a1792bab4 | |
| 9a1792b Merge "add get_achievable_rates.py under cts-media tools" into marshmallow-cts-dev am: 4e0bf59401 am: af9e742727 am: c956983884 | |
| 2017422 Merge "CTS verifier issue "Screen Pinning Test will fail"" into marshmallow-cts-dev am: f82f2e8031 am: d4476841c6 am: 8bb152cc69 am: 524fd8c35c | |
| 524fd8c Merge "CTS verifier issue "Screen Pinning Test will fail"" into marshmallow-cts-dev am: f82f2e8031 am: d4476841c6 am: 8bb152cc69 | |
| c3348eb Merge "Camera: allow FULLHD_ALT in jpeg sizes" into marshmallow-cts-dev am: 1f8716504d am: 066ff634e0 am: 4faeeea5a4 am: 1e45365dff | |
| 1e45365 Merge "Camera: allow FULLHD_ALT in jpeg sizes" into marshmallow-cts-dev am: 1f8716504d am: 066ff634e0 am: 4faeeea5a4 | |
| 37ee055 Merge "cts: Skip encodeDecode tests when there is no needed encoder" into marshmallow-cts-dev am: 05d50e377e am: 050410d08c am: b757eb50b9 am: d83b49246c | |
| 0e14f47 Merge "TIF: Make sure that Cursor.moveToNext() is called before using Cursor" into lollipop-mr1-cts-dev am: f143e2cec9 am: 0c04dc907b am: 0534b90566 am: ece74522cb am: 18fef1d105 am: 32c9afc438 am: a3552b58ea | |
| d83b492 Merge "cts: Skip encodeDecode tests when there is no needed encoder" into marshmallow-cts-dev am: 05d50e377e am: 050410d08c am: b757eb50b9 | |
| a3552b5 Merge "TIF: Make sure that Cursor.moveToNext() is called before using Cursor" into lollipop-mr1-cts-dev am: f143e2cec9 am: 0c04dc907b am: 0534b90566 am: ece74522cb am: 18fef1d105 am: 32c9afc438 | |
| f879a74 Stop android.print tests from executing if the device does not support print. am: d40ad327f5 am: f47289a95a | |
| f47289a Stop android.print tests from executing if the device does not support print. am: d40ad327f5 | |
| cc03b90 Merge "MediaMetadataRetrieverTest: add new test to handle overflowed padding." into mnc-dr-dev am: f6e1933ec5 am: 7f3bbe3e38 | |
| 7f3bbe3 Merge "MediaMetadataRetrieverTest: add new test to handle overflowed padding." into mnc-dr-dev am: f6e1933ec5 | |
| 3ab87a3 Merge "resolve merge conflicts of 49daa6e6db to mnc-dev." into mnc-dev am: 3b51079095 am: 4c75e64d29 am: b9453faaac | |
| b9453fa Merge "resolve merge conflicts of 49daa6e6db to mnc-dev." into mnc-dev am: 3b51079095 am: 4c75e64d29 | |
| 8528bfa Merge "DO NOT MERGE Add running time hints to CTS package config" into marshmallow-cts-dev am: 32ffe709ae -s ours am: be983a2e35 am: d567535d39 am: 623ce2a422 | |
| 4056331 Merge "DO NOT MERGE: Adding testConnectivityConstraintExecutes_withMobile to knownfailure list." into marshmallow-cts-dev am: 4709b1cf83 -s ours am: 9005c3ac89 am: 4d1fc3a23c am: 68c65c7e14 | |
| 86cb935 Merge "Adding testConnectivityConstraintExecutes_withMobile to knownfailure list." into mnc-dev am: 3afdf50581 am: a37e4e3f4f am: c074baac62 | |
| ad4245a Merge "DO NOT MERGE CTS version is now 6.0_r1.5" into mnc-dev am: 6f7d88cdf5 am: 43443a458c am: b07bffc872 | |
| 06a665d Merge "DO NOT MERGE Add running time hints to CTS package config" into mnc-dev am: 0e4cf34f73 am: 23c9de03cc am: bf1dcfff89 | |
| 084be70 Merge "Stop android.print tests from executing if the device does not support print." into marshmallow-cts-dev am: 874629ee40 am: 63ee118e89 -s ours am: dfb21fd4fc am: ce9a733702 | |
| 623ce2a Merge "DO NOT MERGE Add running time hints to CTS package config" into marshmallow-cts-dev am: 32ffe709ae -s ours am: be983a2e35 am: d567535d39 | |
| 68c65c7 Merge "DO NOT MERGE: Adding testConnectivityConstraintExecutes_withMobile to knownfailure list." into marshmallow-cts-dev am: 4709b1cf83 -s ours am: 9005c3ac89 am: 4d1fc3a23c | |
| c074baa Merge "Adding testConnectivityConstraintExecutes_withMobile to knownfailure list." into mnc-dev am: 3afdf50581 am: a37e4e3f4f | |
| b07bffc Merge "DO NOT MERGE CTS version is now 6.0_r1.5" into mnc-dev am: 6f7d88cdf5 am: 43443a458c | |
| bf1dcff Merge "DO NOT MERGE Add running time hints to CTS package config" into mnc-dev am: 0e4cf34f73 am: 23c9de03cc | |
| ce9a733 Merge "Stop android.print tests from executing if the device does not support print." into marshmallow-cts-dev am: 874629ee40 am: 63ee118e89 -s ours am: dfb21fd4fc | |
| 54775fa Merge "AudioRecordTest: Remove assert check on cold input start time" into marshmallow-cts-dev am: 1273b567c9 am: 37ae3d05a9 am: cdc018c6b9 am: 0ea500dfa1 | |
| 0ea500d Merge "AudioRecordTest: Remove assert check on cold input start time" into marshmallow-cts-dev am: 1273b567c9 am: 37ae3d05a9 am: cdc018c6b9 | |
| 68c1c15 Merge "Restrict telephony.cts.CellInfoTest to Devices with FEATURE_TELEPHONY" into marshmallow-cts-dev am: e98f4d9913 am: 0bdf105827 am: 6ec48b3c68 am: 225d750fec | |
| 225d750 Merge "Restrict telephony.cts.CellInfoTest to Devices with FEATURE_TELEPHONY" into marshmallow-cts-dev am: e98f4d9913 am: 0bdf105827 am: 6ec48b3c68 | |
| db3b729 Merge remote-tracking branch \'goog/mnc-cts-release\' into HEAD am: 79a816d6c0 am: 676aa1d825 am: 560faf0787 am: d89ddd6e5e | |
| d89ddd6 Merge remote-tracking branch \'goog/mnc-cts-release\' into HEAD am: 79a816d6c0 am: 676aa1d825 am: 560faf0787 | |
| 9f60df4 Merge "Fix SeedTest for landscape" into kitkat-cts-dev am: 2df3fc6bfb am: bad28d516a am: 44c25a44ae am: c28826b915 am: 949e8249c4 am: a12dea8428 am: f234f41b50 am: 49d36c3313 am: 4b2e76b778 am: c53e9d6e23 am: 3caf690073 am: f73135bd94 | |
| 49e885e Merge "Squashed commit of the following:" into kitkat-cts-dev am: 4791dcb0ac am: 4434dae412 am: d51f2f6089 am: a3012f29ae am: 7f14a76e9c am: c9c7b3a5ad am: bfeea01aa2 am: 4d409ca18e am: c90c9307ea am: 5ef197eb7c am: ea04fb8dc8 am: 7be2690c7b | |
| f73135b Merge "Fix SeedTest for landscape" into kitkat-cts-dev am: 2df3fc6bfb am: bad28d516a am: 44c25a44ae am: c28826b915 am: 949e8249c4 am: a12dea8428 am: f234f41b50 am: 49d36c3313 am: 4b2e76b778 am: c53e9d6e23 am: 3caf690073 | |
| 7be2690 Merge "Squashed commit of the following:" into kitkat-cts-dev am: 4791dcb0ac am: 4434dae412 am: d51f2f6089 am: a3012f29ae am: 7f14a76e9c am: c9c7b3a5ad am: bfeea01aa2 am: 4d409ca18e am: c90c9307ea am: 5ef197eb7c am: ea04fb8dc8 | |
| 8c0ea7b Merge "DO NOT MERGE CtsVerifier: Remove failed cases in BYOD Disable NFC beam" into lollipop-mr1-cts-dev am: e771efe6f0 -s ours am: a22efb407b am: e880e62e4b am: e5364a0b3f -s ours am: 074594d613 am: 667762608f am: f2cec9eb09 | |
| f2cec9e Merge "DO NOT MERGE CtsVerifier: Remove failed cases in BYOD Disable NFC beam" into lollipop-mr1-cts-dev am: e771efe6f0 -s ours am: a22efb407b am: e880e62e4b am: e5364a0b3f -s ours am: 074594d613 am: 667762608f | |
| e603322 Merge "testReleaseAfterFlush: extend to audio encoders" into marshmallow-cts-dev am: 5f07bef9a4 am: d67e2c47dc am: 35459b81d7 am: 3835dd89e3 | |
| cdabe09 Merge "testDecodeAfterFlush: extend to audio" into marshmallow-cts-dev am: e138dac7c6 am: f390974749 am: 41b05e7734 am: 027c25e6ec | |
| 3835dd8 Merge "testReleaseAfterFlush: extend to audio encoders" into marshmallow-cts-dev am: 5f07bef9a4 am: d67e2c47dc am: 35459b81d7 | |
| 027c25e Merge "testDecodeAfterFlush: extend to audio" into marshmallow-cts-dev am: e138dac7c6 am: f390974749 am: 41b05e7734 | |
| 776cb0f Merge "media: add mpeg4 qcif test to VideoDecoderPerfTest." into mnc-dr-dev am: f9ffc5c068 am: 8022371a24 | |
| 8022371 Merge "media: add mpeg4 qcif test to VideoDecoderPerfTest." into mnc-dr-dev am: f9ffc5c068 | |
| a798564 am 837e940f: am a06ee83b: am 227b641e: Merge "[PATCH] CTS4.4 : Fix ThemeHostTest#testHoloThemes" into kitkat-cts-dev am: 09f4380657 -s ours am: c17d5c4f3f am: a44564e6c0 am: 3332e427c4 am: ac464002d3 am: bdb5a21038 am: 8e4f86d4bf am: 6f6980ab61 am: 7f356a8017 | |
| 7f356a8 am 837e940f: am a06ee83b: am 227b641e: Merge "[PATCH] CTS4.4 : Fix ThemeHostTest#testHoloThemes" into kitkat-cts-dev am: 09f4380657 -s ours am: c17d5c4f3f am: a44564e6c0 am: 3332e427c4 am: ac464002d3 am: bdb5a21038 am: 8e4f86d4bf am: 6f6980ab61 | |
| 0113a9f Merge "Allow number of supported Bitmap to be greater than 4." into lollipop-mr1-cts-dev am: 9b8e6681df am: 518668280d am: 7158f893b1 am: f7c3e996b3 am: b01e3652c1 am: da2bf35cd0 am: 42b046a5dc | |
| 42b046a Merge "Allow number of supported Bitmap to be greater than 4." into lollipop-mr1-cts-dev am: 9b8e6681df am: 518668280d am: 7158f893b1 am: f7c3e996b3 am: b01e3652c1 am: da2bf35cd0 | |
| 454abb3 am 3a583282: am 791e51a5: Merge "security: Test mediaserver crash against an invalid MIDI file" into mnc-dev am: a9a43ec683 | |
| 3a58328 am 791e51a5: Merge "security: Test mediaserver crash against an invalid MIDI file" into mnc-dev am: a9a43ec683 | |
| ffebd97 Dismiss dialogs during indeterminate progress dialog CTS tests | |
| c44ca9a am eee11422: am 3e41670a: am 79081ef8: resolve merge conflicts of 07b3ebc3d3 to mnc-dev. | |
| eee1142 am 3e41670a: am 79081ef8: resolve merge conflicts of 07b3ebc3d3 to mnc-dev. | |
| f8410e4 am be1deaec: am 349d8d5d: am 3de2d8d1: Merge "In tests tearDown() method, ignore IllegalArgumentException from unregisterReceiver method. Sometimes the tests may have failed to register a receiver. In such cases, trying to unregister it later on in tearDown() is unnec | |
| be1deae am 349d8d5d: am 3de2d8d1: Merge "In tests tearDown() method, ignore IllegalArgumentException from unregisterReceiver method. Sometimes the tests may have failed to register a receiver. In such cases, trying to unregister it later on in tearDown() is unnecessary and so | |
| 4111a14 am 32c25553: am 0c530c71: am 79a41531: Merge "In tests tearDown() method, ignore IllegalArgumentException from unregisterReceiver method. Sometimes the tests may have failed to register a receiver. In such cases, trying to unregister it later on in tearDown() is unnec | |
| 32c2555 am 0c530c71: am 79a41531: Merge "In tests tearDown() method, ignore IllegalArgumentException from unregisterReceiver method. Sometimes the tests may have failed to register a receiver. In such cases, trying to unregister it later on in tearDown() is unnecessary and so | |
| 3655212 am 577215e1: am e1037f5c: am 4fc77824: Merge "Capture Build.VERSION.BASE_OS and Build.VERISON.SECURITY_PATCH" into mnc-dev | |
| 773fded am c593e910: am 9e4a30de: am 27da12ff: Merge "[devicepolicy] More complete test of CaCert API" into marshmallow-cts-dev am: 66963f6780 | |
| 577215e am e1037f5c: am 4fc77824: Merge "Capture Build.VERSION.BASE_OS and Build.VERISON.SECURITY_PATCH" into mnc-dev | |
| c593e91 am 9e4a30de: am 27da12ff: Merge "[devicepolicy] More complete test of CaCert API" into marshmallow-cts-dev am: 66963f6780 | |
| 10fbef2 am 18d25783: am ab90447e: am a8e55d27: Merge "Fix test incompatibilities with Nemo (watch) device." into mnc-dev | |
| 18d2578 am ab90447e: am a8e55d27: Merge "Fix test incompatibilities with Nemo (watch) device." into mnc-dev | |
| 1db5f3c am 3bf15834: am c489dd26: am 29754864: am b078b54e: am feeded47: am 2149e97a: am 4d5913ff: am e95788b7: am 8bc09dfb: am 3a3f33de: am e26185db: am 50c36b9d: (-s ours) Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev | |
| 3bf1583 am c489dd26: am 29754864: am b078b54e: am feeded47: am 2149e97a: am 4d5913ff: am e95788b7: am 8bc09dfb: am 3a3f33de: am e26185db: am 50c36b9d: (-s ours) Merge "Fix testActionNextAndPreviousAtGranularityLineOverTextExtend FAILS" into kitkat-cts-dev | |
| ed166da am 6b1c2d57: am 83adc853: am d5c87339: am e913a7aa: am 79b7ea9f: am cef64655: am 18a2e918: am ff0d56fb: am 71c0d241: Merge "Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080" into lollipop-cts-dev | |
| 6b1c2d5 am 83adc853: am d5c87339: am e913a7aa: am 79b7ea9f: am cef64655: am 18a2e918: am ff0d56fb: am 71c0d241: Merge "Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080" into lollipop-cts-dev | |
| b53b35c am 8232379f: am 50319b00: am af4586a2: Merge "DO NOT MERGE Allow multiple deqp packages per API" into mnc-dev | |
| 8232379 am 50319b00: am af4586a2: Merge "DO NOT MERGE Allow multiple deqp packages per API" into mnc-dev | |
| 303695a am 13199f35: am 42b8cf7b: am 81ce705a: am fef64426: am 900695d5: am 5c078a16: am d767a1ad: am a1694bdc: resolved conflicts for a500fef6 to lmp-dev | |
| 13199f3 am 42b8cf7b: am 81ce705a: am fef64426: am 900695d5: am 5c078a16: am d767a1ad: am a1694bdc: resolved conflicts for a500fef6 to lmp-dev | |
| 3c20b06 am 846b5a26: am 6957863e: am c32d97bf: am 136ce2a4: (-s ours) am 27e4de46: am a98203ea: am 4def5d0c: am b69bdab2: DO NOT MERGE security: Test OOB arbitrary write at AMessage::FromParcel | |
| 846b5a2 am 6957863e: am c32d97bf: am 136ce2a4: (-s ours) am 27e4de46: am a98203ea: am 4def5d0c: am b69bdab2: DO NOT MERGE security: Test OOB arbitrary write at AMessage::FromParcel | |
| 90f9f8c am 9a020374: am d1518b3d: am 17dbb7f5: Merge "Change TextView break strategy to meet Android Wear configuration." into marshmallow-cts-dev am: 109a23c47c | |
| 9a02037 am d1518b3d: am 17dbb7f5: Merge "Change TextView break strategy to meet Android Wear configuration." into marshmallow-cts-dev am: 109a23c47c | |
| a8b78bd am 54e00989: am 4694773f: am 95ce4432: am ddefbc16: (-s ours) am 8ac15a8d: am 2440aa9f: DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch | |
| 54e0098 am 4694773f: am 95ce4432: am ddefbc16: (-s ours) am 8ac15a8d: am 2440aa9f: DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch | |
| ae811a1 am 20dffdac: am 25fb30d0: am 018add7e: Merge "Camera2: fix video stabilization test" into marshmallow-cts-dev am: adfddc122c | |
| 20dffda am 25fb30d0: am 018add7e: Merge "Camera2: fix video stabilization test" into marshmallow-cts-dev am: adfddc122c | |
| a5885bd am bebfeffd: am 9106ad61: am 6aae4fec: Merge "Camera: fix wrong assertion logic" into marshmallow-cts-dev am: b3310a6054 | |
| bebfeff am 9106ad61: am 6aae4fec: Merge "Camera: fix wrong assertion logic" into marshmallow-cts-dev am: b3310a6054 | |
| 897ccd2 am d8b2fd3f: am f86f76f5: am cff8ca06: Merge "MotionEvents must check for invalid sample/pointer counts" into mnc-dev | |
| d8b2fd3 am f86f76f5: am cff8ca06: Merge "MotionEvents must check for invalid sample/pointer counts" into mnc-dev | |
| 0e9275c am 8bf839d8: am 683fd2ae: am 9f6297cb: Merge "security: Test OOB arbitrary write at AMessage::FromParcel" into mnc-dev | |
| 8bf839d am 683fd2ae: am 9f6297cb: Merge "security: Test OOB arbitrary write at AMessage::FromParcel" into mnc-dev | |
| c66b25e am 6e09a821: am 24387fe3: am ee044e19: Merge "Ensure test notification is properly announced" into marshmallow-cts-dev am: fbef4e7b74 | |
| 6e09a82 am 24387fe3: am ee044e19: Merge "Ensure test notification is properly announced" into marshmallow-cts-dev am: fbef4e7b74 | |
| a9c6903 am 68723670: am f10a33c4: am 1280ff8c: am 9bd99641: am bd2b7297: am 069be289: am e3c0afc7: am 1ce773ac: am af173898: (-s ours) am b44e8654: am c0adf1e7: am f2a1ab0c: Merge "Fix CTS 4.4 R4 testHoloTheme test failure." into kitkat-cts-dev | |
| 6872367 am f10a33c4: am 1280ff8c: am 9bd99641: am bd2b7297: am 069be289: am e3c0afc7: am 1ce773ac: am af173898: (-s ours) am b44e8654: am c0adf1e7: am f2a1ab0c: Merge "Fix CTS 4.4 R4 testHoloTheme test failure." into kitkat-cts-dev | |
| 78ce00d am f615040e: am 085bfd71: am 957bc380: Merge "Check whether listening TCP ports are connectable." into mnc-dev | |
| f615040 am 085bfd71: am 957bc380: Merge "Check whether listening TCP ports are connectable." into mnc-dev | |
| 4ecf157 am 58b040d8: am c2b3b295: am 18d88577: am 47ce7aef: am e069293b: am cf6578e7: am d4723dbf: am bac4788a: am 983ea522: Merge "Revert "CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend"" into lollipop-cts-dev | |
| 58b040d am c2b3b295: am 18d88577: am 47ce7aef: am e069293b: am cf6578e7: am d4723dbf: am bac4788a: am 983ea522: Merge "Revert "CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend"" into lollipop-cts-dev | |
| 765bffe am ff0aa1fe: am 094f79aa: am d5e4e53b: Merge "Check for presence of video codec before testPlayHlsStreamWithTimedId3" into mnc-dev | |
| b646457 am e919daba: am b1429034: am ca23438a: CTS verifier issue "Screen Pinning Test will fail" | |
| ff0aa1f am 094f79aa: am d5e4e53b: Merge "Check for presence of video codec before testPlayHlsStreamWithTimedId3" into mnc-dev | |
| e919dab am b1429034: am ca23438a: CTS verifier issue "Screen Pinning Test will fail" | |
| de701e5 am 3538a751: am 7af20ee5: Merge "Use correct context when querying package manager" into mnc-dr-dev | |
| 3538a75 am 7af20ee5: Merge "Use correct context when querying package manager" into mnc-dr-dev | |
| 93c8128 am 5a970dfa: am b809dc20: am 8d991c50: Merge "Camera: improve Image allocation in camera CTS" into marshmallow-cts-dev am: b0f423d161 | |
| 5a970df am b809dc20: am 8d991c50: Merge "Camera: improve Image allocation in camera CTS" into marshmallow-cts-dev am: b0f423d161 | |
| 758b466 am 64c77273: am 675c25a4: am cad62c35: Merge "Refactored "Audio Devices Notifications" and "Audio Routing Notifications" testing into separate Input & Output flavors." into mnc-dev | |
| 64c7727 am 675c25a4: am cad62c35: Merge "Refactored "Audio Devices Notifications" and "Audio Routing Notifications" testing into separate Input & Output flavors." into mnc-dev | |
| 8e19544 am 35712273: am 3b851f05: am b71d0c99: am ca078e2c: (-s ours) am 90a7280a: am ac655fbf: am 34a22121: am ee194cc1: am ac797fec: (-s ours) am 9d26f948: am 33635bc7: am af18aaf5: (-s ours) Merge "DO NOT MERGE: Add MyanmarTest#testCompositionSemantics to known failure lis | |
| 3571227 am 3b851f05: am b71d0c99: am ca078e2c: (-s ours) am 90a7280a: am ac655fbf: am 34a22121: am ee194cc1: am ac797fec: (-s ours) am 9d26f948: am 33635bc7: am af18aaf5: (-s ours) Merge "DO NOT MERGE: Add MyanmarTest#testCompositionSemantics to known failure list" into kitka | |
| b60e47b am c0e18b6e: am 3ee581d1: am 72c75c3a: am 45648544: (-s ours) am 56bc4897: am fb048962: am 40f95e77: am 17766476: am c010d91f: (-s ours) am 714738ed: am 3517c46b: am 76b836f7: (-s ours) Merge "DO NOT MERGE: The new AudioPolicyBinder tests are not yet robust enough to | |
| c0e18b6 am 3ee581d1: am 72c75c3a: am 45648544: (-s ours) am 56bc4897: am fb048962: am 40f95e77: am 17766476: am c010d91f: (-s ours) am 714738ed: am 3517c46b: am 76b836f7: (-s ours) Merge "DO NOT MERGE: The new AudioPolicyBinder tests are not yet robust enough to be added to t | |
| 21c9cdf Fix for LocationModeHighAccuracyTestActivity test. | |
| f08915e am 0b18cdeb: am 8e8e919f: am 0cc23a6a: am 3e15ad06: am 6b3f59b9: am 757fe8f2: am 5614190f: fixed breakage | |
| f7cd1b8 am f2788e71: am b05252e6: am 08087b12: am 1ede82ce: (-s ours) am 2a1c2864: am 40c7873c: am 203f6997: (-s ours) cts: get video size from CamcorderProfile -- DO NOT MERGE | |
| 8daa601 am d3606e90: am af7eebb5: am 719de3d1: am 5f1b8cd2: am e3ce959c: am 9c2d0f2d: am 71fa8dd0: (-s ours) BUG: 23792027 adding android.hardware.cts.helpers.sensorverification.EventOrderingVerificationTest#testSameTimestamp to knownfailure | |
| e673a0b am 373ad7e8: am 0b32abf1: am 91a11f60: am c8087696: am 9293b309: am d4e3a122: am 25360f86: BUG: 23954202 fixed minimum memory to be 1099 | |
| 113e043 am 4aaf534c: am 62f0f83e: am 323850ee: am d2623873: am c2a0993f: am b10b8385: am f6483e84: (-s ours) Add 5-second timeout to testFlacHeapOverflow | |
| 0b18cde am 8e8e919f: am 0cc23a6a: am 3e15ad06: am 6b3f59b9: am 757fe8f2: am 5614190f: fixed breakage | |
| f2788e7 am b05252e6: am 08087b12: am 1ede82ce: (-s ours) am 2a1c2864: am 40c7873c: am 203f6997: (-s ours) cts: get video size from CamcorderProfile -- DO NOT MERGE | |
| d3606e9 am af7eebb5: am 719de3d1: am 5f1b8cd2: am e3ce959c: am 9c2d0f2d: am 71fa8dd0: (-s ours) BUG: 23792027 adding android.hardware.cts.helpers.sensorverification.EventOrderingVerificationTest#testSameTimestamp to knownfailure | |
| 373ad7e am 0b32abf1: am 91a11f60: am c8087696: am 9293b309: am d4e3a122: am 25360f86: BUG: 23954202 fixed minimum memory to be 1099 | |
| 4aaf534 am 62f0f83e: am 323850ee: am d2623873: am c2a0993f: am b10b8385: am f6483e84: (-s ours) Add 5-second timeout to testFlacHeapOverflow | |
| 9d9ad19 am cb264ccc: am 6ff86415: am 22e217ca: am 135f6f58: am f22cfac9: am 1262297f: am 45eca1ea: Remove corrupt test file | |
| 63268d7 am cffa6c60: am a5d534f2: am 8a6eb7b4: am 2b8ca93f: am dcd9634c: am a25d0b97: am a0351d44: (-s ours) merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev | |
| cb264cc am 6ff86415: am 22e217ca: am 135f6f58: am f22cfac9: am 1262297f: am 45eca1ea: Remove corrupt test file | |
| cffa6c6 am a5d534f2: am 8a6eb7b4: am 2b8ca93f: am dcd9634c: am a25d0b97: am a0351d44: (-s ours) merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev | |
| 67dd6ca am e59a1ae7: Merge "DO NOT MERGE Add a common lib for generic view util code." into cw-e-dev | |
| e59a1ae Merge "DO NOT MERGE Add a common lib for generic view util code." into cw-e-dev | |
| 101c6dd am 6f907e31: am e72b30cb: am bfc565ee: disabled protected broadcast | |
| 6f907e3 am e72b30cb: am bfc565ee: disabled protected broadcast | |
| 76e962c am 8ec44acf: am ce281290: am 4329c0d9: am 3c8cf226: am 0747145e: am 4bf70778: am 1eb613e1: am 3ece5ae7: Add whitelists for known address, port, and UID combinations Bug: 19461976 | |
| 8ec44ac am ce281290: am 4329c0d9: am 3c8cf226: am 0747145e: am 4bf70778: am 1eb613e1: am 3ece5ae7: Add whitelists for known address, port, and UID combinations Bug: 19461976 | |
| 3629882 am b57a98fb: am 5b53ffa2: am 82b84430: Fix android.print test to skip when feature is missing | |
| b57a98f am 5b53ffa2: am 82b84430: Fix android.print test to skip when feature is missing | |
| f7eba68 am 95dead2e: am 14031310: am 234ee61d: Merge "Revert "Separating phone and telecom specific protected broadcasts. Bug: 23192492"" into mnc-dev | |
| c046b82 am 42f87352: am d7c43332: am a2f0c32b: Merge "Separating phone and telecom specific protected broadcasts. Bug: 23192492" into mnc-dev | |
| 01b389a am ed93c62e: am 64135299: am a28a1a0f: Merge "Add density requirements for watches" into mnc-dev | |
| 91e3eaa am 70fd1413: am 2fe39380: am e2f3ade8: Merge "Separating phone and telecom specific protected broadcasts. Bug: 23192492" into mnc-dev | |
| d9285c2 am d326f974: am 77106262: am 16b8d829: Merge "Separating phone and telecom specific protected broadcasts. Bug: 23192492" into mnc-dev | |
| f4734b4 am 1de1767e: am a3af85c2: am 6bd17c9a: DO NOT MERGE CTS version is now 6.0_r1 | |
| 812a848 am 942cd4be: am 43d95868: am 88137b33: added back adopthost test removed video encoding test. | |
| b8c7251 am 13531396: am 095129de: am aff671f1: Save expected audio route for speaker tests, but disable for now | |
| af3921f am 52f1d860: am 60912b76: am 944afaa1: Merge "cts: Check for video codec on some MediaRecorder Tests" into mnc-dev | |
| 95dead2 am 14031310: am 234ee61d: Merge "Revert "Separating phone and telecom specific protected broadcasts. Bug: 23192492"" into mnc-dev | |
| 42f8735 am d7c43332: am a2f0c32b: Merge "Separating phone and telecom specific protected broadcasts. Bug: 23192492" into mnc-dev | |
| ed93c62 am 64135299: am a28a1a0f: Merge "Add density requirements for watches" into mnc-dev | |
| 70fd141 am 2fe39380: am e2f3ade8: Merge "Separating phone and telecom specific protected broadcasts. Bug: 23192492" into mnc-dev | |
| d326f97 am 77106262: am 16b8d829: Merge "Separating phone and telecom specific protected broadcasts. Bug: 23192492" into mnc-dev | |
| 1de1767 am a3af85c2: am 6bd17c9a: DO NOT MERGE CTS version is now 6.0_r1 | |
| 942cd4b am 43d95868: am 88137b33: added back adopthost test removed video encoding test. | |
| 1353139 am 095129de: am aff671f1: Save expected audio route for speaker tests, but disable for now | |
| 52f1d86 am 60912b76: am 944afaa1: Merge "cts: Check for video codec on some MediaRecorder Tests" into mnc-dev | |
| 9caa465 am f6c6ad52: am 86def73e: am bc7eb40e: Merge "bug: 21208382" into mnc-dev | |
| f6c6ad5 am 86def73e: am bc7eb40e: Merge "bug: 21208382" into mnc-dev | |
| f525703 am 31250cb5: am 768e11cc: am 41542f7f: Merge "[cts] fix build break" into mnc-dev | |
| cb714da am da9072f5: am 8505afa1: am 93a0bcdb: Merge "BUG: 21262226,23979591,23040468,23144425" into mnc-dev | |
| 31250cb am 768e11cc: am 41542f7f: Merge "[cts] fix build break" into mnc-dev | |
| da9072f am 8505afa1: am 93a0bcdb: Merge "BUG: 21262226,23979591,23040468,23144425" into mnc-dev | |
| 186aa86 am 930a3b23: am c83e9112: am 6ce434c6: Merge "FingerprintBoundKeysTest: secret key should be created before using it" into mnc-dev | |
| 930a3b2 am c83e9112: am 6ce434c6: Merge "FingerprintBoundKeysTest: secret key should be created before using it" into mnc-dev | |
| b980577 am b147d899: am ed47dad0: am 215aca56: Merge "Fix android.text.format.cts.DateUtilsTest#test_getRelativeTimeSpanString" into mnc-dev | |
| b147d89 am ed47dad0: am 215aca56: Merge "Fix android.text.format.cts.DateUtilsTest#test_getRelativeTimeSpanString" into mnc-dev | |
| 252242f am 2fcf8e5f: am 1a33856a: am d28c39a0: Merge "CtsVerifier fixes for devices without headset port." into mnc-dev | |
| 2fcf8e5 am 1a33856a: am d28c39a0: Merge "CtsVerifier fixes for devices without headset port." into mnc-dev | |
| 62902fa am ecd1535a: am deb32732: am f3a0e505: am 5012608d: (-s ours) am d519d714: am 658ea19b: am cf612572: (-s ours) Merge "DO NOT MERGE: Revert "Revert "Fix for ByodFlowTestActivity""" into lollipop-mr1-cts-dev | |
| ecd1535 am deb32732: am f3a0e505: am 5012608d: (-s ours) am d519d714: am 658ea19b: am cf612572: (-s ours) Merge "DO NOT MERGE: Revert "Revert "Fix for ByodFlowTestActivity""" into lollipop-mr1-cts-dev | |
| c8bb277 am 89624149: am 442a77b4: am 1004ed31: resolved conflicts for ed0ccb8a to mnc-dev | |
| 8962414 am 442a77b4: am 1004ed31: resolved conflicts for ed0ccb8a to mnc-dev | |
| cefcf8e am 30c51aa1: am f8b940fe: am b553f3c2: am ec90764f: am 1b331600: am bc84bc01: am 199a3b58: Merge "Revert "Fix for ByodFlowTestActivity"" into lollipop-mr1-cts-dev | |
| 30c51aa am f8b940fe: am b553f3c2: am ec90764f: am 1b331600: am bc84bc01: am 199a3b58: Merge "Revert "Fix for ByodFlowTestActivity"" into lollipop-mr1-cts-dev | |
| 835d557 am 2b5b7dbd: am cada6a6e: am 76076d33: am 6523547b: am dd91b39f: am b5c40071: am 56e36955: am c2869bed: am 5555241f: Merge "fix bug in cts verifier testcase(BYOD Managed Provisioning—camera support cross profile image capture)" into lollipop-cts-dev | |
| 7d23d29 am 80d52bd2: am f0de5c0c: am 2e7fa245: Merge "Revert "CTS test for libmedia OOB write anywhere"" into mnc-dev | |
| 51d90a2 am 8f74508b: am 8b647fe1: am 47dfbd86: am 505ac288: am 60281b88: am a6d1b402: am a1d770a4: Merge "Modify criteria of CTS" into lollipop-mr1-cts-dev | |
| 19df982 am 84f98cd4: am 17281bf1: am 133bb091: am 487a7fb1: am 9e1c149f: am 499c2137: am 2e72fa25: Merge "fix for AutomationTest.testWindowAnimationFrameStats" into lollipop-mr1-cts-dev | |
| d436264 am 623c47bf: am ba68dbab: am fb7183f6: am cea8f44e: am 3f4d57b1: am 582b2fd8: am efc000c4: Merge "Fix for ByodFlowTestActivity" into lollipop-mr1-cts-dev | |
| 2b5b7db am cada6a6e: am 76076d33: am 6523547b: am dd91b39f: am b5c40071: am 56e36955: am c2869bed: am 5555241f: Merge "fix bug in cts verifier testcase(BYOD Managed Provisioning—camera support cross profile image capture)" into lollipop-cts-dev | |
| 80d52bd am f0de5c0c: am 2e7fa245: Merge "Revert "CTS test for libmedia OOB write anywhere"" into mnc-dev | |
| 8f74508 am 8b647fe1: am 47dfbd86: am 505ac288: am 60281b88: am a6d1b402: am a1d770a4: Merge "Modify criteria of CTS" into lollipop-mr1-cts-dev | |
| 84f98cd am 17281bf1: am 133bb091: am 487a7fb1: am 9e1c149f: am 499c2137: am 2e72fa25: Merge "fix for AutomationTest.testWindowAnimationFrameStats" into lollipop-mr1-cts-dev | |
| 623c47b am ba68dbab: am fb7183f6: am cea8f44e: am 3f4d57b1: am 582b2fd8: am efc000c4: Merge "Fix for ByodFlowTestActivity" into lollipop-mr1-cts-dev | |
| 2dfa599 am bcc95112: am 0d5b22fd: am fea2dd30: Merge "camera: skip RecordingTest#testRecordingFromPersistentSurface without encoders" into mnc-dev | |
| bcc9511 am 0d5b22fd: am fea2dd30: Merge "camera: skip RecordingTest#testRecordingFromPersistentSurface without encoders" into mnc-dev | |
| 7245812 am f293ccb8: am efb0ff6e: am 3c973ec4: Merge "Fix CtsVerifier Loopback audio test layout for small round screens" into mnc-dev | |
| 0dbd048 am 9f98f8ca: am e4a98982: am adb8a962: Merge "Fix CtsVerifier Audio Frequency Line test layout for small round screens" into mnc-dev | |
| 2ca90b4 am c5787910: am d49efaa0: am 8329bc6f: Merge "RVCVXCheck temporarily disabled" into mnc-dev | |
| f293ccb am efb0ff6e: am 3c973ec4: Merge "Fix CtsVerifier Loopback audio test layout for small round screens" into mnc-dev | |
| 9f98f8c am e4a98982: am adb8a962: Merge "Fix CtsVerifier Audio Frequency Line test layout for small round screens" into mnc-dev | |
| c578791 am d49efaa0: am 8329bc6f: Merge "RVCVXCheck temporarily disabled" into mnc-dev | |
| 2bce26b am 5c5b5e32: am 9d5d2267: am c3acaaae: Merge "Cheesy fix for flaky notification tests." into mnc-dev | |
| 5c5b5e3 am 9d5d2267: am c3acaaae: Merge "Cheesy fix for flaky notification tests." into mnc-dev | |
| a1836e3 DO NOT MERGE Add a common lib for generic view util code. | |
| 5b4ba9b am 63c12871: am 8c8fff44: am 0a91b05f: Merge "Don\'t use deprecated getNetworkInfo(networkType)" into mnc-dev | |
| 63c1287 am 8c8fff44: am 0a91b05f: Merge "Don\'t use deprecated getNetworkInfo(networkType)" into mnc-dev | |
| 328a8bc am 21c62d42: am 3aff1131: am 720c024f: Merge "[KeyChainTest] All text is now scrollable" into mnc-dev | |
| 21c62d4 am 3aff1131: am 720c024f: Merge "[KeyChainTest] All text is now scrollable" into mnc-dev | |
| 586feed am b704b207: am 10deb183: am 0e9f6c97: Merge "Fix self-test for JitterVerification test case" into mnc-dev | |
| ec732dc am 7a218799: am 7bbbc167: am eaa5ed73: am 48623d65: (-s ours) Merge "DO NOT MERGE - fix compile error from cherry pick due to member method becoming static." into lmp-mr1-ub-dev | |
| b704b20 am 10deb183: am 0e9f6c97: Merge "Fix self-test for JitterVerification test case" into mnc-dev | |
| 7a21879 am 7bbbc167: am eaa5ed73: am 48623d65: (-s ours) Merge "DO NOT MERGE - fix compile error from cherry pick due to member method becoming static." into lmp-mr1-ub-dev | |
| 63b3969 am dbc0389a: am 7795d8e9: am 62f2085b: Merge "Remove duplicate test in WiredHeadsetTest" into mnc-dev | |
| dbc0389 am 7795d8e9: am 62f2085b: Merge "Remove duplicate test in WiredHeadsetTest" into mnc-dev | |
| beb9913 am ddfb7c66: am cd9ff5cd: am f1d16eed: Merge "Fix DrmServer test for devices that don\'t require drmserver" into mnc-dev | |
| ddfb7c6 am cd9ff5cd: am f1d16eed: Merge "Fix DrmServer test for devices that don\'t require drmserver" into mnc-dev | |
| e20798a am f9913ecd: am 001b3793: am 17557def: Merge "Fixed test accessing WebView on devices without WebView." into mnc-dev | |
| f9913ec am 001b3793: am 17557def: Merge "Fixed test accessing WebView on devices without WebView." into mnc-dev | |
| a695604 am fb4bf2c8: am fecad173: am 9e8dfeda: Merge "DO NOT MERGE Only persist metrics reports if test has not failed." into mnc-dev | |
| fb4bf2c am fecad173: am 9e8dfeda: Merge "DO NOT MERGE Only persist metrics reports if test has not failed." into mnc-dev | |
| 8fafeb2 am df4f2629: am a1b4d2de: am 683de4f0: resolved conflicts for 219bfd99 to mnc-dev | |
| df4f262 am a1b4d2de: am 683de4f0: resolved conflicts for 219bfd99 to mnc-dev | |
| 971789b Increased CTS test timeout from 5 sec to 30 sec in ModifyInstallerPackageTest.java | |
| bfa14ee Should use getSupportedVideoSizes() | |
| d3cdb48 am 4f34342c: am e76c5244: am f01dd38e: Merge "Remove CpuFeaturesTest for tlsi" into mnc-dev | |
| 4f34342 am e76c5244: am f01dd38e: Merge "Remove CpuFeaturesTest for tlsi" into mnc-dev | |
| 3e0cdce am ea29a83c: am 0d31f0dd: am 07e35216: am 9cdceae8: am 0884f940: am 5f0ce8e6: am 5baebca9: am f74f6f92: am 01eda9fa: am 3d2f94f5: am 8ad223e5: am 8f92e3e6: Merge "Revert "Changed the size of MockView according to resolution."" into kitkat-cts-dev | |
| ea29a83 am 0d31f0dd: am 07e35216: am 9cdceae8: am 0884f940: am 5f0ce8e6: am 5baebca9: am f74f6f92: am 01eda9fa: am 3d2f94f5: am 8ad223e5: am 8f92e3e6: Merge "Revert "Changed the size of MockView according to resolution."" into kitkat-cts-dev | |
| 86390a3 am 07b78669: am 5755f776: am 7d2f7c07: am 2edaa98e: am bb426427: am d77d1e41: am 436a2749: Merge "Camera: further relax legacy capture latency timeout" into lollipop-mr1-cts-dev | |
| 07b7866 am 5755f776: am 7d2f7c07: am 2edaa98e: am bb426427: am d77d1e41: am 436a2749: Merge "Camera: further relax legacy capture latency timeout" into lollipop-mr1-cts-dev | |
| ffa142c am f56fbd02: am a4d3b283: am 49fe9d6b: am d4ad6875: am de91aaab: am d9c6add8: am c22d3071: am 2fd32ce7: am 0b46699b: am 1154fff7: am e887a765: Merge "Fix AudioPolicyBinderTest test_isStreamActive" into klp-dev | |
| 7238d58 am 7169dccb: am 9562d380: am da92d70c: am 2974e05e: (-s ours) am 806d8cf8: am 6e58e710: am acfb0afb: am 7c2cebce: am 594bdf0d: (-s ours) am dc027495: am 67e32ffc: am d8aada95: (-s ours) Merge "DO NOT MERGE: CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOve | |
| f56fbd0 am a4d3b283: am 49fe9d6b: am d4ad6875: am de91aaab: am d9c6add8: am c22d3071: am 2fd32ce7: am 0b46699b: am 1154fff7: am e887a765: Merge "Fix AudioPolicyBinderTest test_isStreamActive" into klp-dev | |
| 7169dcc am 9562d380: am da92d70c: am 2974e05e: (-s ours) am 806d8cf8: am 6e58e710: am acfb0afb: am 7c2cebce: am 594bdf0d: (-s ours) am dc027495: am 67e32ffc: am d8aada95: (-s ours) Merge "DO NOT MERGE: CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend" | |
| 1aecf6c am e2b233bf: am ff612fc3: am 29ad2629: am 4076177e: (-s ours) am 89820f25: am 67762367: Merge "DO NOT MERGE: fixed breakage" into lmp-mr1-dev | |
| 94acc34 am cc34141d: am 3d5fd62b: am 298fa147: am 656515ce: (-s ours) am 2374e0be: am 761a8543: am 2ac83ca6: am 678ddc9f: Merge "DO NOT MERGE: Test whether mediaserver leaks info across invalid binder calls" into lmp-dev | |
| 377493c am 39e80436: am 5e315a50: am 9d9b4e5e: am 8ee83252: am f79736a4: am 4c00f963: am bdfe21bf: am b969d4e7: am 62c2e665: Merge "CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend" into lollipop-cts-dev | |
| e2b233b am ff612fc3: am 29ad2629: am 4076177e: (-s ours) am 89820f25: am 67762367: Merge "DO NOT MERGE: fixed breakage" into lmp-mr1-dev | |
| cc34141 am 3d5fd62b: am 298fa147: am 656515ce: (-s ours) am 2374e0be: am 761a8543: am 2ac83ca6: am 678ddc9f: Merge "DO NOT MERGE: Test whether mediaserver leaks info across invalid binder calls" into lmp-dev | |
| 39e8043 am 5e315a50: am 9d9b4e5e: am 8ee83252: am f79736a4: am 4c00f963: am bdfe21bf: am b969d4e7: am 62c2e665: Merge "CTS5.1_r2 : Fix testActionNextAndPreviousAtGranularityLineOverTextExtend" into lollipop-cts-dev | |
| ccfe742 am 49f102c3: am 51acc2fb: am 84572b99: am 4abd8b44: am 59e918af: am f2c8a3fc: am df5555bd: am 0fc4d190: Merge "fix compile error from cherry pick." into lmp-dev | |
| dee4764 am 1502c2b4: am d01a0d87: am b926e837: am dd6aa594: (-s ours) am d3df1e16: am 13ed2d5d: am eb5902f4: am 4344e6fe: am c7569287: (-s ours) am f5416e15: am f5d02107: DO NOT MERGE - add more binder tests for AudioFlinger and AudioPolicyService. | |
| 8546d0b am b784ffb6: am 1d8f17dc: am 72148b11: am e41eaaee: (-s ours) am 30e3c6dc: am ac72dac4: resolved conflicts for afb5cd78 to lmp-mr1-dev | |
| bc5459f am a07c6451: am 9e855985: am 13445044: Merge "DO NOT MERGE: Disable two multi user tests for TV devices" into mnc-dev | |
| 49f102c am 51acc2fb: am 84572b99: am 4abd8b44: am 59e918af: am f2c8a3fc: am df5555bd: am 0fc4d190: Merge "fix compile error from cherry pick." into lmp-dev | |
| 1502c2b am d01a0d87: am b926e837: am dd6aa594: (-s ours) am d3df1e16: am 13ed2d5d: am eb5902f4: am 4344e6fe: am c7569287: (-s ours) am f5416e15: am f5d02107: DO NOT MERGE - add more binder tests for AudioFlinger and AudioPolicyService. | |
| b784ffb am 1d8f17dc: am 72148b11: am e41eaaee: (-s ours) am 30e3c6dc: am ac72dac4: resolved conflicts for afb5cd78 to lmp-mr1-dev | |
| a07c645 am 9e855985: am 13445044: Merge "DO NOT MERGE: Disable two multi user tests for TV devices" into mnc-dev | |
| 14b83f5 am 29a45787: am e098e286: am c7c3697c: Merge "Fix flaky AudioTrackTest#testPlayStreamData" into mnc-dev | |
| 29a4578 am e098e286: am c7c3697c: Merge "Fix flaky AudioTrackTest#testPlayStreamData" into mnc-dev | |
| 4699a54 am 3461ba0e: am b5d642de: am f5884922: am 04b01dd3: (-s ours) am 8410ac43: am 05b588ad: am 0975c166: am b9017be7: Merge commit \'b3ef447e82a42e7fe84e6ee81b7f44a07d9345d0\' into HEAD | |
| 3461ba0 am b5d642de: am f5884922: am 04b01dd3: (-s ours) am 8410ac43: am 05b588ad: am 0975c166: am b9017be7: Merge commit \'b3ef447e82a42e7fe84e6ee81b7f44a07d9345d0\' into HEAD | |
| c28a5c1 am 715b2dbb: am 18d861d2: am 9859206d: am 112de5b4: (-s ours) am 78b871c1: am b34cb0d2: am 1b7f247c: am cd475df9: am 594963dd: (-s ours) am d61c8d39: am 4f378d75: cts: get video size from CamcorderProfile -- DO NOT MERGE | |
| f9760d5 am 1a2ccb89: am 679ebbe7: am becc266c: am 9d76ccda: (-s ours) am 5aa0fbf7: am 08c80922: am e38dfdc1: am d21bfade: Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into lmp-dev | |
| 715b2db am 18d861d2: am 9859206d: am 112de5b4: (-s ours) am 78b871c1: am b34cb0d2: am 1b7f247c: am cd475df9: am 594963dd: (-s ours) am d61c8d39: am 4f378d75: cts: get video size from CamcorderProfile -- DO NOT MERGE | |
| 1a2ccb8 am 679ebbe7: am becc266c: am 9d76ccda: (-s ours) am 5aa0fbf7: am 08c80922: am e38dfdc1: am d21bfade: Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into lmp-dev | |
| 4f4a840 am 6b105cdd: am f3db025b: am 23d0da82: am 6a05e318: (-s ours) am a43574d1: am 329d2bb8: cts: get video size from CamcorderProfile -- DO NOT MERGE | |
| 98db334 am c49f4471: am 7a139c39: am 8d190af1: am f7f57df9: (-s ours) am 2c0c95a4: am fc5b06e1: Merge "BUG: 23792027 adding android.hardware.cts.helpers.sensorverification.EventOrderingVerificationTest#testSameTimestamp to knownfailure" into lmp-mr1-dev | |
| 6b105cd am f3db025b: am 23d0da82: am 6a05e318: (-s ours) am a43574d1: am 329d2bb8: cts: get video size from CamcorderProfile -- DO NOT MERGE | |
| c49f447 am 7a139c39: am 8d190af1: am f7f57df9: (-s ours) am 2c0c95a4: am fc5b06e1: Merge "BUG: 23792027 adding android.hardware.cts.helpers.sensorverification.EventOrderingVerificationTest#testSameTimestamp to knownfailure" into lmp-mr1-dev | |
| 139538f am 4ec037ee: am f1405f03: am b1d19df6: Merge "fixed build breakage" into mnc-dev | |
| ab7c7aa am 847980c0: am 964f513c: am a7a1e010: Merge "Add code to start/stop recording to catch AudioRecord routing notifications." into mnc-dev | |
| 4ec037e am f1405f03: am b1d19df6: Merge "fixed build breakage" into mnc-dev | |
| 847980c am 964f513c: am a7a1e010: Merge "Add code to start/stop recording to catch AudioRecord routing notifications." into mnc-dev | |
| 6290d39 am a170128d: am 9a63227d: am ef7c1697: Merge "A couple of bug fixes in CTS tests: 1. Null pointer bug fixed in VoiceInteraction tests. This fix is for all devices that don\'t support the voice intents. 2. The fix in VoiceSettings is relevant for all android devices (e | |
| a170128 am 9a63227d: am ef7c1697: Merge "A couple of bug fixes in CTS tests: 1. Null pointer bug fixed in VoiceInteraction tests. This fix is for all devices that don\'t support the voice intents. 2. The fix in VoiceSettings is relevant for all android devices (even if they d | |
| b8bc4cd am e0529c2c: am 587fe1bf: am 0906a6e8: Fix merge conflict resolution in e8eded12e2d66c59b8ccb950867d447be67bfb68 | |
| e0529c2 am 587fe1bf: am 0906a6e8: Fix merge conflict resolution in e8eded12e2d66c59b8ccb950867d447be67bfb68 | |
| 3f4cf96 am aa04e28a: am 2a449a6c: am ef151344: Merge "Use default theme for test activities" into mnc-dev | |
| 2792074 am 80893565: am 92d61e59: am ddc86113: am 86842fa7: (-s ours) am dfea6a1f: am 6f9b657c: am 3b59ea03: am dd429123: am 7378587e: (-s ours) am a6387714: am e039c05f: am 885182dd: (-s ours) Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into kitkat-cts- | |
| 91d7fbd am 70fdcb43: am b38ece5a: am 391a9b93: am 7ea0e3de: am e4b7a091: am 9a99de67: Merge "BUG: 23954202 fixed minimum memory to be 1099" into lmp-mr1-dev | |
| 9176cc5 am 91de7b3a: (-s ours) am f644d421: (-s ours) am eee7494a: (-s ours) am 08c19d37: (-s ours) am d50e8dde: (-s ours) am 3f84453c: (-s ours) am fc19d135: (-s ours) am eaba159b: (-s ours) DO NOT MERGE ANYWHERE: fix breakage | |
| fa6c153 am 97836b1e: am 80c60902: am e8eded12: resolved conflicts for 4c7fd94a to mnc-dev | |
| aa04e28 am 2a449a6c: am ef151344: Merge "Use default theme for test activities" into mnc-dev | |
| 8089356 am 92d61e59: am ddc86113: am 86842fa7: (-s ours) am dfea6a1f: am 6f9b657c: am 3b59ea03: am dd429123: am 7378587e: (-s ours) am a6387714: am e039c05f: am 885182dd: (-s ours) Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into kitkat-cts-dev | |
| 70fdcb4 am b38ece5a: am 391a9b93: am 7ea0e3de: am e4b7a091: am 9a99de67: Merge "BUG: 23954202 fixed minimum memory to be 1099" into lmp-mr1-dev | |
| 91de7b3 am f644d421: (-s ours) am eee7494a: (-s ours) am 08c19d37: (-s ours) am d50e8dde: (-s ours) am 3f84453c: (-s ours) am fc19d135: (-s ours) am eaba159b: (-s ours) DO NOT MERGE ANYWHERE: fix breakage | |
| 97836b1 am 80c60902: am e8eded12: resolved conflicts for 4c7fd94a to mnc-dev | |
| 550bbbf am f395e01b: am 665aba8d: am 41c30ae9: am aa76577c: am bdea8d23: am 15c76237: am 6a8db850: am 54c452f2: am 586fb41b: Merge "Should return true if the specified file doesn\'t exist" into lollipop-cts-dev | |
| f395e01 am 665aba8d: am 41c30ae9: am aa76577c: am bdea8d23: am 15c76237: am 6a8db850: am 54c452f2: am 586fb41b: Merge "Should return true if the specified file doesn\'t exist" into lollipop-cts-dev | |
| 39c1152 am 0369452a: (-s ours) am bd623e0a: (-s ours) am 1cf21ab3: (-s ours) am 492536cd: (-s ours) am 3dad896f: (-s ours) am ff397e62: (-s ours) am cc40c023: (-s ours) am 91fe8072: (-s ours) Merge "DO NOT MERGE ANYWHERE:revert and resubmit to lmp-* branches" into lmp-dev | |
| 93aca24 am 7525014b: am 288cbe6b: am 4fca7a54: am d1c3be52: am c4b4f5f1: am 379468d3: resolved conflicts for 07831126 to lmp-mr1-dev | |
| 81633f5 am f2af7417: am ebdce8bd: am 12f72fcd: am ac3885ad: (-s ours) am bcc58bf4: am 8229b21d: am b7da0b8c: am 05447533: am 104f4316: (-s ours) Merge "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch" into lollipop-cts-dev | |
| ddff652 am 8c02f8c3: am 96139bea: am e8e3e726: am 57f44a27: (-s ours) am 8b8da044: am d73116ba: am a9f632ee: am 40629641: am 9e7c72c0: (-s ours) Merge "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch" into jb-dev automerge: e85b1c6 | |
| 4d5348a am 0a7c0d60: am 70dfa834: am c3cc7b91: am ed478294: am 3df162c4: am 880d1d1c: am 18ea82b0: am 3b885659: am 6307e355: Merge "Camera2: Fix waiting for surface size change" into lollipop-cts-dev | |
| ca2600b am 3022573e: am a73f9037: am 051555e4: am 7b9674c0: am b078b024: am c369e54a: am 66a3c178: am 4f300dd8: am 307cd547: Merge "fixed mockview" into kitkat-cts-dev automerge: b7a630f -s ours | |
| 7f9549f am 86b54710: am 790f02b4: am 98bc555c: am 0c180693: am 5c2cafaa: am aca0540b: am b63011af: am 9aa565e2: am db124f73: Merge "Collect smallestScreenWidthDp in CTS" into kitkat-cts-dev automerge: 0dfe152 | |
| fc98bb6 am b40cdfe7: (-s ours) am 0fec806a: (-s ours) am 72240a21: (-s ours) am 4eb97748: (-s ours) am 4ce553d2: (-s ours) am eb0d7931: (-s ours) am 703266a4: (-s ours) am 6b7071ff: (-s ours) am d7b36097: (-s ours) Merge "DO NOT MERGE ANYWHERE: Camera: remove ITS from Lollipop" into lo | |
| 91ffff3 am b8094735: am 048c2941: am d0ad0a0e: am 8059f876: am 39482cfa: am 19a41464: am 6cfe86ad: am 41f66cec: am 43a17442: Merge "Make LauncherApps tests less flakey." into lollipop-cts-dev | |
| 6be449a am 618b28eb: am 37424433: am 1aa32dad: am 1e9f4570: am deddc5d9: am 735a5d42: am 89b888b6: am 2a6218d2: am e7918277: Merge "Should create a decoder from MediaCodecList" into lollipop-cts-dev | |
| 096ff6d am c7aa899b: am edaf9516: am c0eb6857: am 5322db57: am 5dbe7eb9: am b990a22c: am c5372027: am b545ddfd: am 72dc4bc7: Merge "Send broadcasts to the CTS Robot even if it is stopped." into lollipop-cts-dev | |
| 10ce30b am fe510165: am a2803d95: am b7741b8d: am 2f896bf1: (-s ours) am efc9d381: am 8644b3d8: am 550ba396: am 4c53fed0: am f24c7e3a: (-s ours) Merge "DO NOT MERGE: adding 1 more knownfailure" into kitkat-cts-dev automerge: aace927 -s ours | |
| 4b06018 am 437efca9: am 85b1c876: am 4acf678a: am 4820d873: am 0cfa0932: am 8d5bd4c0: resolved conflicts for 15c7e068 to lmp-mr1-dev | |
| 8ba4a09 am 94556cea: am bf6cf0f7: am 80d7e4ab: am 5bd93aed: (-s ours) am 25c13314: am eff5baa6: DO NOT MERGE: resolved conflicts for 85a6998e to lmp-mr1-dev | |
| 1688da2 am f7c56078: am 54fa0bd3: am f13c6f19: am 19d089ae: am d920df01: am d7e29d74: am c9c6452f: am 2f560e8b: am 85cd818f: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 5295dc6 | |
| 954f9f1 am fbcce7cb: am bf4ddcf8: am 7191a2dc: am ec34cbdf: am 841856c4: am 2769a771: am f88b62bc: am 8f997fb6: am 1712bffb: Merge "Revert "Cts test fix for shortcode 48000"" into kitkat-cts-dev automerge: 5e6120e | |
| b3f5d82 am 81402212: am 079ccc12: am b6219edf: am 52f1b6c5: am 63049dce: am afb0b2ff: am 8c40edcd: am 236a3bb7: am 60a61108: Merge "Revert "improve TestVirtualDisplayRecycles to reduce memory usage"" into kitkat-cts-dev automerge: 73c024c | |
| d4f069b am d24bf7e3: am 53a19fce: am 3b9594a1: am 9e30a9cc: am b8d8ab53: am 4c4c2359: am af323b36: am 1ce4e788: am f3dd5ae6: Merge "Fix AudioTrackTest.testGetTimestamp" into kitkat-cts-dev automerge: 61f6182 -s ours | |
| 7e23d52 am cc2dc199: am 10aa8bfa: am 739ec4bd: am 1e22ed85: am ba5b06f2: am 73f22c64: am 0e91df78: am 7a6b05b0: am 6ec683d9: Merge "Revert "fix audio policy service binder security tests."" into kitkat-cts-dev automerge: f394d10 | |
| 5785d95 am ebe629b4: am 2a1943d0: am 4052f090: am 07f43bac: am d3135a77: am f3f1e77d: am 79d96602: am 41ea656e: am 47e02eb6: Merge "Revert "Fix AudioTrackTest.testGetTimestamp"" into kitkat-cts-dev automerge: c59abe4 -s ours | |
| 8ecef43 am 693c418d: am c16428d4: am 6a7a8979: am 7be08fbd: am ce5e6ca9: am a403e7b6: am e72c11ad: am 1044110e: am f1fac19a: Merge "fix audio policy service binder security tests." into kitkat-cts-dev automerge: 6716898 | |
| 6acb0b9 am c99bdbc5: am db38d9d9: am af7a9ea8: am 447d7825: am efdfc651: am 88a44614: am b1b162a8: am 8781d0d9: am a1eb3bfe: Merge "Changed the size of MockView according to resolution." into kitkat-cts-dev automerge: 4a53e93 -s ours | |
| a82fbe5 am d2afb56c: am e81288b5: am 5eaa51b2: am f2f3b301: am f9ed3357: am c0c712fb: am 13ccb595: am 99c8f777: am c9dd7108: Merge "Fix AudioTrackTest.testGetTimestamp" into kitkat-cts-dev automerge: aea6a23 -s ours | |
| 299a994 am 83f51c6e: am 6b047a3c: am 6cf0ec54: am 01173cb8: am 7acc9e66: am 201ba877: am 56d5cd90: am 02c406cf: am 8c948271: Merge "increase wait timeout and reduce dequeue buffer time-out" into kitkat-cts-dev automerge: dcf21f4 -s ours | |
| d3c7856 am 13d92488: am 2c164b35: am 86f0d803: am 15a337f3: am b259be08: am 9eb6f348: am 477644b8: am 240c397b: am e0e957af: Merge "Modify user agent CTS test to (optionally) match new webview user agent." into lollipop-cts-dev | |
| 8203358 am 2558955a: am 163d86b4: am ddb1f6ff: am 385aff27: (-s ours) am 16845326: am f8bae557: am db4c4b40: am 39b31294: am fdfa9769: (-s ours) Merge "DO NOT MERGE: Camera: don\'t always require ZSL template" into lollipop-cts-dev | |
| 10a79fd am d2f4439c: am 67dce453: am a4fd0466: am 3ca5628e: am f43a1577: am 076a77bf: am 247fa4ba: am a79f552d: am 3b0dc26b: Merge "Ensure JobScheduler Connectivity CTS reenables WiFI" into lollipop-cts-dev | |
| 4546f87 am e919aed8: am aa4af40c: am 4ae2205b: am 0299546d: am 1bf25b48: am 8937f196: am 955f4d4e: am 0ab8f2e3: am 950a8988: Merge "CTS test for PingPongRoot vulnerability" into lollipop-cts-dev | |
| a34b290 am 37dbb1fe: am 1a71c7ae: am 937ef8e5: am 268beed2: am 204828b7: am a18febd4: am 55f3df10: am 4db526ff: am d4a695ab: Merge "Fix CTS_5.0_r3 720p_preview/1080p_recording failures b/22467525" into lollipop-cts-dev | |
| ec6154b am 3b2c5f92: am 517c5047: am 2bdac140: am 586cc47b: am f4903c25: am 4396661e: am fe025c64: am b61b387c: am 6ea7b782: Merge "TIF: use term \'3rd-party\' instead of \'third-party\'" into lollipop-cts-dev | |
| e82182f am 6218840d: am 3a359945: am 3063a56c: am 1b1fa21d: am 17d1fcd7: am addebe63: am 6fa1ea7d: am 949baa53: am 0d8dcd5d: Merge "Modified testRecorderCamera() to get camera supported resolution for testing." into kitkat-cts-dev automerge: 52a2733 | |
| cbb865b am cd7bacea: am 80ef0250: am 1e40ced5: am 8b669c38: am e7cdef2b: am 2ccd3e06: am 46b2a3f2: am 6d5089b2: am 7f2984fc: Merge "TIF: use \'TV app\' instead of \'Live Channels\'" into lollipop-cts-dev | |
| 4132928 am 846b38df: am d384df01: am 56a40df6: am b97f8033: am 4b740326: am 0931d0ab: am 98cefc3d: am e961b09b: am 37581fa5: Merge "CtsVerifier: update mPreviewTex in case of mismatch with mFormatView" into jb-mr1.1-cts-dev automerge: db2f7f4 automerge: 8236bcd automerge: 675 | |
| c88e96f am 8b776ba4: am 9ff82d3c: am 59b4c14d: am f8da4ca6: am 5e7165c0: am a39fb369: am 669cd99b: am 42c295fb: am d8302648: Merge "Handling NPE in case of AVC level under 2" into kitkat-cts-dev automerge: d84cacb -s ours | |
| e3a33cd am 19ded948: am 29708e9a: am 169720f6: am cba5b802: am c357576c: am 1cf2f830: am 79de3186: am e954f691: am d6e0ed1c: Merge "Fix CTS verifier camera orientation test." into kitkat-cts-dev automerge: 674617f | |
| bf8285d am 44f31a19: am ccad8c23: am 745603bb: am 70ac3d1d: am b7d528c5: am c750ae1a: am 18ff08ff: am 1922f133: am 424644fc: Merge "Revert "Check for microphone feature in video camera recording tests."" into kitkat-cts-dev automerge: 1f6e28c -s ours | |
| 3c2835b am 602e80a8: am d03a379f: am 6013e4bf: am 73a91a17: am 4aeb772e: am 5bd89711: am 40d0ac25: am 27e476b3: am ef8b550c: Merge "Revert "Update CTS Verifier camera video tests to check for a microphone in camera video recording tests."" into kitkat-cts-dev automerge: 33237 | |
| d06583d am 7b25904e: am a7905174: am ebb571ad: am 548c7761: am 00e9fb1e: am d944510f: am 079c1249: am d8aae7a8: am 43772d1c: Merge "MediaRecorderStressTest: use smallest supported preview size." into kitkat-cts-dev automerge: beaa1c1 | |
| f2abf90 am fcadbb71: am f109c8cf: am 43731772: am 3a52865c: am cfdac039: am aee0d930: am 2844f093: am 6f42f69a: am 557dddb4: Merge "Update CTS Verifier camera video tests to check for a microphone in camera video recording tests." into kitkat-cts-dev automerge: b5b05ae | |
| 18f4f34 am a02b3f30: am 0d99d1c6: am af044b1d: am ee17937a: am b7ab146f: am f8a816b5: am 8ff9c63e: am b740dd12: am a9bb8ed5: Merge "Check for microphone feature in video camera recording tests." into kitkat-cts-dev automerge: 72893be -s ours | |
| fef4e84 am 8f3e57f1: am 6a5b087a: am 69d48946: am 827a6e3d: am cfb702c4: am 107f06fd: am e730759f: am f813d99e: am d2162c81: Merge "Change assertcode of checkSignalStrength in DumpsysHostTest" into lollipop-cts-dev | |
| 7dc3346 am b8902c19: am 4167593f: am ccd2993c: am f2d26716: am 0d97114f: am fba233bd: am 33ad8700: am 1ae833fb: am fde9054e: Merge "Fix bugs regarding AdapterView layout size with large font scale in AdapterViewTest" into jb-mr1.1-cts-dev automerge: ca0d846 automerge: 30e83c0 | |
| e45d4da am fd348fdc: am 9685bf34: am cf39683d: am ed1e3353: am 8ddf96da: am 740d1a4c: am 40a4bbea: am 67a98163: am e866e410: Merge "Revert "Fix android.webkit.cts.WebViewTest#testFindNext seldom fail"" into jb-mr1.1-cts-dev automerge: 7e9df5b automerge: e167a31 automerge: 1aa | |
| 3e6904b am e4597e95: am d00cf61d: am 5a7845a9: am 02ddfd0e: am dbbe8cf0: am 0fce02ed: am a0b6ce93: am 57d56240: am f6b2775e: Merge "Fix CTS build" into lollipop-cts-dev | |
| 18a3938 am 59b9fc4d: am 137e5a79: am c4ea1455: am ab2878a1: am 3036e276: am c1cc1574: am 5e28d329: am 7cf4f71f: am 74338c1e: Merge "Adding 53024, NZC as it does not support report delivery." into kitkat-cts-dev automerge: de56635 | |
| 5a00195 am 070b3f29: am 65eee53a: am a4a5497a: am 74ab3dee: am 456a3cd9: am 160699b4: am c393d23e: am 2e80d597: am 9948dea3: Merge "CtsUiAutomatorTest pinchin/pinout test case: add support for 480X320 pixel solution device. The pinchin/pinout test need the device solution big | |
| 17582da am 44a50651: am 39d3c3a3: am aa2503c1: am 40bbe34a: am 7fce0a78: am 2679e70f: am 320ffd89: am 8a6889c5: am aac28857: Merge "Fix CTS android.provider package testAccountRemovalWithMergedContact_doesNotDeleteContactAndTimestampUpdated seldom fail issue" into jb-mr2-cts- | |
| 087a79e am 60299d9d: am 4fd0c805: am 2b019876: am 7c177381: (-s ours) am a76ed9b1: am 8d5253e6: am 2c0a5ca5: am cfca25f4: am 906578cc: (-s ours) Merge "DO NOT MERGE: Mimmum application memory should be 96MB" into kitkat-cts-dev automerge: 09c6bcf -s ours | |
| 1aae6c3 am e2c58c5e: am 6bc3d631: am 25575111: am 1001a2eb: am 7c7bc46e: am d81ee05f: am 242e7188: am 335d8fd9: am 0ff36b1a: Merge "DEV HACK: cts: increase permitted colour delta" into kitkat-cts-dev automerge: 52948ac | |
| a531b24 am 68a38abb: am 9c936c04: am 47612132: am 169a11f2: am 719e9e6a: am 91e96275: am 824283d1: am cbcf8b89: am dcdb68d6: Merge "Fix android.webkit.cts.WebViewTest#testFindNext seldom fail" into jb-mr1.1-cts-dev automerge: b28682b automerge: 7032ac7 automerge: 3efc0e5 | |
| d9a1ece am 3d932268: (-s ours) am 0d18311f: (-s ours) am 1aaf9fc6: (-s ours) am fb053119: (-s ours) am 6038c48b: (-s ours) am 64b45509: (-s ours) DO NOT MERGE ANYWHERE: Merge commit \'7679e48230a3b2ddb530c6626825fd7bd854bd24\' into manual_merge_7679e482 | |
| 780d0e9 am f7bbd11a: am 0b9e580f: am 24a0917f: am a5a75ba8: (-s ours) am c780fceb: am 5f6ed7e2: am 476f1d7e: am eda58024: am 254071be: (-s ours) DO NOT MERGE: resolved conflicts for c2f0e5e1 to klp-modular-dev | |
| e87bd3d am b5b0a599: am 0925f667: am 82ab7d21: am 151a56b4: am b567892a: am f94cafa6: am 015cad1f: am b97ebb80: resolved conflicts for 451b577d to lmp-dev | |
| 495bd85 am 44ea571d: am 9167842a: am 733361a3: am 0bc740c5: am 5382b13f: am 57fd059e: am c26d5738: am 471bb6bc: am c09bc3f7: Merge "Update lists of OpenMobileCommuticaton operators" into kitkat-cts-dev automerge: 3aac281 | |
| cbe3aa0 am edea62a8: am d2e6a873: am 41545ecf: am 3c718ad3: am 86d5e8ae: am 94de36bf: am 3989d10d: am bc49b46d: am 39e0e012: Merge "Verify the failed test case of CTS for WebView" into kitkat-cts-dev automerge: 7228fac -s ours | |
| 8d1d16f am c9ffd59b: am c4e66b2e: am 3a2a7d87: am 0286316b: am e22e33ae: am 9f94d81e: am 172fd5ee: am 8ab546e3: am e2a23438: Merge "Improve the usability of CTS Verifier "Camera Formats"" into kitkat-cts-dev automerge: f54af35 -s ours | |
| 56e870e am 9ef5cda3: am 28886e99: am 9e45aaac: am b470f709: am 4aabe52f: am 3ef77189: am 2ad28109: am 3f7eeed2: am dbdeb0fb: (-s ours) Merge "Use Supported Camera resolution." into kitkat-cts-dev automerge: 628c43a -s ours | |
| 3066021 am 1260db0f: am 11a0813c: am 62e03d3f: am 65b3c308: am 03b912f2: am e9589df0: am ce43fc90: am 70111464: am 6444b0f4: Merge "Adjust 480p ratio range in CameraVideoActivity.java." into kitkat-cts-dev automerge: c282df3 | |
| 04fbde5 am 39ade5c6: am ea23354c: am 48ce68fa: am af7a3d40: am d3473957: am fcbbb20d: am b414e3bd: am 38c555e6: am 44fed250: Merge "AbiTest: Include QDSP6 ELF binaries in validity check" into kitkat-cts-dev automerge: 639522d -s ours | |
| 477a804 am 289146ff: am 69da035f: am 99481d5c: am 2a831729: am 006c727c: am a09dbb84: am 3493b1c2: am e1d462e3: am e17beccf: Merge "Remove bad test cases from MemoryFileTest." into kitkat-cts-dev automerge: 36db51e | |
| 0369452 am bd623e0a: (-s ours) am 1cf21ab3: (-s ours) am 492536cd: (-s ours) am 3dad896f: (-s ours) am ff397e62: (-s ours) am cc40c023: (-s ours) am 91fe8072: (-s ours) Merge "DO NOT MERGE ANYWHERE:revert and resubmit to lmp-* branches" into lmp-dev | |
| 7525014 am 288cbe6b: am 4fca7a54: am d1c3be52: am c4b4f5f1: am 379468d3: resolved conflicts for 07831126 to lmp-mr1-dev | |
| f2af741 am ebdce8bd: am 12f72fcd: am ac3885ad: (-s ours) am bcc58bf4: am 8229b21d: am b7da0b8c: am 05447533: am 104f4316: (-s ours) Merge "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch" into lollipop-cts-dev | |
| 8c02f8c am 96139bea: am e8e3e726: am 57f44a27: (-s ours) am 8b8da044: am d73116ba: am a9f632ee: am 40629641: am 9e7c72c0: (-s ours) Merge "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch" into jb-dev automerge: e85b1c6 -s ours aut | |
| 0a7c0d6 am 70dfa834: am c3cc7b91: am ed478294: am 3df162c4: am 880d1d1c: am 18ea82b0: am 3b885659: am 6307e355: Merge "Camera2: Fix waiting for surface size change" into lollipop-cts-dev | |
| 3022573 am a73f9037: am 051555e4: am 7b9674c0: am b078b024: am c369e54a: am 66a3c178: am 4f300dd8: am 307cd547: Merge "fixed mockview" into kitkat-cts-dev automerge: b7a630f -s ours | |
| 86b5471 am 790f02b4: am 98bc555c: am 0c180693: am 5c2cafaa: am aca0540b: am b63011af: am 9aa565e2: am db124f73: Merge "Collect smallestScreenWidthDp in CTS" into kitkat-cts-dev automerge: 0dfe152 | |
| b40cdfe am 0fec806a: (-s ours) am 72240a21: (-s ours) am 4eb97748: (-s ours) am 4ce553d2: (-s ours) am eb0d7931: (-s ours) am 703266a4: (-s ours) am 6b7071ff: (-s ours) am d7b36097: (-s ours) Merge "DO NOT MERGE ANYWHERE: Camera: remove ITS from Lollipop" into lollipop-cts-dev | |
| b809473 am 048c2941: am d0ad0a0e: am 8059f876: am 39482cfa: am 19a41464: am 6cfe86ad: am 41f66cec: am 43a17442: Merge "Make LauncherApps tests less flakey." into lollipop-cts-dev | |
| 618b28e am 37424433: am 1aa32dad: am 1e9f4570: am deddc5d9: am 735a5d42: am 89b888b6: am 2a6218d2: am e7918277: Merge "Should create a decoder from MediaCodecList" into lollipop-cts-dev | |
| c7aa899 am edaf9516: am c0eb6857: am 5322db57: am 5dbe7eb9: am b990a22c: am c5372027: am b545ddfd: am 72dc4bc7: Merge "Send broadcasts to the CTS Robot even if it is stopped." into lollipop-cts-dev | |
| fe51016 am a2803d95: am b7741b8d: am 2f896bf1: (-s ours) am efc9d381: am 8644b3d8: am 550ba396: am 4c53fed0: am f24c7e3a: (-s ours) Merge "DO NOT MERGE: adding 1 more knownfailure" into kitkat-cts-dev automerge: aace927 -s ours | |
| 437efca am 85b1c876: am 4acf678a: am 4820d873: am 0cfa0932: am 8d5bd4c0: resolved conflicts for 15c7e068 to lmp-mr1-dev | |
| 94556ce am bf6cf0f7: am 80d7e4ab: am 5bd93aed: (-s ours) am 25c13314: am eff5baa6: DO NOT MERGE: resolved conflicts for 85a6998e to lmp-mr1-dev | |
| f7c5607 am 54fa0bd3: am f13c6f19: am 19d089ae: am d920df01: am d7e29d74: am c9c6452f: am 2f560e8b: am 85cd818f: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 5295dc6 | |
| fbcce7c am bf4ddcf8: am 7191a2dc: am ec34cbdf: am 841856c4: am 2769a771: am f88b62bc: am 8f997fb6: am 1712bffb: Merge "Revert "Cts test fix for shortcode 48000"" into kitkat-cts-dev automerge: 5e6120e | |
| 8140221 am 079ccc12: am b6219edf: am 52f1b6c5: am 63049dce: am afb0b2ff: am 8c40edcd: am 236a3bb7: am 60a61108: Merge "Revert "improve TestVirtualDisplayRecycles to reduce memory usage"" into kitkat-cts-dev automerge: 73c024c | |
| d24bf7e am 53a19fce: am 3b9594a1: am 9e30a9cc: am b8d8ab53: am 4c4c2359: am af323b36: am 1ce4e788: am f3dd5ae6: Merge "Fix AudioTrackTest.testGetTimestamp" into kitkat-cts-dev automerge: 61f6182 -s ours | |
| cc2dc19 am 10aa8bfa: am 739ec4bd: am 1e22ed85: am ba5b06f2: am 73f22c64: am 0e91df78: am 7a6b05b0: am 6ec683d9: Merge "Revert "fix audio policy service binder security tests."" into kitkat-cts-dev automerge: f394d10 | |
| ebe629b am 2a1943d0: am 4052f090: am 07f43bac: am d3135a77: am f3f1e77d: am 79d96602: am 41ea656e: am 47e02eb6: Merge "Revert "Fix AudioTrackTest.testGetTimestamp"" into kitkat-cts-dev automerge: c59abe4 -s ours | |
| 693c418 am c16428d4: am 6a7a8979: am 7be08fbd: am ce5e6ca9: am a403e7b6: am e72c11ad: am 1044110e: am f1fac19a: Merge "fix audio policy service binder security tests." into kitkat-cts-dev automerge: 6716898 | |
| c99bdbc am db38d9d9: am af7a9ea8: am 447d7825: am efdfc651: am 88a44614: am b1b162a8: am 8781d0d9: am a1eb3bfe: Merge "Changed the size of MockView according to resolution." into kitkat-cts-dev automerge: 4a53e93 -s ours | |
| d2afb56 am e81288b5: am 5eaa51b2: am f2f3b301: am f9ed3357: am c0c712fb: am 13ccb595: am 99c8f777: am c9dd7108: Merge "Fix AudioTrackTest.testGetTimestamp" into kitkat-cts-dev automerge: aea6a23 -s ours | |
| 83f51c6 am 6b047a3c: am 6cf0ec54: am 01173cb8: am 7acc9e66: am 201ba877: am 56d5cd90: am 02c406cf: am 8c948271: Merge "increase wait timeout and reduce dequeue buffer time-out" into kitkat-cts-dev automerge: dcf21f4 -s ours | |
| 13d9248 am 2c164b35: am 86f0d803: am 15a337f3: am b259be08: am 9eb6f348: am 477644b8: am 240c397b: am e0e957af: Merge "Modify user agent CTS test to (optionally) match new webview user agent." into lollipop-cts-dev | |
| 2558955 am 163d86b4: am ddb1f6ff: am 385aff27: (-s ours) am 16845326: am f8bae557: am db4c4b40: am 39b31294: am fdfa9769: (-s ours) Merge "DO NOT MERGE: Camera: don\'t always require ZSL template" into lollipop-cts-dev | |
| d2f4439 am 67dce453: am a4fd0466: am 3ca5628e: am f43a1577: am 076a77bf: am 247fa4ba: am a79f552d: am 3b0dc26b: Merge "Ensure JobScheduler Connectivity CTS reenables WiFI" into lollipop-cts-dev | |
| e919aed am aa4af40c: am 4ae2205b: am 0299546d: am 1bf25b48: am 8937f196: am 955f4d4e: am 0ab8f2e3: am 950a8988: Merge "CTS test for PingPongRoot vulnerability" into lollipop-cts-dev | |
| 37dbb1f am 1a71c7ae: am 937ef8e5: am 268beed2: am 204828b7: am a18febd4: am 55f3df10: am 4db526ff: am d4a695ab: Merge "Fix CTS_5.0_r3 720p_preview/1080p_recording failures b/22467525" into lollipop-cts-dev | |
| 3b2c5f9 am 517c5047: am 2bdac140: am 586cc47b: am f4903c25: am 4396661e: am fe025c64: am b61b387c: am 6ea7b782: Merge "TIF: use term \'3rd-party\' instead of \'third-party\'" into lollipop-cts-dev | |
| 6218840 am 3a359945: am 3063a56c: am 1b1fa21d: am 17d1fcd7: am addebe63: am 6fa1ea7d: am 949baa53: am 0d8dcd5d: Merge "Modified testRecorderCamera() to get camera supported resolution for testing." into kitkat-cts-dev automerge: 52a2733 | |
| cd7bace am 80ef0250: am 1e40ced5: am 8b669c38: am e7cdef2b: am 2ccd3e06: am 46b2a3f2: am 6d5089b2: am 7f2984fc: Merge "TIF: use \'TV app\' instead of \'Live Channels\'" into lollipop-cts-dev | |
| 846b38d am d384df01: am 56a40df6: am b97f8033: am 4b740326: am 0931d0ab: am 98cefc3d: am e961b09b: am 37581fa5: Merge "CtsVerifier: update mPreviewTex in case of mismatch with mFormatView" into jb-mr1.1-cts-dev automerge: db2f7f4 automerge: 8236bcd automerge: 675f1cc | |
| 8b776ba am 9ff82d3c: am 59b4c14d: am f8da4ca6: am 5e7165c0: am a39fb369: am 669cd99b: am 42c295fb: am d8302648: Merge "Handling NPE in case of AVC level under 2" into kitkat-cts-dev automerge: d84cacb -s ours | |
| 19ded94 am 29708e9a: am 169720f6: am cba5b802: am c357576c: am 1cf2f830: am 79de3186: am e954f691: am d6e0ed1c: Merge "Fix CTS verifier camera orientation test." into kitkat-cts-dev automerge: 674617f | |
| 44f31a1 am ccad8c23: am 745603bb: am 70ac3d1d: am b7d528c5: am c750ae1a: am 18ff08ff: am 1922f133: am 424644fc: Merge "Revert "Check for microphone feature in video camera recording tests."" into kitkat-cts-dev automerge: 1f6e28c -s ours | |
| 602e80a am d03a379f: am 6013e4bf: am 73a91a17: am 4aeb772e: am 5bd89711: am 40d0ac25: am 27e476b3: am ef8b550c: Merge "Revert "Update CTS Verifier camera video tests to check for a microphone in camera video recording tests."" into kitkat-cts-dev automerge: 3323726 | |
| 7b25904 am a7905174: am ebb571ad: am 548c7761: am 00e9fb1e: am d944510f: am 079c1249: am d8aae7a8: am 43772d1c: Merge "MediaRecorderStressTest: use smallest supported preview size." into kitkat-cts-dev automerge: beaa1c1 | |
| fcadbb7 am f109c8cf: am 43731772: am 3a52865c: am cfdac039: am aee0d930: am 2844f093: am 6f42f69a: am 557dddb4: Merge "Update CTS Verifier camera video tests to check for a microphone in camera video recording tests." into kitkat-cts-dev automerge: b5b05ae | |
| a02b3f3 am 0d99d1c6: am af044b1d: am ee17937a: am b7ab146f: am f8a816b5: am 8ff9c63e: am b740dd12: am a9bb8ed5: Merge "Check for microphone feature in video camera recording tests." into kitkat-cts-dev automerge: 72893be -s ours | |
| 8f3e57f am 6a5b087a: am 69d48946: am 827a6e3d: am cfb702c4: am 107f06fd: am e730759f: am f813d99e: am d2162c81: Merge "Change assertcode of checkSignalStrength in DumpsysHostTest" into lollipop-cts-dev | |
| b8902c1 am 4167593f: am ccd2993c: am f2d26716: am 0d97114f: am fba233bd: am 33ad8700: am 1ae833fb: am fde9054e: Merge "Fix bugs regarding AdapterView layout size with large font scale in AdapterViewTest" into jb-mr1.1-cts-dev automerge: ca0d846 automerge: 30e83c0 automerge: 7 | |
| fd348fd am 9685bf34: am cf39683d: am ed1e3353: am 8ddf96da: am 740d1a4c: am 40a4bbea: am 67a98163: am e866e410: Merge "Revert "Fix android.webkit.cts.WebViewTest#testFindNext seldom fail"" into jb-mr1.1-cts-dev automerge: 7e9df5b automerge: e167a31 automerge: 1aa503c | |
| e4597e9 am d00cf61d: am 5a7845a9: am 02ddfd0e: am dbbe8cf0: am 0fce02ed: am a0b6ce93: am 57d56240: am f6b2775e: Merge "Fix CTS build" into lollipop-cts-dev | |
| 59b9fc4 am 137e5a79: am c4ea1455: am ab2878a1: am 3036e276: am c1cc1574: am 5e28d329: am 7cf4f71f: am 74338c1e: Merge "Adding 53024, NZC as it does not support report delivery." into kitkat-cts-dev automerge: de56635 | |
| 070b3f2 am 65eee53a: am a4a5497a: am 74ab3dee: am 456a3cd9: am 160699b4: am c393d23e: am 2e80d597: am 9948dea3: Merge "CtsUiAutomatorTest pinchin/pinout test case: add support for 480X320 pixel solution device. The pinchin/pinout test need the device solution bigger than ***X | |
| 44a5065 am 39d3c3a3: am aa2503c1: am 40bbe34a: am 7fce0a78: am 2679e70f: am 320ffd89: am 8a6889c5: am aac28857: Merge "Fix CTS android.provider package testAccountRemovalWithMergedContact_doesNotDeleteContactAndTimestampUpdated seldom fail issue" into jb-mr2-cts-dev automerge | |
| 60299d9 am 4fd0c805: am 2b019876: am 7c177381: (-s ours) am a76ed9b1: am 8d5253e6: am 2c0a5ca5: am cfca25f4: am 906578cc: (-s ours) Merge "DO NOT MERGE: Mimmum application memory should be 96MB" into kitkat-cts-dev automerge: 09c6bcf -s ours | |
| e2c58c5 am 6bc3d631: am 25575111: am 1001a2eb: am 7c7bc46e: am d81ee05f: am 242e7188: am 335d8fd9: am 0ff36b1a: Merge "DEV HACK: cts: increase permitted colour delta" into kitkat-cts-dev automerge: 52948ac | |
| 68a38ab am 9c936c04: am 47612132: am 169a11f2: am 719e9e6a: am 91e96275: am 824283d1: am cbcf8b89: am dcdb68d6: Merge "Fix android.webkit.cts.WebViewTest#testFindNext seldom fail" into jb-mr1.1-cts-dev automerge: b28682b automerge: 7032ac7 automerge: 3efc0e5 | |
| 3d93226 am 0d18311f: (-s ours) am 1aaf9fc6: (-s ours) am fb053119: (-s ours) am 6038c48b: (-s ours) am 64b45509: (-s ours) DO NOT MERGE ANYWHERE: Merge commit \'7679e48230a3b2ddb530c6626825fd7bd854bd24\' into manual_merge_7679e482 | |
| f7bbd11 am 0b9e580f: am 24a0917f: am a5a75ba8: (-s ours) am c780fceb: am 5f6ed7e2: am 476f1d7e: am eda58024: am 254071be: (-s ours) DO NOT MERGE: resolved conflicts for c2f0e5e1 to klp-modular-dev | |
| b5b0a59 am 0925f667: am 82ab7d21: am 151a56b4: am b567892a: am f94cafa6: am 015cad1f: am b97ebb80: resolved conflicts for 451b577d to lmp-dev | |
| 44ea571 am 9167842a: am 733361a3: am 0bc740c5: am 5382b13f: am 57fd059e: am c26d5738: am 471bb6bc: am c09bc3f7: Merge "Update lists of OpenMobileCommuticaton operators" into kitkat-cts-dev automerge: 3aac281 | |
| edea62a am d2e6a873: am 41545ecf: am 3c718ad3: am 86d5e8ae: am 94de36bf: am 3989d10d: am bc49b46d: am 39e0e012: Merge "Verify the failed test case of CTS for WebView" into kitkat-cts-dev automerge: 7228fac -s ours | |
| c9ffd59 am c4e66b2e: am 3a2a7d87: am 0286316b: am e22e33ae: am 9f94d81e: am 172fd5ee: am 8ab546e3: am e2a23438: Merge "Improve the usability of CTS Verifier "Camera Formats"" into kitkat-cts-dev automerge: f54af35 -s ours | |
| 9ef5cda am 28886e99: am 9e45aaac: am b470f709: am 4aabe52f: am 3ef77189: am 2ad28109: am 3f7eeed2: am dbdeb0fb: (-s ours) Merge "Use Supported Camera resolution." into kitkat-cts-dev automerge: 628c43a -s ours | |
| 1260db0 am 11a0813c: am 62e03d3f: am 65b3c308: am 03b912f2: am e9589df0: am ce43fc90: am 70111464: am 6444b0f4: Merge "Adjust 480p ratio range in CameraVideoActivity.java." into kitkat-cts-dev automerge: c282df3 | |
| 39ade5c am ea23354c: am 48ce68fa: am af7a3d40: am d3473957: am fcbbb20d: am b414e3bd: am 38c555e6: am 44fed250: Merge "AbiTest: Include QDSP6 ELF binaries in validity check" into kitkat-cts-dev automerge: 639522d -s ours | |
| 289146f am 69da035f: am 99481d5c: am 2a831729: am 006c727c: am a09dbb84: am 3493b1c2: am e1d462e3: am e17beccf: Merge "Remove bad test cases from MemoryFileTest." into kitkat-cts-dev automerge: 36db51e | |
| ecf0580 am ff0f3fbc: am 64028b61: am 64f208f2: am 4d0aa9e7: am 78107f16: Merge commit \'daed62a86ca6803f2f86a0247049e1daef49ac28\' into manual_merge_daed62a8 | |
| ff0f3fb am 64028b61: am 64f208f2: am 4d0aa9e7: am 78107f16: Merge commit \'daed62a86ca6803f2f86a0247049e1daef49ac28\' into manual_merge_daed62a8 | |
| 6b28db4 am f05cc659: am 74e984f4: am 875dc8af: Merge "Increase deqp inactivity timeout to 10 mins" into mnc-dev | |
| f05cc65 am 74e984f4: am 875dc8af: Merge "Increase deqp inactivity timeout to 10 mins" into mnc-dev | |
| 7619ad3 am 176fbe58: am ad6de319: am da983339: Merge "Add tests for large TextView, ScrollView, and WebView." into mnc-dev | |
| 176fbe5 am ad6de319: am da983339: Merge "Add tests for large TextView, ScrollView, and WebView." into mnc-dev | |
| a2b391e am 920c8e23: am 1c33ed52: am 91c45fda: Merge "Improve fairness of Sensor Timestamp Jitter Test" into mnc-dev | |
| 920c8e2 am 1c33ed52: am 91c45fda: Merge "Improve fairness of Sensor Timestamp Jitter Test" into mnc-dev | |
| b9fff60 am 0d431887: am 781a3906: am daba9e0f: am b271617d: (-s ours) Fix build for commit 6018187f | |
| 0d43188 am 781a3906: am daba9e0f: am b271617d: (-s ours) Fix build for commit 6018187f | |
| 8ffcbf6 am 16da4fcc: am a794c051: am 54135811: am b7d72084: am 23be7ed7: am b25f5bab: am ab5f43b7: am b108e0d9: am d449dd5f: am 435d256a: am 62e162af: Test if libstagefright dies in onInputBufferFilled on currupted file | |
| 8b27753 am c5ddbc12: am c90c320c: am 5b380319: am f7b647cc: (-s ours) am c755df5b: am 67a9edde: am d5833ca8: am dffe4621: Merge "DO NOT MERGE - Revert "Revert "Fix AudioTrackTest.testGetTimestamp""" into lmp-dev | |
| 6eb53bc am 1d64975a: am e6b9fe09: am 761691a7: am 27c3f677: am 1c0a370a: am 801f5188: am 12c53ddb: am 0bad9e7c: am d62c086b: Merge "Fix configure check regarding AdaptivePlayback ReconfigDrcTest." into kitkat-cts-dev automerge: 4d7e03f | |
| f92f42c am 22f37c09: am 1e0b7614: am 80bacf4d: am 8f5f1781: am 1f511d2e: am 65dd8578: am 78f6e9ce: am bd766cf1: am 83ca91cd: Merge "improve TestVirtualDisplayRecycles to reduce memory usage" into kitkat-cts-dev automerge: ba39064 | |
| d274dba am d139b956: am 685137de: am d6d6ae22: am 3fa4f2f8: am 4269bccf: am f3ea35b5: am c9ef435f: am baeb930f: am 19b8f3b2: Merge "Fix bugs regarding Camera Video test" into kitkat-cts-dev automerge: 7951d40 | |
| 431e350 am 7036d2e6: am a6429cf4: am aeaee0bd: am 8fa350a6: am 9771e614: am 7e279f7c: am f9e1c1ca: am 3a515cd3: am c8819400: Merge "resolve merge conflicts of 930a3b5 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75 | |
| 43ed73c am 10ac661a: am 780fc391: am 11b4eeb8: am 721ad483: am aa0478ea: am 2c9296aa: am 5ed1f31d: am fbe287ca: am 65fbe1fc: Merge "Chage the timeout while rendering to overcome the low performance device." into kitkat-cts-dev automerge: a6b1e10 -s ours | |
| 98f0386 am 18f8e814: am f8d83d4c: am 1870305f: am 0ab7541d: am 05d5890f: am 1d9dcfd4: am 834b1299: am 58330528: am a6cc0a82: Merge "CTS: Add check for same sensor event timestamp" into lollipop-cts-dev | |
| 16da4fc am a794c051: am 54135811: am b7d72084: am 23be7ed7: am b25f5bab: am ab5f43b7: am b108e0d9: am d449dd5f: am 435d256a: am 62e162af: Test if libstagefright dies in onInputBufferFilled on currupted file | |
| c5ddbc1 am c90c320c: am 5b380319: am f7b647cc: (-s ours) am c755df5b: am 67a9edde: am d5833ca8: am dffe4621: Merge "DO NOT MERGE - Revert "Revert "Fix AudioTrackTest.testGetTimestamp""" into lmp-dev | |
| 1d64975 am e6b9fe09: am 761691a7: am 27c3f677: am 1c0a370a: am 801f5188: am 12c53ddb: am 0bad9e7c: am d62c086b: Merge "Fix configure check regarding AdaptivePlayback ReconfigDrcTest." into kitkat-cts-dev automerge: 4d7e03f | |
| 22f37c0 am 1e0b7614: am 80bacf4d: am 8f5f1781: am 1f511d2e: am 65dd8578: am 78f6e9ce: am bd766cf1: am 83ca91cd: Merge "improve TestVirtualDisplayRecycles to reduce memory usage" into kitkat-cts-dev automerge: ba39064 | |
| d139b95 am 685137de: am d6d6ae22: am 3fa4f2f8: am 4269bccf: am f3ea35b5: am c9ef435f: am baeb930f: am 19b8f3b2: Merge "Fix bugs regarding Camera Video test" into kitkat-cts-dev automerge: 7951d40 | |
| 7036d2e am a6429cf4: am aeaee0bd: am 8fa350a6: am 9771e614: am 7e279f7c: am f9e1c1ca: am 3a515cd3: am c8819400: Merge "resolve merge conflicts of 930a3b5 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75 | |
| 10ac661 am 780fc391: am 11b4eeb8: am 721ad483: am aa0478ea: am 2c9296aa: am 5ed1f31d: am fbe287ca: am 65fbe1fc: Merge "Chage the timeout while rendering to overcome the low performance device." into kitkat-cts-dev automerge: a6b1e10 -s ours | |
| 18f8e81 am f8d83d4c: am 1870305f: am 0ab7541d: am 05d5890f: am 1d9dcfd4: am 834b1299: am 58330528: am a6cc0a82: Merge "CTS: Add check for same sensor event timestamp" into lollipop-cts-dev | |
| 689a884 am 019a786b: am bd8ff570: am 4b4433e6: Merge "cts/tests/tests/security: increase timeout in ClonedSecureRandomTest" into mnc-dev | |
| 019a786 am bd8ff570: am 4b4433e6: Merge "cts/tests/tests/security: increase timeout in ClonedSecureRandomTest" into mnc-dev | |
| e0124ca am d5d8f7b0: am 0b08598e: am f5d466fb: am 6fc214ed: am 5d63d352: am 343f3671: resolved conflicts for 6b782819 to lmp-mr1-dev | |
| d5d8f7b am 0b08598e: am f5d466fb: am 6fc214ed: am 5d63d352: am 343f3671: resolved conflicts for 6b782819 to lmp-mr1-dev | |
| 3100a3b am c2b0c203: am 9fededf5: am 2318465d: am e0fc908c: am 25f00596: am 5ea363f9: am 51c4d118: am c17ae0d7: am 06d53ec1: Merge "Fix CTS android.app package testSetDismissMessage seldom fail issue" into kitkat-cts-dev automerge: 5f7e625 | |
| 909c8b5 am efffeee2: am 467698a0: am f8f3ef8c: am b60d6592: am 851f04d3: am 20675fb2: am 5fe0eaee: am 52aeeb52: am e61db7d3: Merge "Fix android.hardware.camera2.cts.RobustnessTest#testMandatoryOutputCombinations failure." into lollipop-cts-dev | |
| 99b5c02 am a0efabaf: am 5624c7b3: am 6b647a92: am f2b93046: am ccaf2b18: am 2ac7a452: am 9fb26ba7: am 9c6d8dab: am 653f0cd9: Merge "Remove duplicate CTS tests from libcore cts packages." into lollipop-cts-dev | |
| eda9e57 am dda179a2: am 84193803: am 98020a7b: am dd03e8b3: am 6065c2c1: am 1cde67e2: am fc868f0c: am 8c79e6d2: am d3bfe6e9: Merge "Exception in TestAccessHistory tearDown" into lollipop-cts-dev | |
| 3989ba4 am 46c295eb: am 4a32a1dc: am 3a4bf2c3: am 254b5144: am 137e681b: am c81feb8a: am f5e4c96d: am 9d4ae826: am 306cf947: Merge "Fix race condition in testSendOrderedBroadcast1" into lollipop-cts-dev | |
| e89aa93 am 1152257f: am b14f1311: am 9da2b685: am 0ebafd88: am bafe141c: am e9acb081: am 45778c1d: am 54ddcfb2: am 1fa98e8a: Merge "Changed the value TEST_TIME_OUT from 5000 to 10000." into lollipop-cts-dev | |
| 82bb1b5 am 5eb6b743: am a448bf8f: am 38a248ca: am c2c6a441: am 39f73105: am 9e2a0079: am 62e59219: am 3e354050: am 9576ae86: Merge "Fix for failing test of testEOS because checksum takes too long" into jb-mr2-cts-dev automerge: a00f78c automerge: 37f4b54 -s ours | |
| 497426a am efcd65e8: am 88ed1a8a: am 03eb85b4: am d0e6536c: am cd76983e: am 8850bf3e: am 4fab34db: am 185dc031: am d5716c83: Merge "CTS: Add test for JNI class-loading" into lollipop-cts-dev | |
| 5874b09 am dab4ebdc: am e2e0a71e: am 5a13d92e: am 1ca18a35: am e946d61a: am 2cbc624d: am abe4571b: am dd9c9939: am 633928fc: Merge "Lookup private resources in run-time" into kitkat-cts-dev automerge: ac8f57e | |
| ed337b7 am e3345bc2: am 5b45ec8c: am 70779238: am 6851aa36: am 9e787d47: am 4c9a67c6: am be979228: am 13b5095a: am 6e8f6a77: Merge "Fix bugs regarding ShortCodeTest that fails without "112" in ECC List." into kitkat-cts-dev automerge: 8fcd728 -s ours | |
| d259ae8 am 8742048c: am ea1ffda2: am b85fad0b: am 3ec43f18: am 577b2cd8: am 6738c33a: am 21abb843: am 9585f9ca: am c507bc6e: Merge "Sleep between write and read in EventLogTest" into lollipop-cts-dev | |
| 32a39ff am ba05ab69: am ab59cf0e: am 85874ecb: am 3b6a3e92: am a5096064: am 4e167519: am 985ab652: am e6af3f8e: am 809b7f9b: Merge "set delay during testPerformFiltering" into kitkat-cts-dev automerge: 73965a8 | |
| f4536cd am 78d7d60d: am fdc7d194: am 7fdb4b19: am 357f2eea: am 152da67b: am c76e0e70: am 1428fbba: am f2f32342: am a6a52864: Merge "Check for valid buffer size before proceeding with testCreateAudioRecord." into kitkat-cts-dev automerge: 16763e6 | |
| c2b0c20 am 9fededf5: am 2318465d: am e0fc908c: am 25f00596: am 5ea363f9: am 51c4d118: am c17ae0d7: am 06d53ec1: Merge "Fix CTS android.app package testSetDismissMessage seldom fail issue" into kitkat-cts-dev automerge: 5f7e625 | |
| efffeee am 467698a0: am f8f3ef8c: am b60d6592: am 851f04d3: am 20675fb2: am 5fe0eaee: am 52aeeb52: am e61db7d3: Merge "Fix android.hardware.camera2.cts.RobustnessTest#testMandatoryOutputCombinations failure." into lollipop-cts-dev | |
| a0efaba am 5624c7b3: am 6b647a92: am f2b93046: am ccaf2b18: am 2ac7a452: am 9fb26ba7: am 9c6d8dab: am 653f0cd9: Merge "Remove duplicate CTS tests from libcore cts packages." into lollipop-cts-dev | |
| dda179a am 84193803: am 98020a7b: am dd03e8b3: am 6065c2c1: am 1cde67e2: am fc868f0c: am 8c79e6d2: am d3bfe6e9: Merge "Exception in TestAccessHistory tearDown" into lollipop-cts-dev | |
| 46c295e am 4a32a1dc: am 3a4bf2c3: am 254b5144: am 137e681b: am c81feb8a: am f5e4c96d: am 9d4ae826: am 306cf947: Merge "Fix race condition in testSendOrderedBroadcast1" into lollipop-cts-dev | |
| 1152257 am b14f1311: am 9da2b685: am 0ebafd88: am bafe141c: am e9acb081: am 45778c1d: am 54ddcfb2: am 1fa98e8a: Merge "Changed the value TEST_TIME_OUT from 5000 to 10000." into lollipop-cts-dev | |
| 5eb6b74 am a448bf8f: am 38a248ca: am c2c6a441: am 39f73105: am 9e2a0079: am 62e59219: am 3e354050: am 9576ae86: Merge "Fix for failing test of testEOS because checksum takes too long" into jb-mr2-cts-dev automerge: a00f78c automerge: 37f4b54 -s ours | |
| efcd65e am 88ed1a8a: am 03eb85b4: am d0e6536c: am cd76983e: am 8850bf3e: am 4fab34db: am 185dc031: am d5716c83: Merge "CTS: Add test for JNI class-loading" into lollipop-cts-dev | |
| dab4ebd am e2e0a71e: am 5a13d92e: am 1ca18a35: am e946d61a: am 2cbc624d: am abe4571b: am dd9c9939: am 633928fc: Merge "Lookup private resources in run-time" into kitkat-cts-dev automerge: ac8f57e | |
| e3345bc am 5b45ec8c: am 70779238: am 6851aa36: am 9e787d47: am 4c9a67c6: am be979228: am 13b5095a: am 6e8f6a77: Merge "Fix bugs regarding ShortCodeTest that fails without "112" in ECC List." into kitkat-cts-dev automerge: 8fcd728 -s ours | |
| 8742048 am ea1ffda2: am b85fad0b: am 3ec43f18: am 577b2cd8: am 6738c33a: am 21abb843: am 9585f9ca: am c507bc6e: Merge "Sleep between write and read in EventLogTest" into lollipop-cts-dev | |
| ba05ab6 am ab59cf0e: am 85874ecb: am 3b6a3e92: am a5096064: am 4e167519: am 985ab652: am e6af3f8e: am 809b7f9b: Merge "set delay during testPerformFiltering" into kitkat-cts-dev automerge: 73965a8 | |
| 78d7d60 am fdc7d194: am 7fdb4b19: am 357f2eea: am 152da67b: am c76e0e70: am 1428fbba: am f2f32342: am a6a52864: Merge "Check for valid buffer size before proceeding with testCreateAudioRecord." into kitkat-cts-dev automerge: 16763e6 | |
| 54d776e am 6e841fa5: am 57b778a7: am a7fcde9c: am 43608070: am 2aaeb74e: am bb75771e: resolved conflicts for 50d071ae to lmp-mr1-dev | |
| 6e841fa am 57b778a7: am a7fcde9c: am 43608070: am 2aaeb74e: am bb75771e: resolved conflicts for 50d071ae to lmp-mr1-dev | |
| 387d6f8 am c00d3fbd: am 93064a7c: am 9b454727: am 70a541c6: am f46b0b4f: am 9351dc40: am 1c886754: am a8dbf0d0: am a55bf067: Merge "Make non-clickable item not focusable" into lollipop-cts-dev | |
| 88ff7c4 am bd3f258e: am 87b8fee2: am adfecbbf: am b78c057c: am d1b66025: am e3fcbefe: am 182bb54f: am 2de9b9d2: am ea2805de: Merge "Change FRAMEDROP_TOLERANCE value when upper 15MP camera size." into lollipop-cts-dev | |
| 448e90e am 656f21d4: am 7d11ef60: am 856de232: am fe003d49: am c412101e: am 98149a1f: am b8cde03b: am 6d54adae: am f9ffa901: Merge "Removing launcher tests from knownfailures" into lollipop-cts-dev | |
| d7a4098 am 4b9b49f2: am db2e5187: am 6bcd33f3: am e939be86: (-s ours) am 034388a3: am 7b94b84a: am 146de78c: am d5225f3f: am de95b4ba: (-s ours) Merge "[DO NOT MERGE] Fix ActivityManagerTest#testGetRunningAppProcesses" into lollipop-cts-dev | |
| 9168e25 am 68bd6dcb: am 97c8cf62: am 69a8277a: am c9ef51db: am 85858789: am df6399ec: am 1fc2d9bb: am 343a7f01: am 25afa649: Merge "Add CTS for MediaController.Callback" into lollipop-cts-dev | |
| 77137b7 am 2087b8ba: am 846dac22: am 4a46fcf3: am ed2e9131: am a0d2bc9f: am ef10accc: am 0e353da8: am fa487921: am df8cb6d1: Merge "Camera: fix time measuring logic" into lollipop-cts-dev | |
| 672a9cc am ea0fecb1: am cdb88823: am 35304084: am ab185f92: am a629f8ef: am d1e56632: am c2aaa543: am ff0c4ab6: am 3b077c29: Merge "CtsVerifier: Camera FOV: cap FOV test to 120 degree" into lollipop-cts-dev | |
| 099b1c5 am 8c287d73: am 93eff4a8: am 1a76036d: am 1f5c0f39: am d43b604a: am c24e0207: resolved conflicts for 03f41fc7 to lmp-mr1-dev | |
| 5d4f3b6 am 9c19b302: am 8bd4a856: am 804ef687: am a476cbd9: am c25d8b9c: am 502b837b: resolved conflicts for b5499ef5 to lmp-mr1-dev | |
| c00d3fb am 93064a7c: am 9b454727: am 70a541c6: am f46b0b4f: am 9351dc40: am 1c886754: am a8dbf0d0: am a55bf067: Merge "Make non-clickable item not focusable" into lollipop-cts-dev | |
| bd3f258 am 87b8fee2: am adfecbbf: am b78c057c: am d1b66025: am e3fcbefe: am 182bb54f: am 2de9b9d2: am ea2805de: Merge "Change FRAMEDROP_TOLERANCE value when upper 15MP camera size." into lollipop-cts-dev | |
| 656f21d am 7d11ef60: am 856de232: am fe003d49: am c412101e: am 98149a1f: am b8cde03b: am 6d54adae: am f9ffa901: Merge "Removing launcher tests from knownfailures" into lollipop-cts-dev | |
| 4b9b49f am db2e5187: am 6bcd33f3: am e939be86: (-s ours) am 034388a3: am 7b94b84a: am 146de78c: am d5225f3f: am de95b4ba: (-s ours) Merge "[DO NOT MERGE] Fix ActivityManagerTest#testGetRunningAppProcesses" into lollipop-cts-dev | |
| 68bd6dc am 97c8cf62: am 69a8277a: am c9ef51db: am 85858789: am df6399ec: am 1fc2d9bb: am 343a7f01: am 25afa649: Merge "Add CTS for MediaController.Callback" into lollipop-cts-dev | |
| 2087b8b am 846dac22: am 4a46fcf3: am ed2e9131: am a0d2bc9f: am ef10accc: am 0e353da8: am fa487921: am df8cb6d1: Merge "Camera: fix time measuring logic" into lollipop-cts-dev | |
| ea0fecb am cdb88823: am 35304084: am ab185f92: am a629f8ef: am d1e56632: am c2aaa543: am ff0c4ab6: am 3b077c29: Merge "CtsVerifier: Camera FOV: cap FOV test to 120 degree" into lollipop-cts-dev | |
| 8c287d7 am 93eff4a8: am 1a76036d: am 1f5c0f39: am d43b604a: am c24e0207: resolved conflicts for 03f41fc7 to lmp-mr1-dev | |
| 9c19b30 am 8bd4a856: am 804ef687: am a476cbd9: am c25d8b9c: am 502b837b: resolved conflicts for b5499ef5 to lmp-mr1-dev | |
| a7cd792 am 6a3e1aa8: am 2cc1ed5f: am c577631e: Merge "add more binder tests for AudioFlinger and AudioPolicyService." into mnc-dev | |
| 6a3e1aa am 2cc1ed5f: am c577631e: Merge "add more binder tests for AudioFlinger and AudioPolicyService." into mnc-dev | |
| b03e5b1 am 05fe4249: am 9511d64b: am 16ea5a03: Merge "media: don\'t fail the test if encoder is still active." into mnc-dev | |
| 05fe424 am 9511d64b: am 16ea5a03: Merge "media: don\'t fail the test if encoder is still active." into mnc-dev | |
| c35d9fd am 135b0873: am e1f785e3: am 5496c88b: am 8cc5f1ae: am f3513456: am 5a6823b5: am d47f0c37: am d95836ae: am 79d97606: Merge "CtsDeviceVideoPerf: limit bitrate to main or baseline profiles" into lollipop-cts-dev | |
| 9f66b12 am b668cba8: am 3dfd42a9: am 3da256af: am 50858f99: am 451fb15a: am ed1b9b16: am 20503b03: am 82cd5e5c: am 81e14f4e: Merge "CTS: Fix memory leak in RSBlendTest loop." into kitkat-cts-dev automerge: e062486 -s ours | |
| 6a9f3b1 am c6773148: am 10e95a50: am a77a7b03: am d5122706: am cce94f99: am db88ffb3: am 52f65bd8: am 86cc8140: am 23c49fbf: Merge "AppSecurityTests: Do not delete in WhiteLists." into kitkat-cts-dev automerge: ac79e25 | |
| 05d4eb0 am 68a038b5: am 763888bf: am 39edfddd: am 4b21ed39: am 2a2a703f: am 9797f393: am 2cdc65f5: am cdad0572: am eb4eb9e9: Merge "Revert "Modify user agent CTS test to match new webview user agent string."" into lollipop-cts-dev | |
| 5de1b84 am fd50a1cc: am 1826a4b9: am c3dd8a9b: am b28ea107: am 5fd98c40: am 76ddde6b: am c80863be: am e7b7f417: am c304eedd: Merge "Revert "Cts test fix for shortcode 48000"" into lollipop-cts-dev | |
| 017b2b7 am 32d5f1d2: am c1e56fe1: am e9a9ced8: am 7aaf0a68: am e99cf6e5: am 07eaa81a: am 752a6964: am 025bd02c: am 87a13283: Merge "fix incorrection assumption due to DST" into lollipop-cts-dev | |
| 568fa21 am bcfe3c65: am 606895bf: am f489a65c: am 2496b217: am 3009899a: am 7f75869d: am 4d32e370: am 0e753a86: am df91c971: Merge "Fix com.android.cts.monkey.VerbosityTest#testVerbosity seldom fail" into lollipop-cts-dev | |
| 57772c1 am 8a2050ac: am 8a3e65ae: am 6d53e245: am 812fccf2: am 69139353: am e16977e4: resolved conflicts for 2dbf3b3a to lmp-mr1-dev | |
| d9292e6 am adb21932: am 740f9842: am aaf33bec: am 34097444: am 7581df6e: am 00720760: am 3e3e71b9: am 9b5b9f41: am bfabed1f: Merge "Revert "As per the android documention 480p is defined as 720x480, 704x480 or 640x480. The test is hardcoding 480p to 720x480 and hence the tes | |
| 1c7c3c2 am 8d42ed46: am 6b71b594: am 74c54d03: am f4a7a4a8: (-s ours) am 5111ea11: am b249166a: am 2cab845b: am 099280e9: am 4e80dc17: (-s ours) Merge "DO NOT MERGE: Cts test fix for shortcode 48000" into kitkat-cts-dev automerge: ffd250a -s ours | |
| 83ef156 am 4825b268: am 23dd135d: am 623d5a4e: am 9368b3a7: am 648eff8d: am 7766fe40: am 2eabe31f: am fe7fbbb1: am 076e7ea4: Merge "Fix for com.android.cts.verifier.camera.video.CameraVideoActivity" into kitkat-cts-dev automerge: 9d5a03f | |
| ab74c3c am 9b282ba1: am f27ee8fe: am 3b937d43: am dd9543b7: am 8881bc9f: am 5811239f: am c22598cd: am 9b3abc67: am 880e4ac7: Merge "As per the android documention 480p is defined as 720x480, 704x480 or 640x480. The test is hardcoding 480p to 720x480 and hence the test is fai | |
| aa8250b am 618369ee: am 050295c4: am 21f60cc3: am 2d02a772: (-s ours) am a4e32202: am 3f771647: am a5d2ab68: am 7e0fc271: am e711a36e: (-s ours) Merge "DO NOT MERGE: Fix com.android.cts.monkey.VerbosityTest#testVerbosity seldom fail" into kitkat-cts-dev automerge: b3405de -s | |
| e10828c am 587444a5: am 0e217cbe: am 05da1be5: am 20dfd714: am ccd33374: am 8933b440: am 3c8e9b98: am c50d2847: am ccde590a: Merge "Add more CTS for MediaController" into lollipop-cts-dev | |
| 2d30116 am 414a59ad: am ed7ff15b: am 72f1102f: am 85a61404: am 9597a1b6: am fba6cc5a: am a562ddcf: am 5adf372c: am 4aeb538d: Merge "Add CTS for MediaSession.setActive()" into lollipop-cts-dev | |
| 9935683 am 36976fd2: am 803298f0: am f5afe719: am fd2c22e6: am a01d8468: am 964f1c30: am bff9958d: am f99cc4ba: am b7703ecb: Merge "Add CTS for MediaBrowserService" into lollipop-cts-dev | |
| 244ed7b am 6612082a: am 4009ef9d: am 3c993075: am 0af999e7: am 10861d56: am cb7d9562: am 65cb7f94: am 26c7d928: am 4c8ddbd9: Merge "TIF: Ensure the global search can query EPG data" into lollipop-cts-dev | |
| c7a17d6 am b0ce8c1a: am 6e238a53: am 2e458fab: am d9eacf0b: am 6f454c3e: am e1357cdc: am 7dcb52fa: am 5a179fac: am a5945eea: Merge "fix UiAutomationTest.testWindowContentFrameStatsNoAnimation FAIL" into lollipop-cts-dev | |
| 8ee358b am 28ed8f12: am 00b05bea: am af96e73c: am 0d9cb797: (-s ours) am b679acbf: am dd40995a: am 5d3becd8: am 1f314046: am c0edc3c6: (-s ours) Merge "[DO NOT MERGE]Fix ION memory leak for camera2 testStillPreviewCombination" into lollipop-cts-dev | |
| b6b81a2 am b09b031a: am 51a54a8b: am c00de99e: am a5f00083: am e1d2fb8e: am a0238f23: am b556e58b: am 1564a126: am 715fe887: Merge "Fix for testListen" into lollipop-cts-dev | |
| e47b5a9 am 5e6ec01a: am 37842fde: am be86442f: am 1303e6cc: am d4deaa42: am 58849263: am 92151993: am 45d23b25: am 34ece2dd: Merge "5.0_r1 Verifier:Fix no-connectivity constraint job missing running issue" into lollipop-cts-dev | |
| 7e58e8d am 44760a7c: am 6ef66005: am 4e9d91d1: am 588b010a: am d110bdce: am 3ab9365b: am 9cce00c4: am bf2a69dd: am 76b1710a: Merge "Cts test fix for shortcode 48000" into lollipop-cts-dev | |
| 5e53966 am f7d0ebe6: am f09faed3: am 900e5cd7: am 68754fee: am 8b693a4c: am 37bda1b5: am f1e31663: am 53d45920: am 5ac9f6cd: Merge "Add 44051 to NO_DELIVERY_REPORTS, DATA_SMS, MULTIPART_SMS" into kitkat-cts-dev automerge: 10212a1 | |
| f6673b6 am c2f2c7dd: am 6bd38e44: am 4d6f447a: am cd5b5201: am d9895704: am 0a4f62b4: am 4c5153cc: am 9030efde: am c18e0e89: Merge "Use video without B frames for early EOS test" into lollipop-cts-dev | |
| 129526f am e8bc988a: am 64865715: am 2279ada2: am ae1a468b: am c009ee86: am 3dd29899: am 9845d105: am e60989be: am fe6938e0: Merge "LocalSocketTest.testAccessors: fix the *SendBufferSize* test" into lollipop-cts-dev | |
| 5f13623 am 9cc32a1c: am 1a00912e: am 42453b82: am 4f54ebea: am d12cfe3a: am 401ba747: am 3f797832: am b01b8167: am 6c78c8e8: Merge "resolve merge conflicts of 6176421 to lollipop-cts-dev." into lollipop-cts-dev | |
| b50a7c5 am 7a21824b: am 9e975857: am 609f338d: am 38dffb0c: am 582a23d3: am 779d4b9f: am 01a76822: am 95d7fb57: am 97fa3a23: Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev | |
| caf0bbb am 0a8f46f4: am 7b7444c2: am 8fd5bc4f: am 4fdeb4fa: am 7076fb87: am 046788c3: am 5d17be68: am 8d782e4e: am 62f111d0: Merge "Add CTS for MediaController.TransportControls and its callback" into lollipop-cts-dev | |
| 83035df am 7fba4789: am 0da2de26: am 1aa848a7: am f7ba161a: am 16a8d4a0: am 6dbb9057: am 839d28c5: am 7dae8e29: am 6a44e145: Merge "Camera: change supported preview/video size logic" into lollipop-cts-dev | |
| 4837128 am 55f364a1: am 667d19aa: am 53b9d10b: am a0df5a46: am f233018c: am b1d3dc85: am c3884911: am d8a0fb40: am 5c9059dc: am f82b9449: am 29de7b18: am 7988d7f8: am 83dd0cef: am 1d4ac0f9: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev au | |
| ed42672 am 87073770: am 2ef6827d: am 465e1ecb: am 0a69d4e0: am a41a3aa5: am 1174a61d: am 6b6e6310: am 12e9a5f5: am 9ee3edef: am aa58f460: am 2fcdab95: am 6cab21b6: am ab0bb72d: am e610cae3: Merge "Fix typo in streaming media url" into jb-dev automerge: a029dcc automerge: f569 | |
| 85b7766 am f2ebaba0: am 20d98194: am 49356f21: am 2e406fe8: am 8a254fa8: am 00c45a2e: am 39b4fcf3: am d318b7fd: am f4009752: am b55ee96b: am f9a6b37b: am cf05e0c2: am 0969f15c: am ac08bc8a: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev au | |
| b9f06b1 am 552cd791: am 4fb711a1: am 4c220e22: am 37578c74: am f02a4ded: am e99a3309: am 20d2c48d: am 734def68: am 4c725a38: am 46d82f0b: am c6fca737: am ee955b85: am 26d352cd: am 6558d48b: Merge "Fix test" into jb-dev automerge: 430eeb7 automerge: 9f02f1a automerge: 358d417 | |
| da41b12 am 4d118058: am ccde7cd1: am 344a942a: am a00c3fe1: am fcf15ba4: am a7c79b5f: am b6545fe2: am d334f5ca: am 7831295a: am 7733e474: am e2247907: am a4163a07: am b8c7cf77: am bba8cbda: Merge "Add tests for midi playback" into jb-dev automerge: 869d252 automerge: 1a174fc | |
| d9eaa6a am 0453079b: am 176ccaca: am b6a4e82a: am 2f951d4c: am c8a66d94: am 7cf44912: am 48ef9902: am f1dd55c8: am 6f1b9e2a: am 2b4962b1: am 1d438a13: am cb190b0d: am 92df8753: add tests for stream type check in audio policy binder. automerge: 1245cdc automerge: 3a415ff autom | |
| 930b45b am 66daf276: am 1977e7d4: am 0b7d0515: am d5563b18: am 593641b3: am 38e4b93d: am e40623f7: am 28956782: am 8d6ba405: am 4b3c7eaf: am 6861e8d6: am 9b9de51d: am 6a1c1372: am 4bc52341: Merge "Fix CTS case testQueryExternalMiniThumbnails failure" into jb-dev automerge: | |
| 4f7b15f am bfcb2b0b: am 5b9dde7c: am 3c424d89: am 273a9b48: am 3240517a: am 2c394f33: am 34580718: am 8a91dd93: am 07a0d2cb: Don\'t NPE when no security message is provided. automerge: 843c1f4 automerge: 4a04f01 automerge: 739f204 | |
| 3ba6cd0 am 251f2992: am e4a7b23a: am e028a298: am 4ebd35a1: am 42b34a08: am 1ab443ce: am ce4fbf95: am ad388cb4: am 6d4a6d3e: Merge "Add more CTS codes for MediaBrowserTest" into lollipop-cts-dev | |
| f703a91 am 224bc27c: am 84458d90: am cb033e4e: am c9b86480: am 0656daf2: am 05e0b021: am 3b6fb36b: am 9540df0e: am 32e17d40: Merge "Add CTS for MediaSession.Token" into lollipop-cts-dev | |
| fdf5209 am ad818a77: am a9ba8bef: am cab55cf9: am e1e375f3: am fea2508f: am d4f9511d: am e8603c1e: am b5166b1d: am 71a8a6d7: Merge "Add CTS for MediaBrowser" into lollipop-cts-dev | |
| e9ad0d8 am 0905f7dd: am 6f8ec524: am 47da0013: am a57220bd: am ab6a8ff3: am a439879e: am b27aa047: am dbc90b9f: am 6585d2a7: Merge "Add CTS for MediaBrowser.MediaItem" into lollipop-cts-dev | |
| 8e0e48a am 8d0363b6: am f88b9faf: am 76b94e84: am e36536b4: am f33bdf70: am bc2ae97b: am 46132125: am 764f3230: am f460e3e3: Merge "TIF: Add test case for TvView.TvInputCallback.onConnectionFailed()" into lollipop-cts-dev | |
| 75452dd am ca52911f: am e14019a6: am 7edcfd8e: am 6a3e79be: am 955a4e15: am 6f9c3b95: am dbb094eb: am 741da47e: am 98641202: Merge "Disable WebGL tests from CTS" into lollipop-cts-dev | |
| 25ca164 am 13992117: am 2db51a3a: am 0c50670d: am 38ab62cd: am 688e98f6: am 1ce9068f: am eafbef5b: am 4d55d0c8: am a2fe7980: Merge "Modify user agent CTS test to match new webview user agent string." into lollipop-cts-dev | |
| 42941ff am 5bab7698: am 404df3ee: am 651a8c63: am 22cdf49e: am 8e05d564: am 7f8290d8: am 5fccef72: am be695cf3: am 77c931d2: Merge "TIF: Add missing test cases for TvInputService" into lollipop-cts-dev | |
| e54111d am a79001ad: am a812afd3: am ef8069de: am 4ebaf64e: am 567ad1c7: am 8cb19ec2: am 765ff619: am 8265b25d: am ebc0ba05: Merge "TIF: Add missing test cases for TvInputManager" into lollipop-cts-dev | |
| bfdef09 am 22274b4d: am 2a9a462b: am c37b17f3: am 39b73f09: am 22eaf671: am 72e6b133: am 563c1d85: am 1941c847: am 448d1e11: Merge "TIF: Add test cases for TvContract.Channels and TvContact.Programs.Genres" into lollipop-cts-dev | |
| 2dc1387 am 06af6829: am 63cc08e5: am 3f1c6243: am c3be0ada: am 9c07f137: am 54baba8a: am d4de676c: am 4e263ec8: am d8f754a0: Merge "TIF: Add missing tests for android.media.tv.TvInputInfo" into lollipop-cts-dev | |
| 603d715 am b866cd1a: am 5ec3cd9c: am 05b4c7cc: am cfa92e98: am 02e2308c: am 11ae8134: am a1da7950: am b25ca64e: am 3682098c: Merge "Update cts to not require multi-user when managed_users are declared" into lollipop-cts-dev | |
| a20c426 am 8fbcd02b: am deff5db2: am 72992b8b: am e2d082a4: am b34daa4d: am cffaef77: am a36f4549: am 8de92c56: am cd3d7bea: Merge "TIF: Add tests for TvTrackInfo" into lollipop-cts-dev | |
| 5a4ca32 am 681a8bbd: am bdf2b7a7: am 914c2b50: am 9253e215: am 853a6d85: am 3ce3144f: am 7c6e5cfe: am ea0dab91: am b51c8ca0: Merge "Camera: fix Integer comparison" into lollipop-cts-dev | |
| c36ac40 am e3f4ebb8: am 37ff09f4: am bc538fba: am e2c659fa: am 1e74f6cd: am 2558c0d9: am 142c801b: am d7559538: am 3e841ca3: Merge "mediastress: move check for support to the beginning of the test." into lollipop-cts-dev | |
| d26099b am 92f0b9aa: am 58154284: am 9483fd12: am 17e7a85b: am af2e45e1: am 41bfb1aa: am 1acec5e3: am 370df7e1: am 6f810d46: Merge "Add CTS-verifier test to test cross profile media capture." into lollipop-cts-dev | |
| e148784 am 1d7d070d: am ae356555: am eb179fc1: am 076f394f: am ecee083d: am e6bc17b5: am c38391f0: am 4a10f810: am 958c8013: Merge "Camera: fix wrong String.format argument" into lollipop-cts-dev | |
| 239fc66 am f25c41aa: am 15dccde3: am e70dc9a4: am e6418a09: am 1bdd7ad9: am 8e5754b6: am 22c2a2fd: am 771466f6: resolved conflicts for da76169f to lmp-dev | |
| 4bb2925 am 5882356c: am c719a0c6: am 2da0ef82: am 6a034246: am 4908ad5f: am cf166d70: am e81c9f1d: am 0a7a8526: am 50f311e5: Merge "Camera: another legacy video recording fix" into lollipop-cts-dev | |
| f2fb2ac am 0b357ab4: am 119c4db4: am b1c56c4e: am 3ce666e1: am 2b337573: am fa856351: am 68c7b0e6: am 062f04bc: am 68b8b477: Merge "Refactoring the ThemeHostTest to reduce timeout." into lollipop-cts-dev | |
| 377042f am 00554ca9: am 1c12b658: am 41fbc316: am 6a81f38d: am 57905b29: am 27e79236: am db070d60: am f30bd972: am 1a856693: Merge "TIF: Make a title for CTS verifier test case clearer" into lollipop-cts-dev | |
| 142b786 am 41123f5a: am 1034327a: am f3d5d7f2: am e31cd3c6: am ef595fb1: am 4bf57508: am ce468740: resolved conflicts for 283b37b7 to lmp-sprout-dev | |
| 350854d am 95cc8a95: am 98a92be5: am 283de843: am c1ecc48d: am dd70e436: am 32203af8: am 9fde6600: resolved conflicts for 13cf1e9c to lmp-sprout-dev | |
| 9287147 am a620749d: am 916ab565: am 25651c68: am bd245f29: am 6b971077: am 8c3f6481: am 6312b839: resolved conflicts for b183245d to lmp-sprout-dev | |
| fee74d1 am 1cb2100b: am 147fd114: am 206babc7: am 783aa1b0: am dbe26b09: am 5cf4d75d: am b66220f6: resolved conflicts for 8414fcb7 to lmp-sprout-dev | |
| 0d1dc0b am 0d4137ef: am 843fc20a: am 0e7ce188: am bf28a2fe: am 68b4fa0f: am a5d122eb: resolved conflicts for 17b3ebf4 to lmp-mr1-dev | |
| e76674c am 8e3357df: am dc64036a: am 64189035: am a5e624a6: (-s ours) am 531d140b: am ac40dcc8: am 4bedf216: am 5c24639d: am dcef6e38: (-s ours) am b0b23ffd: am 08b178a8: DO NOT MERGE - Add security test for IEffect binder command | |
| e144edb am 9e02a3c9: am fe467bd7: am 87405a84: am 3bd35f32: (-s ours) am f2951ae7: am a5d8d21b: am 3266d75d: resolved conflicts for 6002f099 to lmp-sprout-dev | |
| 135b087 am e1f785e3: am 5496c88b: am 8cc5f1ae: am f3513456: am 5a6823b5: am d47f0c37: am d95836ae: am 79d97606: Merge "CtsDeviceVideoPerf: limit bitrate to main or baseline profiles" into lollipop-cts-dev | |
| b668cba am 3dfd42a9: am 3da256af: am 50858f99: am 451fb15a: am ed1b9b16: am 20503b03: am 82cd5e5c: am 81e14f4e: Merge "CTS: Fix memory leak in RSBlendTest loop." into kitkat-cts-dev automerge: e062486 -s ours | |
| c677314 am 10e95a50: am a77a7b03: am d5122706: am cce94f99: am db88ffb3: am 52f65bd8: am 86cc8140: am 23c49fbf: Merge "AppSecurityTests: Do not delete in WhiteLists." into kitkat-cts-dev automerge: ac79e25 | |
| 68a038b am 763888bf: am 39edfddd: am 4b21ed39: am 2a2a703f: am 9797f393: am 2cdc65f5: am cdad0572: am eb4eb9e9: Merge "Revert "Modify user agent CTS test to match new webview user agent string."" into lollipop-cts-dev | |
| fd50a1c am 1826a4b9: am c3dd8a9b: am b28ea107: am 5fd98c40: am 76ddde6b: am c80863be: am e7b7f417: am c304eedd: Merge "Revert "Cts test fix for shortcode 48000"" into lollipop-cts-dev | |
| 32d5f1d am c1e56fe1: am e9a9ced8: am 7aaf0a68: am e99cf6e5: am 07eaa81a: am 752a6964: am 025bd02c: am 87a13283: Merge "fix incorrection assumption due to DST" into lollipop-cts-dev | |
| bcfe3c6 am 606895bf: am f489a65c: am 2496b217: am 3009899a: am 7f75869d: am 4d32e370: am 0e753a86: am df91c971: Merge "Fix com.android.cts.monkey.VerbosityTest#testVerbosity seldom fail" into lollipop-cts-dev | |
| 8a2050a am 8a3e65ae: am 6d53e245: am 812fccf2: am 69139353: am e16977e4: resolved conflicts for 2dbf3b3a to lmp-mr1-dev | |
| adb2193 am 740f9842: am aaf33bec: am 34097444: am 7581df6e: am 00720760: am 3e3e71b9: am 9b5b9f41: am bfabed1f: Merge "Revert "As per the android documention 480p is defined as 720x480, 704x480 or 640x480. The test is hardcoding 480p to 720x480 and hence the test is failing | |
| 8d42ed4 am 6b71b594: am 74c54d03: am f4a7a4a8: (-s ours) am 5111ea11: am b249166a: am 2cab845b: am 099280e9: am 4e80dc17: (-s ours) Merge "DO NOT MERGE: Cts test fix for shortcode 48000" into kitkat-cts-dev automerge: ffd250a -s ours | |
| 4825b26 am 23dd135d: am 623d5a4e: am 9368b3a7: am 648eff8d: am 7766fe40: am 2eabe31f: am fe7fbbb1: am 076e7ea4: Merge "Fix for com.android.cts.verifier.camera.video.CameraVideoActivity" into kitkat-cts-dev automerge: 9d5a03f | |
| 9b282ba am f27ee8fe: am 3b937d43: am dd9543b7: am 8881bc9f: am 5811239f: am c22598cd: am 9b3abc67: am 880e4ac7: Merge "As per the android documention 480p is defined as 720x480, 704x480 or 640x480. The test is hardcoding 480p to 720x480 and hence the test is failing other co | |
| 618369e am 050295c4: am 21f60cc3: am 2d02a772: (-s ours) am a4e32202: am 3f771647: am a5d2ab68: am 7e0fc271: am e711a36e: (-s ours) Merge "DO NOT MERGE: Fix com.android.cts.monkey.VerbosityTest#testVerbosity seldom fail" into kitkat-cts-dev automerge: b3405de -s ours | |
| 587444a am 0e217cbe: am 05da1be5: am 20dfd714: am ccd33374: am 8933b440: am 3c8e9b98: am c50d2847: am ccde590a: Merge "Add more CTS for MediaController" into lollipop-cts-dev | |
| 414a59a am ed7ff15b: am 72f1102f: am 85a61404: am 9597a1b6: am fba6cc5a: am a562ddcf: am 5adf372c: am 4aeb538d: Merge "Add CTS for MediaSession.setActive()" into lollipop-cts-dev | |
| 36976fd am 803298f0: am f5afe719: am fd2c22e6: am a01d8468: am 964f1c30: am bff9958d: am f99cc4ba: am b7703ecb: Merge "Add CTS for MediaBrowserService" into lollipop-cts-dev | |
| 6612082 am 4009ef9d: am 3c993075: am 0af999e7: am 10861d56: am cb7d9562: am 65cb7f94: am 26c7d928: am 4c8ddbd9: Merge "TIF: Ensure the global search can query EPG data" into lollipop-cts-dev | |
| b0ce8c1 am 6e238a53: am 2e458fab: am d9eacf0b: am 6f454c3e: am e1357cdc: am 7dcb52fa: am 5a179fac: am a5945eea: Merge "fix UiAutomationTest.testWindowContentFrameStatsNoAnimation FAIL" into lollipop-cts-dev | |
| 28ed8f1 am 00b05bea: am af96e73c: am 0d9cb797: (-s ours) am b679acbf: am dd40995a: am 5d3becd8: am 1f314046: am c0edc3c6: (-s ours) Merge "[DO NOT MERGE]Fix ION memory leak for camera2 testStillPreviewCombination" into lollipop-cts-dev | |
| b09b031 am 51a54a8b: am c00de99e: am a5f00083: am e1d2fb8e: am a0238f23: am b556e58b: am 1564a126: am 715fe887: Merge "Fix for testListen" into lollipop-cts-dev | |
| 5e6ec01 am 37842fde: am be86442f: am 1303e6cc: am d4deaa42: am 58849263: am 92151993: am 45d23b25: am 34ece2dd: Merge "5.0_r1 Verifier:Fix no-connectivity constraint job missing running issue" into lollipop-cts-dev | |
| 44760a7 am 6ef66005: am 4e9d91d1: am 588b010a: am d110bdce: am 3ab9365b: am 9cce00c4: am bf2a69dd: am 76b1710a: Merge "Cts test fix for shortcode 48000" into lollipop-cts-dev | |
| f7d0ebe am f09faed3: am 900e5cd7: am 68754fee: am 8b693a4c: am 37bda1b5: am f1e31663: am 53d45920: am 5ac9f6cd: Merge "Add 44051 to NO_DELIVERY_REPORTS, DATA_SMS, MULTIPART_SMS" into kitkat-cts-dev automerge: 10212a1 | |
| c2f2c7d am 6bd38e44: am 4d6f447a: am cd5b5201: am d9895704: am 0a4f62b4: am 4c5153cc: am 9030efde: am c18e0e89: Merge "Use video without B frames for early EOS test" into lollipop-cts-dev | |
| e8bc988 am 64865715: am 2279ada2: am ae1a468b: am c009ee86: am 3dd29899: am 9845d105: am e60989be: am fe6938e0: Merge "LocalSocketTest.testAccessors: fix the *SendBufferSize* test" into lollipop-cts-dev | |
| 9cc32a1 am 1a00912e: am 42453b82: am 4f54ebea: am d12cfe3a: am 401ba747: am 3f797832: am b01b8167: am 6c78c8e8: Merge "resolve merge conflicts of 6176421 to lollipop-cts-dev." into lollipop-cts-dev | |
| 7a21824 am 9e975857: am 609f338d: am 38dffb0c: am 582a23d3: am 779d4b9f: am 01a76822: am 95d7fb57: am 97fa3a23: Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev | |
| 0a8f46f am 7b7444c2: am 8fd5bc4f: am 4fdeb4fa: am 7076fb87: am 046788c3: am 5d17be68: am 8d782e4e: am 62f111d0: Merge "Add CTS for MediaController.TransportControls and its callback" into lollipop-cts-dev | |
| 7fba478 am 0da2de26: am 1aa848a7: am f7ba161a: am 16a8d4a0: am 6dbb9057: am 839d28c5: am 7dae8e29: am 6a44e145: Merge "Camera: change supported preview/video size logic" into lollipop-cts-dev | |
| 55f364a am 667d19aa: am 53b9d10b: am a0df5a46: am f233018c: am b1d3dc85: am c3884911: am d8a0fb40: am 5c9059dc: am f82b9449: am 29de7b18: am 7988d7f8: am 83dd0cef: am 1d4ac0f9: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev automerge: cbbf | |
| 8707377 am 2ef6827d: am 465e1ecb: am 0a69d4e0: am a41a3aa5: am 1174a61d: am 6b6e6310: am 12e9a5f5: am 9ee3edef: am aa58f460: am 2fcdab95: am 6cab21b6: am ab0bb72d: am e610cae3: Merge "Fix typo in streaming media url" into jb-dev automerge: a029dcc automerge: f569614 automerge | |
| f2ebaba am 20d98194: am 49356f21: am 2e406fe8: am 8a254fa8: am 00c45a2e: am 39b4fcf3: am d318b7fd: am f4009752: am b55ee96b: am f9a6b37b: am cf05e0c2: am 0969f15c: am ac08bc8a: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev automerge: a15b | |
| 552cd79 am 4fb711a1: am 4c220e22: am 37578c74: am f02a4ded: am e99a3309: am 20d2c48d: am 734def68: am 4c725a38: am 46d82f0b: am c6fca737: am ee955b85: am 26d352cd: am 6558d48b: Merge "Fix test" into jb-dev automerge: 430eeb7 automerge: 9f02f1a automerge: 358d417 | |
| 4d11805 am ccde7cd1: am 344a942a: am a00c3fe1: am fcf15ba4: am a7c79b5f: am b6545fe2: am d334f5ca: am 7831295a: am 7733e474: am e2247907: am a4163a07: am b8c7cf77: am bba8cbda: Merge "Add tests for midi playback" into jb-dev automerge: 869d252 automerge: 1a174fc automerge: 87 | |
| 0453079 am 176ccaca: am b6a4e82a: am 2f951d4c: am c8a66d94: am 7cf44912: am 48ef9902: am f1dd55c8: am 6f1b9e2a: am 2b4962b1: am 1d438a13: am cb190b0d: am 92df8753: add tests for stream type check in audio policy binder. automerge: 1245cdc automerge: 3a415ff automerge: b4aa5b3 | |
| 66daf27 am 1977e7d4: am 0b7d0515: am d5563b18: am 593641b3: am 38e4b93d: am e40623f7: am 28956782: am 8d6ba405: am 4b3c7eaf: am 6861e8d6: am 9b9de51d: am 6a1c1372: am 4bc52341: Merge "Fix CTS case testQueryExternalMiniThumbnails failure" into jb-dev automerge: b812960 autom | |
| bfcb2b0 am 5b9dde7c: am 3c424d89: am 273a9b48: am 3240517a: am 2c394f33: am 34580718: am 8a91dd93: am 07a0d2cb: Don\'t NPE when no security message is provided. automerge: 843c1f4 automerge: 4a04f01 automerge: 739f204 | |
| 251f299 am e4a7b23a: am e028a298: am 4ebd35a1: am 42b34a08: am 1ab443ce: am ce4fbf95: am ad388cb4: am 6d4a6d3e: Merge "Add more CTS codes for MediaBrowserTest" into lollipop-cts-dev | |
| 224bc27 am 84458d90: am cb033e4e: am c9b86480: am 0656daf2: am 05e0b021: am 3b6fb36b: am 9540df0e: am 32e17d40: Merge "Add CTS for MediaSession.Token" into lollipop-cts-dev | |
| ad818a7 am a9ba8bef: am cab55cf9: am e1e375f3: am fea2508f: am d4f9511d: am e8603c1e: am b5166b1d: am 71a8a6d7: Merge "Add CTS for MediaBrowser" into lollipop-cts-dev | |
| 0905f7d am 6f8ec524: am 47da0013: am a57220bd: am ab6a8ff3: am a439879e: am b27aa047: am dbc90b9f: am 6585d2a7: Merge "Add CTS for MediaBrowser.MediaItem" into lollipop-cts-dev | |
| 8d0363b am f88b9faf: am 76b94e84: am e36536b4: am f33bdf70: am bc2ae97b: am 46132125: am 764f3230: am f460e3e3: Merge "TIF: Add test case for TvView.TvInputCallback.onConnectionFailed()" into lollipop-cts-dev | |
| ca52911 am e14019a6: am 7edcfd8e: am 6a3e79be: am 955a4e15: am 6f9c3b95: am dbb094eb: am 741da47e: am 98641202: Merge "Disable WebGL tests from CTS" into lollipop-cts-dev | |
| 1399211 am 2db51a3a: am 0c50670d: am 38ab62cd: am 688e98f6: am 1ce9068f: am eafbef5b: am 4d55d0c8: am a2fe7980: Merge "Modify user agent CTS test to match new webview user agent string." into lollipop-cts-dev | |
| 5bab769 am 404df3ee: am 651a8c63: am 22cdf49e: am 8e05d564: am 7f8290d8: am 5fccef72: am be695cf3: am 77c931d2: Merge "TIF: Add missing test cases for TvInputService" into lollipop-cts-dev | |
| a79001a am a812afd3: am ef8069de: am 4ebaf64e: am 567ad1c7: am 8cb19ec2: am 765ff619: am 8265b25d: am ebc0ba05: Merge "TIF: Add missing test cases for TvInputManager" into lollipop-cts-dev | |
| 22274b4 am 2a9a462b: am c37b17f3: am 39b73f09: am 22eaf671: am 72e6b133: am 563c1d85: am 1941c847: am 448d1e11: Merge "TIF: Add test cases for TvContract.Channels and TvContact.Programs.Genres" into lollipop-cts-dev | |
| 06af682 am 63cc08e5: am 3f1c6243: am c3be0ada: am 9c07f137: am 54baba8a: am d4de676c: am 4e263ec8: am d8f754a0: Merge "TIF: Add missing tests for android.media.tv.TvInputInfo" into lollipop-cts-dev | |
| b866cd1 am 5ec3cd9c: am 05b4c7cc: am cfa92e98: am 02e2308c: am 11ae8134: am a1da7950: am b25ca64e: am 3682098c: Merge "Update cts to not require multi-user when managed_users are declared" into lollipop-cts-dev | |
| 8fbcd02 am deff5db2: am 72992b8b: am e2d082a4: am b34daa4d: am cffaef77: am a36f4549: am 8de92c56: am cd3d7bea: Merge "TIF: Add tests for TvTrackInfo" into lollipop-cts-dev | |
| 681a8bb am bdf2b7a7: am 914c2b50: am 9253e215: am 853a6d85: am 3ce3144f: am 7c6e5cfe: am ea0dab91: am b51c8ca0: Merge "Camera: fix Integer comparison" into lollipop-cts-dev | |
| e3f4ebb am 37ff09f4: am bc538fba: am e2c659fa: am 1e74f6cd: am 2558c0d9: am 142c801b: am d7559538: am 3e841ca3: Merge "mediastress: move check for support to the beginning of the test." into lollipop-cts-dev | |
| 92f0b9a am 58154284: am 9483fd12: am 17e7a85b: am af2e45e1: am 41bfb1aa: am 1acec5e3: am 370df7e1: am 6f810d46: Merge "Add CTS-verifier test to test cross profile media capture." into lollipop-cts-dev | |
| 1d7d070 am ae356555: am eb179fc1: am 076f394f: am ecee083d: am e6bc17b5: am c38391f0: am 4a10f810: am 958c8013: Merge "Camera: fix wrong String.format argument" into lollipop-cts-dev | |
| f25c41a am 15dccde3: am e70dc9a4: am e6418a09: am 1bdd7ad9: am 8e5754b6: am 22c2a2fd: am 771466f6: resolved conflicts for da76169f to lmp-dev | |
| 5882356 am c719a0c6: am 2da0ef82: am 6a034246: am 4908ad5f: am cf166d70: am e81c9f1d: am 0a7a8526: am 50f311e5: Merge "Camera: another legacy video recording fix" into lollipop-cts-dev | |
| 0b357ab am 119c4db4: am b1c56c4e: am 3ce666e1: am 2b337573: am fa856351: am 68c7b0e6: am 062f04bc: am 68b8b477: Merge "Refactoring the ThemeHostTest to reduce timeout." into lollipop-cts-dev | |
| 00554ca am 1c12b658: am 41fbc316: am 6a81f38d: am 57905b29: am 27e79236: am db070d60: am f30bd972: am 1a856693: Merge "TIF: Make a title for CTS verifier test case clearer" into lollipop-cts-dev | |
| 41123f5 am 1034327a: am f3d5d7f2: am e31cd3c6: am ef595fb1: am 4bf57508: am ce468740: resolved conflicts for 283b37b7 to lmp-sprout-dev | |
| 95cc8a9 am 98a92be5: am 283de843: am c1ecc48d: am dd70e436: am 32203af8: am 9fde6600: resolved conflicts for 13cf1e9c to lmp-sprout-dev | |
| a620749 am 916ab565: am 25651c68: am bd245f29: am 6b971077: am 8c3f6481: am 6312b839: resolved conflicts for b183245d to lmp-sprout-dev | |
| 1cb2100 am 147fd114: am 206babc7: am 783aa1b0: am dbe26b09: am 5cf4d75d: am b66220f6: resolved conflicts for 8414fcb7 to lmp-sprout-dev | |
| 0d4137e am 843fc20a: am 0e7ce188: am bf28a2fe: am 68b4fa0f: am a5d122eb: resolved conflicts for 17b3ebf4 to lmp-mr1-dev | |
| 8e3357d am dc64036a: am 64189035: am a5e624a6: (-s ours) am 531d140b: am ac40dcc8: am 4bedf216: am 5c24639d: am dcef6e38: (-s ours) am b0b23ffd: am 08b178a8: DO NOT MERGE - Add security test for IEffect binder command | |
| 9e02a3c am fe467bd7: am 87405a84: am 3bd35f32: (-s ours) am f2951ae7: am a5d8d21b: am 3266d75d: resolved conflicts for 6002f099 to lmp-sprout-dev | |
| 25ac002 am 8912adb8: am 3fc949c2: am 78733514: am 4eafd543: am 4934d988: am 9f0c8e82: am 10120117: am a404aa89: am ed577509: Merge "Use ITestDevice#pullFile instead of ITestDevice#executeAdbCommand." into lollipop-cts-dev | |
| 400e1fa am b5c19477: am 1fe01105: am d769484e: am 0a9d413f: (-s ours) am 92a2a098: am 15358c6b: am 32613d31: am 24a62224: am 89c8f21c: (-s ours) Merge "DO NOT MERGE - Fixed the order of parameters passing" into lmp-sprout-dev | |
| dedfdbb am cab19677: am 8f6f1795: am 359ea8bb: am 379f2e31: am f4209d7f: am 9511bb2e: am 0fbc0246: am efe12962: am d3a257ee: Merge "Auto-test for BLE client." into lmp-sprout-dev | |
| 6a18037 am f02db193: am 6147eec7: am f5615954: am 0bf62b0f: am fc1f3f6c: am 6775d4c0: am 1b546c62: am a21c69a8: am 18640baa: Merge "Select common codecs for MediaCodecTest.testException" into lmp-sprout-dev | |
| 4f891f0 am 7c5fe0d5: am d9cf159c: am 5608f29e: am 9557621f: am 700ac21b: am 3b99ceeb: am 35f059f6: am 500cd8ca: am ae1b0a05: check decode cap before runing mediastress playerTest | |
| 891f8f9 am 589d13e1: am c7f45ba3: am 5e1fe628: am 1e69105b: am 0c3b7274: am 1b0c9a4f: am 76bfae6d: am 5657a062: am 695af1fa: Update low ram device test for new memory requirements | |
| 5c832ed am df0a07f3: am 243e57ed: am c9281d8b: am 402f4011: am 03e07c7f: am bf97a00a: am 2bdaf2a1: am 8c286217: am 44204f68: Amending testcase to support updated memory requirement for L. | |
| 5f33d40 am f70d1256: am 5c9f37b4: am d6808b39: am e7c85473: am 1aeaba16: am 35a2bfd3: am 044eb18c: am eb0a7024: resolved conflicts for 32bb2005 to lmp-dev | |
| 028fc3f am b4ada366: am aab364ef: am daa88598: am 50dbdbc3: am a3052a03: am 40c8df21: am 77aa49b7: am 0690f02e: am c21341ec: Merge "CameraITS: fix wrong fixed focus lens logic" into lmp-sprout-dev | |
| d6664fc am ae15ee12: am f3426438: am 6f5a1258: am caf4bd00: (-s ours) am 484f1a2e: am 711e49e5: am 22d5f250: am 4e388a77: am fa71d40c: (-s ours) DO NOT MERGE Add UiAutomationTest#testWindowContentFrameStats to knownfailures | |
| 5282741 am b55dd00a: am 00feece5: am 7cb290fa: am 909d5e7a: am db2c8c06: am 9c072750: am 68488024: am 0e7c5837: am b40bc889: Merge "Disable Notification Package Prior item for the watch feature" into lmp-sprout-dev | |
| 02c01e2 am 3c5d9160: am b757c186: am ba1be016: am 7579cfbd: (-s ours) am 8f3818c7: am 73efff7e: am 597f0d8a: am 04e99c51: am 2024fae2: (-s ours) DO NOT MERGE: camera2 CTS: Actually close Images in StillCaptureTest. | |
| ba84e5e am 5441035c: am c3d69eb4: am b4e224c0: am 2fd9b68c: am e2b88dd4: am a1bc6bde: am 106b6734: am 4c2ff297: am 755f327f: Merge "Disable BLE offloaded scan batching test" into lmp-sprout-dev | |
| bab0600 am e572ce1a: am 9c6326b2: am a662c9ea: am bfb42226: am 08f0affe: am 5a5efc62: am 11076f2b: am 32f21834: am 0a9f5b13: Merge "Disable test to verifying BLE offloaded scan batching" into lmp-sprout-dev | |
| fb3b0b6 am ab27a7fc: am 200751f7: am 5c01b52f: am 811a5df7: am 4732c772: am 2091c9d6: am ec4ebca6: am 0c914add: am efbda486: Skip tests that depend on system resources and assets.. | |
| eed5fa4 am 36925e1f: am dfc3fe5a: am 96996817: am a002ffa9: am d4b3b364: am 5e559d26: am 8b25ee96: am 4201266d: am 055ca5b6: ConsumerIrTest: add the right permission for some test case | |
| 04b59a8 am 661a8c99: am 175b7f0c: am de384d64: am 4bcc0580: am f07b488e: am 6a8dad25: am fcf719d6: am 223c2ddb: am 44e09b47: Merge "Add cts test for testing launcher version." into lmp-sprout-dev | |
| 9f99f45 am 71c4c82d: am fad5cc80: am c64b8f22: am 162c0444: am 1b27b143: am 15b79989: am 2795a64d: am e19f335f: am fc60c4c3: CameraITS: improve ITS user experience | |
| d087e22 am 0e7db130: am c0cee034: am dced4bd0: am e154e730: am eac47aaf: am bd5bfe2f: am 126c3d7e: am 04faf13a: am 3dd9f1ec: Fix testPageScroll by not using waitForIdleSync. | |
| 3897e02 am e608758c: am f7dce5e1: am 9981d6bc: am b0161879: am a4f1fb59: am 8b715115: am cccd8f7c: am 4ca392ca: am 335a73ee: Merge "CameraITS: fix fixed focus lens check" into lmp-sprout-dev | |
| 84885dc am ae602631: am 24825caf: am c36a66c3: am 65b3df90: am 43f35421: am 4d9e4dfc: am d60b7656: am f91b8851: am b05a90b5: Merge "Hide BLE scanner test if BLE advertiser test is hidden." into lmp-sprout-dev | |
| 264f142 am 17fdb0f9: am 52eb8d9e: am f68f5925: am 0f27645b: am 3e72b1d6: am 54020929: am b1c47db5: am ab9b8eb6: am 332674c2: Merge "Camera: add missing FULL level expectation" into lmp-sprout-dev | |
| 814d5e9 am 3b775f2e: am 19cff2cd: am 3ee4640f: am f79c80b0: am 9a3bde81: am 39a341cf: am eedd977d: am bd21a959: am a36ed7c1: Merge "Camera: fix recording test for legacy mode" into lmp-sprout-dev | |
| 24c123f am 74fe091c: am 472d4cf5: am 96a8c3a8: am 8b87db02: am 40825b78: am b44c2026: am a38ac188: am a333975e: resolved conflicts for b7c771fc to lmp-dev | |
| bdb00e5 am 2ef184c3: am ec69c650: am b68b2c72: am a9211444: am 58e3f579: am e274f3c4: am f406b544: am 26cab4c8: am d43e4fd9: am bb8b3aa6: am 1ab73263: Merge "Add test for Keystore put overflow" into klp-dev | |
| af23480 am 374a35e0: am 0dd9a7e0: am 87405554: am 03b2a014: am 436ff357: am 59c49231: am 7e8bbb26: am 60c9eecd: am 04915882: am 56e775b7: am 6e622718: Add 5-second timeout to testFlacHeapOverflow | |
| e15ac1f am 5df3088a: am 6957dbdb: am 448bc237: am 1660d7d2: am c7c9c4c1: am d40a05d1: am 8e908f24: am 32fa2bc0: am f3517f18: Merge "Advertise 31 bytes in BLE advertise tests." into lmp-sprout-dev | |
| 987e84d am 697cd398: am 98c60ad3: am ebbae3a9: am 5cdb1cdc: am ec5d3f7b: am 0deee593: am 53cee77b: am 5dd2c7da: am f7696b87: Merge "CameraITS: update test_capture_result" into lmp-sprout-dev | |
| 30040b5 am 0d53fc93: am 78088446: am c124c051: am e7882151: am b8a97572: am a7166578: am 89f03fa9: am 5aa3406d: am 7fd06374: Fix possible race condition in Sensor CTS framework. | |
| 0898b48 am 9bee62df: am 176b99d6: am 57b53d98: am c6909f4a: am 13df946c: am acb2553c: am 632f8bb3: am 76ad4e6d: am 7e6371ab: Merge "Replace getContext with getTargetContext." into lmp-sprout-dev | |
| 32466bc am 839387f3: am d5513acf: am 8cbc5a72: am fa7b45dd: am 9800b063: am b63e588f: am 97af9332: am 54005969: am 542c2844: media: update vp9 360p test clip with tile columns and frame parallel mode turned on. | |
| 9aa3cb8 am 10b5b8c5: am 58f15c3e: am f35b4f15: am 6fb92f4e: am dde6270f: am 57222a19: am 5e66df9f: am 3a86d93f: am 7fc44c34: Merge "update EncoderVirtualDisplayTest to use very long i-frame interval." into lmp-sprout-dev | |
| b8bc108 am 3e048e55: am 9eede1d1: am 4a8b28c8: am 0a29079b: am a2ef610c: am 93c0cfc9: am a4dc5fe2: am 93fb3cab: am 590472d9: Enable hardware scan filter test on device which supports the feature. | |
| 3e2a100 am 6b8775f3: am 72f7949b: am d8f6d748: am 2b835303: am 8616659a: am 9e0d6022: am fc33acb2: am 00e937fa: am 8eb56465: Merge "Remove hardware scan filter test, and re-enable BLE advertise/scanner test." into lmp-sprout-dev | |
| eab446b am 962c0c19: am 55af5ae6: am 5c825a41: am 331ed28b: am d81ff9d5: am c3926080: am 08f1480d: am d158fe3e: am 1381382e: Merge "CameraITS: various ITS improvement" into lmp-sprout-dev | |
| 4ae85de am 9b5c2fd6: am dc0581bb: am e9d91e2b: am 80e14290: am 87670398: am d4b790c4: am 848f9cce: am e5e8101b: am 3fefecef: Merge "Add test for checking max users > 1 if managed users feature enabled" into lmp-sprout-dev | |
| 6c40a6b am fbb42578: am fbe43c10: am 0a0f2ce4: am 8b723f44: am dbebdf95: am 6cf27e6a: am ca472a36: am 325a4115: am 6a13e8da: Merge "More cts-verifier tests for profile-aware Settings." into lmp-sprout-dev | |
| ae8f9e9 am 023c50e3: am 7155823e: am b13b0acc: am 0fe39d72: am 73134685: am 61a4fce3: am 84283992: am 6e499f6f: am fb758de5: Merge "Add CTS test to test Setup wizard Nfc config." into lmp-sprout-dev | |
| b3b5d0b am 2e26d375: am f33b96d1: am 96822b87: am 2b6b6602: (-s ours) am 957e7237: am 2f9f62e6: am 85ac1535: am ba5ed70d: am ba893966: (-s ours) Disable screen pinning test on watches and tvs. DO NOT MERGE | |
| c1b11f8 am bf2087dd: am f9ef22f0: am 4af59c7a: am 1586e21d: am 34702aa5: am 22df270e: am 5f0c7c63: resolved conflicts for 0ac66cea to lmp-sprout-dev | |
| 8912adb am 3fc949c2: am 78733514: am 4eafd543: am 4934d988: am 9f0c8e82: am 10120117: am a404aa89: am ed577509: Merge "Use ITestDevice#pullFile instead of ITestDevice#executeAdbCommand." into lollipop-cts-dev | |
| b5c1947 am 1fe01105: am d769484e: am 0a9d413f: (-s ours) am 92a2a098: am 15358c6b: am 32613d31: am 24a62224: am 89c8f21c: (-s ours) Merge "DO NOT MERGE - Fixed the order of parameters passing" into lmp-sprout-dev | |
| cab1967 am 8f6f1795: am 359ea8bb: am 379f2e31: am f4209d7f: am 9511bb2e: am 0fbc0246: am efe12962: am d3a257ee: Merge "Auto-test for BLE client." into lmp-sprout-dev | |
| f02db19 am 6147eec7: am f5615954: am 0bf62b0f: am fc1f3f6c: am 6775d4c0: am 1b546c62: am a21c69a8: am 18640baa: Merge "Select common codecs for MediaCodecTest.testException" into lmp-sprout-dev | |
| 7c5fe0d am d9cf159c: am 5608f29e: am 9557621f: am 700ac21b: am 3b99ceeb: am 35f059f6: am 500cd8ca: am ae1b0a05: check decode cap before runing mediastress playerTest | |
| 589d13e am c7f45ba3: am 5e1fe628: am 1e69105b: am 0c3b7274: am 1b0c9a4f: am 76bfae6d: am 5657a062: am 695af1fa: Update low ram device test for new memory requirements | |
| df0a07f am 243e57ed: am c9281d8b: am 402f4011: am 03e07c7f: am bf97a00a: am 2bdaf2a1: am 8c286217: am 44204f68: Amending testcase to support updated memory requirement for L. | |
| f70d125 am 5c9f37b4: am d6808b39: am e7c85473: am 1aeaba16: am 35a2bfd3: am 044eb18c: am eb0a7024: resolved conflicts for 32bb2005 to lmp-dev | |
| b4ada36 am aab364ef: am daa88598: am 50dbdbc3: am a3052a03: am 40c8df21: am 77aa49b7: am 0690f02e: am c21341ec: Merge "CameraITS: fix wrong fixed focus lens logic" into lmp-sprout-dev | |
| ae15ee1 am f3426438: am 6f5a1258: am caf4bd00: (-s ours) am 484f1a2e: am 711e49e5: am 22d5f250: am 4e388a77: am fa71d40c: (-s ours) DO NOT MERGE Add UiAutomationTest#testWindowContentFrameStats to knownfailures | |
| b55dd00 am 00feece5: am 7cb290fa: am 909d5e7a: am db2c8c06: am 9c072750: am 68488024: am 0e7c5837: am b40bc889: Merge "Disable Notification Package Prior item for the watch feature" into lmp-sprout-dev | |
| 3c5d916 am b757c186: am ba1be016: am 7579cfbd: (-s ours) am 8f3818c7: am 73efff7e: am 597f0d8a: am 04e99c51: am 2024fae2: (-s ours) DO NOT MERGE: camera2 CTS: Actually close Images in StillCaptureTest. | |
| 5441035 am c3d69eb4: am b4e224c0: am 2fd9b68c: am e2b88dd4: am a1bc6bde: am 106b6734: am 4c2ff297: am 755f327f: Merge "Disable BLE offloaded scan batching test" into lmp-sprout-dev | |
| e572ce1 am 9c6326b2: am a662c9ea: am bfb42226: am 08f0affe: am 5a5efc62: am 11076f2b: am 32f21834: am 0a9f5b13: Merge "Disable test to verifying BLE offloaded scan batching" into lmp-sprout-dev | |
| ab27a7f am 200751f7: am 5c01b52f: am 811a5df7: am 4732c772: am 2091c9d6: am ec4ebca6: am 0c914add: am efbda486: Skip tests that depend on system resources and assets.. | |
| 36925e1 am dfc3fe5a: am 96996817: am a002ffa9: am d4b3b364: am 5e559d26: am 8b25ee96: am 4201266d: am 055ca5b6: ConsumerIrTest: add the right permission for some test case | |
| 661a8c9 am 175b7f0c: am de384d64: am 4bcc0580: am f07b488e: am 6a8dad25: am fcf719d6: am 223c2ddb: am 44e09b47: Merge "Add cts test for testing launcher version." into lmp-sprout-dev | |
| 71c4c82 am fad5cc80: am c64b8f22: am 162c0444: am 1b27b143: am 15b79989: am 2795a64d: am e19f335f: am fc60c4c3: CameraITS: improve ITS user experience | |
| 0e7db13 am c0cee034: am dced4bd0: am e154e730: am eac47aaf: am bd5bfe2f: am 126c3d7e: am 04faf13a: am 3dd9f1ec: Fix testPageScroll by not using waitForIdleSync. | |
| e608758 am f7dce5e1: am 9981d6bc: am b0161879: am a4f1fb59: am 8b715115: am cccd8f7c: am 4ca392ca: am 335a73ee: Merge "CameraITS: fix fixed focus lens check" into lmp-sprout-dev | |
| ae60263 am 24825caf: am c36a66c3: am 65b3df90: am 43f35421: am 4d9e4dfc: am d60b7656: am f91b8851: am b05a90b5: Merge "Hide BLE scanner test if BLE advertiser test is hidden." into lmp-sprout-dev | |
| 17fdb0f am 52eb8d9e: am f68f5925: am 0f27645b: am 3e72b1d6: am 54020929: am b1c47db5: am ab9b8eb6: am 332674c2: Merge "Camera: add missing FULL level expectation" into lmp-sprout-dev | |
| 3b775f2 am 19cff2cd: am 3ee4640f: am f79c80b0: am 9a3bde81: am 39a341cf: am eedd977d: am bd21a959: am a36ed7c1: Merge "Camera: fix recording test for legacy mode" into lmp-sprout-dev | |
| 74fe091 am 472d4cf5: am 96a8c3a8: am 8b87db02: am 40825b78: am b44c2026: am a38ac188: am a333975e: resolved conflicts for b7c771fc to lmp-dev | |
| 2ef184c am ec69c650: am b68b2c72: am a9211444: am 58e3f579: am e274f3c4: am f406b544: am 26cab4c8: am d43e4fd9: am bb8b3aa6: am 1ab73263: Merge "Add test for Keystore put overflow" into klp-dev | |
| 374a35e am 0dd9a7e0: am 87405554: am 03b2a014: am 436ff357: am 59c49231: am 7e8bbb26: am 60c9eecd: am 04915882: am 56e775b7: am 6e622718: Add 5-second timeout to testFlacHeapOverflow | |
| 5df3088 am 6957dbdb: am 448bc237: am 1660d7d2: am c7c9c4c1: am d40a05d1: am 8e908f24: am 32fa2bc0: am f3517f18: Merge "Advertise 31 bytes in BLE advertise tests." into lmp-sprout-dev | |
| 697cd39 am 98c60ad3: am ebbae3a9: am 5cdb1cdc: am ec5d3f7b: am 0deee593: am 53cee77b: am 5dd2c7da: am f7696b87: Merge "CameraITS: update test_capture_result" into lmp-sprout-dev | |
| 0d53fc9 am 78088446: am c124c051: am e7882151: am b8a97572: am a7166578: am 89f03fa9: am 5aa3406d: am 7fd06374: Fix possible race condition in Sensor CTS framework. | |
| 9bee62d am 176b99d6: am 57b53d98: am c6909f4a: am 13df946c: am acb2553c: am 632f8bb3: am 76ad4e6d: am 7e6371ab: Merge "Replace getContext with getTargetContext." into lmp-sprout-dev | |
| 839387f am d5513acf: am 8cbc5a72: am fa7b45dd: am 9800b063: am b63e588f: am 97af9332: am 54005969: am 542c2844: media: update vp9 360p test clip with tile columns and frame parallel mode turned on. | |
| 10b5b8c am 58f15c3e: am f35b4f15: am 6fb92f4e: am dde6270f: am 57222a19: am 5e66df9f: am 3a86d93f: am 7fc44c34: Merge "update EncoderVirtualDisplayTest to use very long i-frame interval." into lmp-sprout-dev | |
| 3e048e5 am 9eede1d1: am 4a8b28c8: am 0a29079b: am a2ef610c: am 93c0cfc9: am a4dc5fe2: am 93fb3cab: am 590472d9: Enable hardware scan filter test on device which supports the feature. | |
| 6b8775f am 72f7949b: am d8f6d748: am 2b835303: am 8616659a: am 9e0d6022: am fc33acb2: am 00e937fa: am 8eb56465: Merge "Remove hardware scan filter test, and re-enable BLE advertise/scanner test." into lmp-sprout-dev | |
| 962c0c1 am 55af5ae6: am 5c825a41: am 331ed28b: am d81ff9d5: am c3926080: am 08f1480d: am d158fe3e: am 1381382e: Merge "CameraITS: various ITS improvement" into lmp-sprout-dev | |
| 9b5c2fd am dc0581bb: am e9d91e2b: am 80e14290: am 87670398: am d4b790c4: am 848f9cce: am e5e8101b: am 3fefecef: Merge "Add test for checking max users > 1 if managed users feature enabled" into lmp-sprout-dev | |
| fbb4257 am fbe43c10: am 0a0f2ce4: am 8b723f44: am dbebdf95: am 6cf27e6a: am ca472a36: am 325a4115: am 6a13e8da: Merge "More cts-verifier tests for profile-aware Settings." into lmp-sprout-dev | |
| 023c50e am 7155823e: am b13b0acc: am 0fe39d72: am 73134685: am 61a4fce3: am 84283992: am 6e499f6f: am fb758de5: Merge "Add CTS test to test Setup wizard Nfc config." into lmp-sprout-dev | |
| 2e26d37 am f33b96d1: am 96822b87: am 2b6b6602: (-s ours) am 957e7237: am 2f9f62e6: am 85ac1535: am ba5ed70d: am ba893966: (-s ours) Disable screen pinning test on watches and tvs. DO NOT MERGE | |
| bf2087d am f9ef22f0: am 4af59c7a: am 1586e21d: am 34702aa5: am 22df270e: am 5f0c7c63: resolved conflicts for 0ac66cea to lmp-sprout-dev | |
| 75e7f19 am ffd92d71: am 4ba6d8b8: am b6dd7e5c: Fix NullPointException BatterySaverModeTest | |
| ffd92d7 am 4ba6d8b8: am b6dd7e5c: Fix NullPointException BatterySaverModeTest | |
| 7e8e1e0 am a6e2507e: am 15a7a83f: am f2cf89d8: Merge "CameraITS: make edge enhancement test more robust" into mnc-dev | |
| e94ad5f am 0f43d17e: am 726e1cb5: am 9cc2fa7e: Merge "CameraITS: make noise reduction tests more robust" into mnc-dev | |
| 8dbf270 am 5b89233e: am 808d00e6: CameraITS: make edge enhancement test more robust | |
| a2dd299 am 8faa9a95: am 619f2ebe: CameraITS: make noise reduction tests more robust | |
| cb6fbc4 am 9a164b7c: am 94908e55: CameraITS: tweak test_exposure | |
| a6e2507 am 15a7a83f: am f2cf89d8: Merge "CameraITS: make edge enhancement test more robust" into mnc-dev | |
| 0f43d17 am 726e1cb5: am 9cc2fa7e: Merge "CameraITS: make noise reduction tests more robust" into mnc-dev | |
| 5b89233 am 808d00e6: CameraITS: make edge enhancement test more robust | |
| 8faa9a9 am 619f2ebe: CameraITS: make noise reduction tests more robust | |
| 9a164b7 am 94908e55: CameraITS: tweak test_exposure | |
| d780062 am 1ef6a4cb: am 896c817a: am 47cacd0a: Merge "Add FocusChange Test Verify that the focused activity loses focus when the Assistant is shown." into mnc-dev | |
| 1ef6a4c am 896c817a: am 47cacd0a: Merge "Add FocusChange Test Verify that the focused activity loses focus when the Assistant is shown." into mnc-dev | |
| cd8cf83 am e1c34ffa: am 474aec10: am f55195a2: Merge "CtsVerifier: Fix cross profile intent filters test." into mnc-dev | |
| e1c34ff am 474aec10: am f55195a2: Merge "CtsVerifier: Fix cross profile intent filters test." into mnc-dev | |
| 485b493 am f554f6d8: (-s ours) am 646ed6fa: (-s ours) am b952da06: (-s ours) am 1fa9435a: (-s ours) am 2dae2571: (-s ours) am b0f33fbd: (-s ours) Merge "DO NOT MERGE ANYWHERE:revert and resubmit on lmp-dev" into lmp-mr1-dev | |
| f554f6d am 646ed6fa: (-s ours) am b952da06: (-s ours) am 1fa9435a: (-s ours) am 2dae2571: (-s ours) am b0f33fbd: (-s ours) Merge "DO NOT MERGE ANYWHERE:revert and resubmit on lmp-dev" into lmp-mr1-dev | |
| f93562f am 43d0ab8d: am 25875b74: am d7d1ab0e: Merge "Set LOCAL_CXX_STL := none for cts-usb-accessory" into mnc-dev | |
| 43d0ab8 am 25875b74: am d7d1ab0e: Merge "Set LOCAL_CXX_STL := none for cts-usb-accessory" into mnc-dev | |
| b9149c7 am d5cb747c: am 1f46e18f: am ed49dfe8: MediaPlayerTest: temporarily disable timestamp checking for seek related operations. | |
| d5cb747 am 1f46e18f: am ed49dfe8: MediaPlayerTest: temporarily disable timestamp checking for seek related operations. | |
| 0bacef2 am 42cbee8c: am b6929ebe: am 78460f94: Merge "media: skip unknown types for testGetMaxSupportedInstances test." into mnc-dev | |
| 42cbee8 am b6929ebe: am 78460f94: Merge "media: skip unknown types for testGetMaxSupportedInstances test." into mnc-dev | |
| 736bcbf am 6164532c: am 931e3b27: am e5aedb2b: am 590fa76b: (-s ours) am 2ced4bfc: am 05d0eea3: am 90f66ced: am 5f4469e5: am b0fedae0: (-s ours) am b0fe4ab6: am 1828e78f: Merge "DO NOT MERGE: Test whether mediaserver leaks info across invalid binder calls" into klp-dev | |
| 78887f3 am 5a0fd9fa: am 25efb18c: am 230c9ed9: am 5b8fe71b: (-s ours) am 49f91150: am 297566ce: am 0026da26: am fcbdc233: am 15b87ee0: (-s ours) am 7e61e28c: am 6716b0a3: am ecd778f8: (-s ours) Merge "DO NOT MERGE Capture fields in CTS:" into kitkat-cts-dev | |
| 00691d1 am 132f6382: am a44571d5: am 469754a9: am 5be5c5bc: (-s ours) am 0a6fc7c9: am 90013bcf: am 0a74c306: am f90847d9: am 4b25e16a: (-s ours) am 2fe211ed: am 38689fc0: am 5df7c06e: (-s ours) Merge "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.versi | |
| 09815bb am 18a1463c: am a4fef7b2: am 918acaf7: am 4afc710e: am d4d9477e: am 4271b94e: am f068eb18: am d8cd984c: am e7a26fd2: (-s ours) am d57eb7c4: am f9a424d9: am b7a630fc: Merge "fixed mockview" into kitkat-cts-dev | |
| 770914e am d99af6fa: am 8eda87d1: am 5041a3b8: am 5494e170: am 74b5acd9: am 22c153cd: am 7fe14cd5: am 693b702f: am e3113c87: am 74e0dbd3: am 5d56a68c: am 0dfe1521: Merge "Collect smallestScreenWidthDp in CTS" into kitkat-cts-dev | |
| 90e0e36 am 92999acd: am e303ed1c: am a380261c: am c4785bb5: am ed61465e: am a174bf32: resolved conflicts for e78a371a to lmp-mr1-dev | |
| 6164532 am 931e3b27: am e5aedb2b: am 590fa76b: (-s ours) am 2ced4bfc: am 05d0eea3: am 90f66ced: am 5f4469e5: am b0fedae0: (-s ours) am b0fe4ab6: am 1828e78f: Merge "DO NOT MERGE: Test whether mediaserver leaks info across invalid binder calls" into klp-dev | |
| 5a0fd9f am 25efb18c: am 230c9ed9: am 5b8fe71b: (-s ours) am 49f91150: am 297566ce: am 0026da26: am fcbdc233: am 15b87ee0: (-s ours) am 7e61e28c: am 6716b0a3: am ecd778f8: (-s ours) Merge "DO NOT MERGE Capture fields in CTS:" into kitkat-cts-dev | |
| 132f638 am a44571d5: am 469754a9: am 5be5c5bc: (-s ours) am 0a6fc7c9: am 90013bcf: am 0a74c306: am f90847d9: am 4b25e16a: (-s ours) am 2fe211ed: am 38689fc0: am 5df7c06e: (-s ours) Merge "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_p | |
| 18a1463 am a4fef7b2: am 918acaf7: am 4afc710e: am d4d9477e: am 4271b94e: am f068eb18: am d8cd984c: am e7a26fd2: (-s ours) am d57eb7c4: am f9a424d9: am b7a630fc: Merge "fixed mockview" into kitkat-cts-dev | |
| d99af6f am 8eda87d1: am 5041a3b8: am 5494e170: am 74b5acd9: am 22c153cd: am 7fe14cd5: am 693b702f: am e3113c87: am 74e0dbd3: am 5d56a68c: am 0dfe1521: Merge "Collect smallestScreenWidthDp in CTS" into kitkat-cts-dev | |
| 92999ac am e303ed1c: am a380261c: am c4785bb5: am ed61465e: am a174bf32: resolved conflicts for e78a371a to lmp-mr1-dev | |
| 695c195 am d44c2275: am c4037d79: am 046392d1: am 4cf77ab5: am 9d7239a6: am f322a261: resolved conflicts for fa586518 to lmp-mr1-dev | |
| d44c227 am c4037d79: am 046392d1: am 4cf77ab5: am 9d7239a6: am f322a261: resolved conflicts for fa586518 to lmp-mr1-dev | |
| c20dd27 am 725ea223: am 2c1f1d80: am d8d24e68: am 1eac1984: am 2ff6f924: am f5f73c32: Merge commit \'52f5efb4\' into manualmerge | |
| 725ea22 am 2c1f1d80: am d8d24e68: am 1eac1984: am 2ff6f924: am f5f73c32: Merge commit \'52f5efb4\' into manualmerge | |
| 9cc3c31 am d5a74c1a: am b4fbcca4: am f4def3f7: am 832ca416: am 8acac4d0: am 4ab57130: am 35b41c0c: am b75b6794: am ebad7300: am 45643db7: am 03786bc4: am 5295dc65: Merge "Support WiFi only device at runtime." into kitkat-cts-dev | |
| 3bbf7f5 am 09cd4370: am 7749e208: am 1bc14eb3: am 390d8efc: am e6323bd9: am abc58064: am 2208d5f9: am 99f39b60: am 836be21e: am 70c39833: am 9fad0d77: am 5e6120eb: Merge "Revert "Cts test fix for shortcode 48000"" into kitkat-cts-dev | |
| 14d0d9f am 44ea8299: am 4c19eea0: am ecd32971: am e29de33b: am ced59e46: am c4c61410: am 18c71c75: am 02e5e1a9: am 5c11bdb7: am 9b69b2c5: am 7a3bd4b1: am 73c024cb: Merge "Revert "improve TestVirtualDisplayRecycles to reduce memory usage"" into kitkat-cts-dev | |
| 589398c am 161346a2: am d1a5249e: am d6e1b6a5: am 080842d7: (-s ours) am 8388f73d: am f9777e93: resolved conflicts for d8f34e98 to lmp-mr1-dev | |
| eb70837 am 39ffcd9c: am 9601d9ae: am 5d467c27: Merge "Add CTS tests for IAudioflinger binder checks." into mnc-dev | |
| d5a74c1 am b4fbcca4: am f4def3f7: am 832ca416: am 8acac4d0: am 4ab57130: am 35b41c0c: am b75b6794: am ebad7300: am 45643db7: am 03786bc4: am 5295dc65: Merge "Support WiFi only device at runtime." into kitkat-cts-dev | |
| 09cd437 am 7749e208: am 1bc14eb3: am 390d8efc: am e6323bd9: am abc58064: am 2208d5f9: am 99f39b60: am 836be21e: am 70c39833: am 9fad0d77: am 5e6120eb: Merge "Revert "Cts test fix for shortcode 48000"" into kitkat-cts-dev | |
| 44ea829 am 4c19eea0: am ecd32971: am e29de33b: am ced59e46: am c4c61410: am 18c71c75: am 02e5e1a9: am 5c11bdb7: am 9b69b2c5: am 7a3bd4b1: am 73c024cb: Merge "Revert "improve TestVirtualDisplayRecycles to reduce memory usage"" into kitkat-cts-dev | |
| 161346a am d1a5249e: am d6e1b6a5: am 080842d7: (-s ours) am 8388f73d: am f9777e93: resolved conflicts for d8f34e98 to lmp-mr1-dev | |
| 39ffcd9 am 9601d9ae: am 5d467c27: Merge "Add CTS tests for IAudioflinger binder checks." into mnc-dev | |
| 2e15d8c am e58cfcc2: am 47c4bcdb: am 2644f1a3: am 27ee31b1: am db7ab6df: am 77c1795f: am 2b7a3a48: am 4057a3f6: am 72ffb41f: am 3297b259: am e4ff0843: am f394d10b: Merge "Revert "fix audio policy service binder security tests."" into kitkat-cts-dev | |
| 3e1eda6 am b668ca47: am d8cd3a33: am a34113ed: am a73fb808: am 8f722176: am 204f2e55: am 1bf19cd2: am b57d1324: resolved conflicts for 5d2795d5 to lmp-dev | |
| 81ba5ca am ac9364d8: am b155651c: am b5eec18c: am 4115ccf5: am c64edd57: am e78acc0f: am ddaf581d: am 58a9b148: am 061f7ae8: am 3eaefd66: am c501a856: am 67168984: Merge "fix audio policy service binder security tests." into kitkat-cts-dev | |
| 5b72fd4 am f7031ef2: am 5af0ff26: am 0a2d3ca4: am 587697a6: am 82e9dfff: am 3cdef6b9: am 700c63e8: am dcdff1e4: am f4b129f3: (-s ours) am 5f60500b: am 2ac7db23: am 4a53e934: Merge "Changed the size of MockView according to resolution." into kitkat-cts-dev | |
| 458d068 am 333a9265: am 9ca1fbca: am 0ef1aee5: am 4e78c427: am 6033f21b: am ed895ffc: am f437699d: am 61fe0e30: resolved conflicts for 0c3fb21f to lmp-dev | |
| 2f49bf6 am 827d7aad: am b8414005: am 50a1edde: am 537b0ffb: am 472e5b86: am 7688b150: am 1add198c: am 4a808805: resolved conflicts for dc43e0e6 to lmp-dev | |
| f2146fa am 6f914e59: am 1c6e554f: am d2ea521a: am 8de8228e: am d3e94829: am da08ae6e: am f35d33d6: am a3aca4a3: am 358d45e3: am c2ad0fb7: am 6903fb53: am 52a2733a: Merge "Modified testRecorderCamera() to get camera supported resolution for testing." into kitkat-cts-dev | |
| d2d4107 am 26c987a2: am 9548a9fa: am 2a3ab13b: am e9975a96: am 2fbf4e40: am 90a8383d: am 83cef1fc: am 111d290a: am 19ea5424: am 2cafea38: am 90dc2f92: am 675f1cc7: Merge "CtsVerifier: update mPreviewTex in case of mismatch with mFormatView" into jb-mr1.1-cts-dev automerge: db | |
| 351cb1e am 3cca8017: am 66d51e75: am 7274fa70: am 3ef5ecf1: am 39302816: am da8c7344: am 3e9de2dc: am ed161071: am 17d68538: resolved conflicts for 78a2547f to klp-modular-dev | |
| 1a3a6d9 am b6a41007: am d5538b13: am 5c952a80: am b2beac73: am ecfd39e9: am f64d47fa: am 364342b1: am 854c6d94: am 945dd822: am d1d8716d: am deca15e4: am 674617f3: Merge "Fix CTS verifier camera orientation test." into kitkat-cts-dev | |
| 6b0b58d am 8893d6e9: am c6a15044: am 1b91293c: am 5c74d7e4: am 3b9fa343: am 46c0a1b6: am 4f9eaee9: am 86f8b07b: am fbd2753f: resolved conflicts for a8ab57fe to klp-modular-dev | |
| 63d3662 am 098468e8: am a60316d8: am 03d44587: am 28982481: am 63537c05: am 88ba6400: am cf4fcc6c: am 5d3b7c0b: am 60f20393: am 8237115f: am 2029a017: am 3323726d: Merge "Revert "Update CTS Verifier camera video tests to check for a microphone in camera video recording tests. | |
| 759ac95 am 89f10e4d: am 2b67ac9f: am e4ab2808: am 96d1e8da: am fc4656b3: am 4d97dfe8: am c22934e7: am 06a310d4: am 344a8b06: am 329be38a: am 334be519: am beaa1c12: Merge "MediaRecorderStressTest: use smallest supported preview size." into kitkat-cts-dev | |
| 1335c0b am 5ed8b078: am 561a590d: am fa87a1a9: am 62d52618: am 1f13cf42: am 925e922b: am 7cbe5bbd: am 0c243448: am 86a008ea: am 556e8377: am 513cd81a: am b5b05ae2: Merge "Update CTS Verifier camera video tests to check for a microphone in camera video recording tests." into k | |
| 71f19bb am 5f57b13d: am 9766e48f: am a7debcc9: am b9368f28: am f066e32f: am df59fd8c: resolved conflicts for f2ec6286 to lmp-mr1-dev | |
| 35805a1 am 0ba7d56f: am 8a3c2bee: am 637bf35d: am 3d0f3ac2: am 42cb8eef: am 93344df2: am 95dcb6e7: am 7beb0878: am a9853b0a: am 34f2fab8: am 9b5c55e2: am 76c8e3d5: Merge "Fix bugs regarding AdapterView layout size with large font scale in AdapterViewTest" into jb-mr1.1-cts-de | |
| 85e2fa9 am de291ce0: am d0d7dcb7: am fc234194: am 6e894f7b: am 1f37aa65: am 7b4c7074: am 4e457b0b: am 57a93280: am 66c72bb4: am babbb90e: am 897fe389: am 1aa503cc: Merge "Revert "Fix android.webkit.cts.WebViewTest#testFindNext seldom fail"" into jb-mr1.1-cts-dev automerge: 7e | |
| 96ba105 am df2fa73a: am 0a76b014: am 90d7197f: am 6091c2f2: am b465b172: am 5b1c09f3: am 063d9879: am d9312d1c: am 71ef9586: am 72172502: am 12ac02b6: am de566354: Merge "Adding 53024, NZC as it does not support report delivery." into kitkat-cts-dev | |
| 2607b7e am c7a494f5: am 26e51d6d: am 5e357a03: am e943a937: am f5cd2ae7: am eb76fa67: am 294980ef: am 0f694d41: am 57dd0679: am c1798a5a: am fbfa5f93: am 53fbbd05: Merge "CtsUiAutomatorTest pinchin/pinout test case: add support for 480X320 pixel solution device. The pinchin/p | |
| 97fafc8 am 401396a9: am 6059454f: am ebbf7652: am 3403adb9: am 0f1fcb19: am 6d9ae8eb: am 8eba2069: am a2cf50ca: am 955b1c3f: am 22dafe47: am bd524065: am c73d8100: Merge "Fix CTS android.provider package testAccountRemovalWithMergedContact_doesNotDeleteContactAndTimestampUpda | |
| de9271d am 5749ca65: am 297136ab: am 819f2d33: am 8ec7375a: (-s ours) am dacd079c: am a8556b31: am 093d1f7a: am 04190bcb: am 42bcd44b: (-s ours) am d92207f5: am b4715699: am 09c6bcfb: (-s ours) Merge "DO NOT MERGE: Mimmum application memory should be 96MB" into kitkat-cts-dev | |
| 7c78a54 am 13355871: am 3a29c3b4: am 5f6c5a8d: am 52729026: am 024bb87e: am 4aa29cad: am 2a1d1a92: am 79b8a7a5: am 42a968d3: am 0e3b22b3: am d460a355: am 52948ac4: Merge "DEV HACK: cts: increase permitted colour delta" into kitkat-cts-dev | |
| 68b38a8 am e70d211f: am b1b41ccf: am f6aa9fec: am f7852e3d: am 9ddfae1f: am 9b8fa942: am 7cc83a06: am 05bd30d5: am 6fa10861: am f70ce3e2: am 52415d8c: am 3efc0e57: Merge "Fix android.webkit.cts.WebViewTest#testFindNext seldom fail" into jb-mr1.1-cts-dev automerge: b28682b aut | |
| 5bd8972 am 96932589: am b6a20578: am 3eeafc4b: am 2a6aeb7a: (-s ours) am f02ace30: am 3c8fd6d3: resolved conflicts for 1b8460f7 to lmp-mr1-dev | |
| e58cfcc am 47c4bcdb: am 2644f1a3: am 27ee31b1: am db7ab6df: am 77c1795f: am 2b7a3a48: am 4057a3f6: am 72ffb41f: am 3297b259: am e4ff0843: am f394d10b: Merge "Revert "fix audio policy service binder security tests."" into kitkat-cts-dev | |
| b668ca4 am d8cd3a33: am a34113ed: am a73fb808: am 8f722176: am 204f2e55: am 1bf19cd2: am b57d1324: resolved conflicts for 5d2795d5 to lmp-dev | |
| ac9364d am b155651c: am b5eec18c: am 4115ccf5: am c64edd57: am e78acc0f: am ddaf581d: am 58a9b148: am 061f7ae8: am 3eaefd66: am c501a856: am 67168984: Merge "fix audio policy service binder security tests." into kitkat-cts-dev | |
| f7031ef am 5af0ff26: am 0a2d3ca4: am 587697a6: am 82e9dfff: am 3cdef6b9: am 700c63e8: am dcdff1e4: am f4b129f3: (-s ours) am 5f60500b: am 2ac7db23: am 4a53e934: Merge "Changed the size of MockView according to resolution." into kitkat-cts-dev | |
| 333a926 am 9ca1fbca: am 0ef1aee5: am 4e78c427: am 6033f21b: am ed895ffc: am f437699d: am 61fe0e30: resolved conflicts for 0c3fb21f to lmp-dev | |
| 827d7aa am b8414005: am 50a1edde: am 537b0ffb: am 472e5b86: am 7688b150: am 1add198c: am 4a808805: resolved conflicts for dc43e0e6 to lmp-dev | |
| 6f914e5 am 1c6e554f: am d2ea521a: am 8de8228e: am d3e94829: am da08ae6e: am f35d33d6: am a3aca4a3: am 358d45e3: am c2ad0fb7: am 6903fb53: am 52a2733a: Merge "Modified testRecorderCamera() to get camera supported resolution for testing." into kitkat-cts-dev | |
| 26c987a am 9548a9fa: am 2a3ab13b: am e9975a96: am 2fbf4e40: am 90a8383d: am 83cef1fc: am 111d290a: am 19ea5424: am 2cafea38: am 90dc2f92: am 675f1cc7: Merge "CtsVerifier: update mPreviewTex in case of mismatch with mFormatView" into jb-mr1.1-cts-dev automerge: db2f7f4 automer | |
| 3cca801 am 66d51e75: am 7274fa70: am 3ef5ecf1: am 39302816: am da8c7344: am 3e9de2dc: am ed161071: am 17d68538: resolved conflicts for 78a2547f to klp-modular-dev | |
| b6a4100 am d5538b13: am 5c952a80: am b2beac73: am ecfd39e9: am f64d47fa: am 364342b1: am 854c6d94: am 945dd822: am d1d8716d: am deca15e4: am 674617f3: Merge "Fix CTS verifier camera orientation test." into kitkat-cts-dev | |
| 8893d6e am c6a15044: am 1b91293c: am 5c74d7e4: am 3b9fa343: am 46c0a1b6: am 4f9eaee9: am 86f8b07b: am fbd2753f: resolved conflicts for a8ab57fe to klp-modular-dev | |
| 098468e am a60316d8: am 03d44587: am 28982481: am 63537c05: am 88ba6400: am cf4fcc6c: am 5d3b7c0b: am 60f20393: am 8237115f: am 2029a017: am 3323726d: Merge "Revert "Update CTS Verifier camera video tests to check for a microphone in camera video recording tests."" into kitka | |
| 89f10e4 am 2b67ac9f: am e4ab2808: am 96d1e8da: am fc4656b3: am 4d97dfe8: am c22934e7: am 06a310d4: am 344a8b06: am 329be38a: am 334be519: am beaa1c12: Merge "MediaRecorderStressTest: use smallest supported preview size." into kitkat-cts-dev | |
| 5ed8b07 am 561a590d: am fa87a1a9: am 62d52618: am 1f13cf42: am 925e922b: am 7cbe5bbd: am 0c243448: am 86a008ea: am 556e8377: am 513cd81a: am b5b05ae2: Merge "Update CTS Verifier camera video tests to check for a microphone in camera video recording tests." into kitkat-cts-dev | |
| 5f57b13 am 9766e48f: am a7debcc9: am b9368f28: am f066e32f: am df59fd8c: resolved conflicts for f2ec6286 to lmp-mr1-dev | |
| 0ba7d56 am 8a3c2bee: am 637bf35d: am 3d0f3ac2: am 42cb8eef: am 93344df2: am 95dcb6e7: am 7beb0878: am a9853b0a: am 34f2fab8: am 9b5c55e2: am 76c8e3d5: Merge "Fix bugs regarding AdapterView layout size with large font scale in AdapterViewTest" into jb-mr1.1-cts-dev automerge: | |
| de291ce am d0d7dcb7: am fc234194: am 6e894f7b: am 1f37aa65: am 7b4c7074: am 4e457b0b: am 57a93280: am 66c72bb4: am babbb90e: am 897fe389: am 1aa503cc: Merge "Revert "Fix android.webkit.cts.WebViewTest#testFindNext seldom fail"" into jb-mr1.1-cts-dev automerge: 7e9df5b automer | |
| df2fa73 am 0a76b014: am 90d7197f: am 6091c2f2: am b465b172: am 5b1c09f3: am 063d9879: am d9312d1c: am 71ef9586: am 72172502: am 12ac02b6: am de566354: Merge "Adding 53024, NZC as it does not support report delivery." into kitkat-cts-dev | |
| c7a494f am 26e51d6d: am 5e357a03: am e943a937: am f5cd2ae7: am eb76fa67: am 294980ef: am 0f694d41: am 57dd0679: am c1798a5a: am fbfa5f93: am 53fbbd05: Merge "CtsUiAutomatorTest pinchin/pinout test case: add support for 480X320 pixel solution device. The pinchin/pinout test ne | |
| 401396a am 6059454f: am ebbf7652: am 3403adb9: am 0f1fcb19: am 6d9ae8eb: am 8eba2069: am a2cf50ca: am 955b1c3f: am 22dafe47: am bd524065: am c73d8100: Merge "Fix CTS android.provider package testAccountRemovalWithMergedContact_doesNotDeleteContactAndTimestampUpdated seldom fa | |
| 5749ca6 am 297136ab: am 819f2d33: am 8ec7375a: (-s ours) am dacd079c: am a8556b31: am 093d1f7a: am 04190bcb: am 42bcd44b: (-s ours) am d92207f5: am b4715699: am 09c6bcfb: (-s ours) Merge "DO NOT MERGE: Mimmum application memory should be 96MB" into kitkat-cts-dev | |
| 1335587 am 3a29c3b4: am 5f6c5a8d: am 52729026: am 024bb87e: am 4aa29cad: am 2a1d1a92: am 79b8a7a5: am 42a968d3: am 0e3b22b3: am d460a355: am 52948ac4: Merge "DEV HACK: cts: increase permitted colour delta" into kitkat-cts-dev | |
| e70d211 am b1b41ccf: am f6aa9fec: am f7852e3d: am 9ddfae1f: am 9b8fa942: am 7cc83a06: am 05bd30d5: am 6fa10861: am f70ce3e2: am 52415d8c: am 3efc0e57: Merge "Fix android.webkit.cts.WebViewTest#testFindNext seldom fail" into jb-mr1.1-cts-dev automerge: b28682b automerge: 7032a | |
| 9693258 am b6a20578: am 3eeafc4b: am 2a6aeb7a: (-s ours) am f02ace30: am 3c8fd6d3: resolved conflicts for 1b8460f7 to lmp-mr1-dev | |
| 3b3b738 am b18bce3d: am 0c31acd3: am 28330115: am 8d8a7806: am e3d7e488: am 0b65959b: Fix build error in ExtractDecodeEditEncodeMuxTest. | |
| b18bce3 am 0c31acd3: am 28330115: am 8d8a7806: am e3d7e488: am 0b65959b: Fix build error in ExtractDecodeEditEncodeMuxTest. | |
| 380be27 am 61c21304: am 439fdd94: am 2fed8096: am 872f0eda: am 29d14b30: am 711c810f: am 1d7a3258: am 1e8b2747: am cc077750: am 71c5c3cc: am 8984ed1c: am 3aac281f: Merge "Update lists of OpenMobileCommuticaton operators" into kitkat-cts-dev | |
| d970175 am 9c81df4f: am 7b7a7e2e: am c2fe9a93: am 76b587da: am b22c08ec: am 61089e63: am c499c21f: am 9bdad0d5: am 5a74b348: resolved conflicts for 93b62064 to klp-modular-dev | |
| 4880706 am f87808cc: am 30975f1c: am f0a7e50b: am f546125a: am 88815f56: am 4da739b3: am 8a21a3cc: am 83021069: resolved conflicts for 8b963c52 to lmp-dev | |
| 5c6b4e0 am 173d57fe: am 3d20147e: am dcbe37ce: am 3229d3be: am 22970ce7: am 455b60e5: resolved conflicts for 1a571197 to lmp-mr1-dev | |
| 61c2130 am 439fdd94: am 2fed8096: am 872f0eda: am 29d14b30: am 711c810f: am 1d7a3258: am 1e8b2747: am cc077750: am 71c5c3cc: am 8984ed1c: am 3aac281f: Merge "Update lists of OpenMobileCommuticaton operators" into kitkat-cts-dev | |
| 9c81df4 am 7b7a7e2e: am c2fe9a93: am 76b587da: am b22c08ec: am 61089e63: am c499c21f: am 9bdad0d5: am 5a74b348: resolved conflicts for 93b62064 to klp-modular-dev | |
| f87808c am 30975f1c: am f0a7e50b: am f546125a: am 88815f56: am 4da739b3: am 8a21a3cc: am 83021069: resolved conflicts for 8b963c52 to lmp-dev | |
| 173d57f am 3d20147e: am dcbe37ce: am 3229d3be: am 22970ce7: am 455b60e5: resolved conflicts for 1a571197 to lmp-mr1-dev | |
| a58e642 am 952db95d: am f6a0d65f: am 349f16bd: am fa602ec1: am c75e9b42: am 7eddecdd: am 33329d2a: am 14b1c468: am 6934f5fe: am d79a1aea: am c0c68f25: am c282df3c: Merge "Adjust 480p ratio range in CameraVideoActivity.java." into kitkat-cts-dev | |
| f2fdc87 am 69c1ed0b: am d1d92d46: am 4f1049b5: am a94e17e0: am 52354b01: am 0418425f: am 7a05951f: am 8cb074a9: am e8f0aba9: am aa3836f7: am fc5a66b5: am 639522d5: Merge "AbiTest: Include QDSP6 ELF binaries in validity check" into kitkat-cts-dev | |
| c5d2932 am c2aa89ce: am 40d64e23: am 9871145a: am 8bb74a86: am 535e34aa: am 0b7dc6f2: am 638a1f16: am 87dfd1b5: am ecce8ed7: am 38febf23: am 3c13e1f8: am 36db51ef: Merge "Remove bad test cases from MemoryFileTest." into kitkat-cts-dev | |
| 2448793 am a94188c2: am 5faba701: am 9d9d6fb0: am c476913c: am 7362d0a7: am 9afd5ac2: resolved conflicts for d3063af9 to lmp-mr1-dev | |
| 952db95 am f6a0d65f: am 349f16bd: am fa602ec1: am c75e9b42: am 7eddecdd: am 33329d2a: am 14b1c468: am 6934f5fe: am d79a1aea: am c0c68f25: am c282df3c: Merge "Adjust 480p ratio range in CameraVideoActivity.java." into kitkat-cts-dev | |
| 69c1ed0 am d1d92d46: am 4f1049b5: am a94e17e0: am 52354b01: am 0418425f: am 7a05951f: am 8cb074a9: am e8f0aba9: am aa3836f7: am fc5a66b5: am 639522d5: Merge "AbiTest: Include QDSP6 ELF binaries in validity check" into kitkat-cts-dev | |
| c2aa89c am 40d64e23: am 9871145a: am 8bb74a86: am 535e34aa: am 0b7dc6f2: am 638a1f16: am 87dfd1b5: am ecce8ed7: am 38febf23: am 3c13e1f8: am 36db51ef: Merge "Remove bad test cases from MemoryFileTest." into kitkat-cts-dev | |
| a94188c am 5faba701: am 9d9d6fb0: am c476913c: am 7362d0a7: am 9afd5ac2: resolved conflicts for d3063af9 to lmp-mr1-dev | |
| 4a14cad am 9021d20b: am 00d6db7e: am 68abb2f3: am ed9d8a32: am 273a8a0b: am dfd005bc: am e69b4ef7: am c1ace057: am 79892c8d: Merge "Differentiate device feature checking across Device Policy tests" into lmp-sprout-dev | |
| da5dca5 am d0bfecce: am a9b64d76: am da34492e: am 8a9e9136: am 5114f255: am 9eedfed7: am de230c5f: am a0f811ff: am 669878b9: am 6ba3009d: am 0744f81e: am 5bff7130: am 605ed8bd: am 740270dc: am 1ca6c54c: am 135b3967: am cbbfd900: am f82b9449: am 29de7b18: am 7988d7f8: am 83dd0 | |
| 1ca962d am d1c50b7e: am 18fbd9c2: am 7625ad8b: am fadd2e21: am a60ee964: am 1437426d: am 67da8d81: am 86e0f83c: am 3d1db89f: am 888442b4: am a4806613: am b47d4caf: am 757d18ee: am 4262e900: am 4533f807: am fe32ca76: am a029dcc0: am aa58f460: am 2fcdab95: am 6cab21b6: am ab0bb | |
| 83da7f7 am 1ad79c1f: am fdb15d20: am fba89a1d: am dbf44c00: am 287ad838: am 31b6a4ef: am 5b4fdaa0: am ee84e875: am 9c418157: Fixed issue where location from network feature was not properly ignored. | |
| dff5303 am aef308e9: am ec9c2e42: am fde75738: am 51f1eb37: am 22a911a4: am 8add9fea: am a2e500df: am ab21b778: am 91a8163f: am e2617e7c: am 6dd2d0f5: am 2772992b: am 6614394a: am 5028a1a1: am 1eba16a5: am 86eecf46: am a15ba0e7: am b55ee96b: am f9a6b37b: am cf05e0c2: am 0969f | |
| ce16a0c am 9b2ee4c6: am 3a2f68ae: am 6c8ea087: am 94c9af99: am 0f545660: am e8c6175e: am 8adaf5a9: am fdfc5247: am 7c22f6d9: am d121e03c: am 2dbf0177: am 1ab76479: am 7f541d6d: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into klp-dev | |
| 4a4fed7 am 5d62e380: am da0d911e: am 5d42e158: am c6e96745: am 3b54c97e: am 22961964: am 801df1c4: am aa6c86d5: am 48f49f3d: Merge "Split SELinux neverallow rules test." into lmp-sprout-dev | |
| 926fb1c am 2fd082ff: am de61cd5b: am 003321c8: am 23e740c9: am 088bdf37: am 68436e59: am efe3b9ba: am e9a6212b: am 056fff4a: Merge "Change SELinuxHostTest to new sepolicy-analyze args." into lmp-sprout-dev | |
| 2106585 am 591b8b9b: am 1c1dfb76: am 95eee707: am 28548707: am 0c205ae4: am b6090e3f: am 4abe42d2: am 6bd212b1: am b5679b61: Merge "Fix MonkeyApp so it keeps the current screen orientation on TVs" into lmp-sprout-dev | |
| c0e9aea am dd253aeb: am d51fe2f0: am 2ce330a1: am 8c94b4cb: am 71c33f33: am deaedbbe: am b335930e: am 080490ef: am 30044c61: Change SELinux neverallow tests to be sepolicy-analyze based. | |
| 6739c3c am e4f07572: am 12a1e834: am ff1b1497: am 177ccb1d: am bce8b887: am 3fce2597: am 1ce136db: am 89b0aa33: am 13eae907: Fix SELinuxHostTest package structure. | |
| 6ffad39 am bad0e98f: am 14d2c2af: am 3dad41f4: am fc2fb26f: am a9318591: am 71bf0a2d: am b7fd55bc: am f47c1f71: am d101eb99: Merge "Tests for LauncherApps" into lmp-sprout-dev | |
| eb650af am f091d1e2: am 850ecc96: am 40a5cb25: am b89e4d3c: am f159cb91: am d4371f2d: am 90cadb45: am 7e729180: am 92f9ad2e: Merge "Exclude .notifications.PackagePriorityVerifierActivity for TV devices" into lmp-sprout-dev | |
| a690ed0 am 8444111f: am f40c4d13: am 95006ece: am ef88855e: am 19d613ff: am 2b88e5bc: am 92468b7c: am 095331ce: am 2af4089c: Merge "Update mdpi ldpi reference images for android.host.theme with API level 21" into lmp-sprout-dev | |
| b362b2b am f4e56400: am a7098987: am fe3c97a3: am b8ba690e: am 86b4d2ce: am 9aa34fa4: am 6ab41fb0: am ce7304f6: am 0dd5d9d9: Merge "Extend CTSVerifier tests to test for badges" into lmp-sprout-dev | |
| 1d1d797 am 50962b0c: am e9f20387: am c7197726: am 2ee1cdcb: am 30589b44: am f007b0fa: am 76e3bdf3: am 92b57d49: am 3c0ee9bf: Enable Enterprise CTS tests | |
| b582877 am e2a233ba: am a31bf9b5: am 5a3f6f86: am 4df7a245: am 90e000bb: am 0018b639: am 44a361c3: am 2016733b: am 7123c240: Merge "Optimize assets reading path in sdcard in android.host.theme" into lmp-sprout-dev | |
| e08cf94 am d48d9070: am e470491e: am c39c5bbd: am e4f97100: am d0848f33: am a4619d6a: am 33276924: am 1a8885c6: am 4cd407f4: Merge "Fix testBatchAndFlushWithMutipleSensors to handle cases where the device supports only one continuous mode sensor." into lmp-sprout-dev | |
| 57c15c7 am 926144de: am dc13705f: am 5f818fdc: am e809280a: am 14563a44: am 16317a62: am 55036646: am 9df43f09: am 6b2811eb: Merge "PresentationSyncTest: disable faster-than-refresh case" into lmp-sprout-dev | |
| 529160d am 3148aa2e: am e468c25b: am f3b52400: am 6508f508: am d683152d: am ba8014dd: am 9c549f4f: am 7a1d92f1: am 6913fe63: Make testSetTextLong() wait for its work to finish. | |
| 51d0224 am 496f21c2: am 1bd3d591: am fbf08dcf: am 2c45131f: am 529ba96f: am 44198f20: am 18a7347f: am be61051a: am 5bbff433: Merge "Slightly relax the timeout condition for testMinimumDownload" into lmp-sprout-dev | |
| 07c0ea4 am 908e0133: am 5979a32d: am 082e93d8: am 8e928be6: am 908c03ee: am 52608710: am 910002e7: am d638d615: am 191e50e2: Only pass power level scan test when a new mac address received. Not show advertiser test if the device does not support multi advertising. | |
| 59cce3e am bbbe216d: am 4379a15d: am de8bd058: am 45d819da: am 45d5b677: am 92a095d2: am 53600d36: am 4cb8264e: am 7e02403a: Merge "Re-enable profile owner provisioning in cts-verifier." into lmp-sprout-dev | |
| e087ee6 am 3e13a202: am 6d107303: am f5013711: am 8b7ba963: am d9b36ac3: am 7159bb46: am 4037d89c: am a65fba28: am 10d412aa: am d72d0954: Merge "Make hardware-backed RSA keystore a non-requirement for ATVs" into lmp-dev | |
| e689817 am b34ebd40: am bf46bf5d: am d8448514: am 941f0a90: (-s ours) am f7b3ede2: am 2e627f04: am f67731b0: am b541ff7f: am 670baeca: (-s ours) DO NOT MERGE - Fix JobScheduler CTS tests | |
| 6029c74 am 07822fd9: am 44d7851f: am bb67bbb0: am 4140d691: am 82cfb22c: am b12adafa: am 40f61fdb: am 8766ad85: am 402009e4: Merge "Improvements to suspend state detection; code cleanups and documentation. - Added additional functions computeBaselineState() and getBaselineSta | |
| 2e51894 am e2f0cee8: am f5ebd01a: am f8770209: am 2517e6a0: am c00dea4a: am b9d7ab38: am fdc83efb: am b3b3f0af: am 49803a69: Merge "Verifier: Enable and disable non-market apps" into lmp-sprout-dev | |
| 4abbb04 am 3153c8e2: am cef8fb74: am 2a150260: am 37b31608: am 213c7dd6: am 1dbfe62d: am cad2076d: am c471683a: am 2212f189: Merge "Normalize ipv6.cts.PingTest#testLoopbackPing\'s packet size" into lmp-sprout-dev | |
| 1f1d017 am db2109b4: am 46ab0036: am fd1fc463: am 49d06ee8: am 53d07324: am f431b0e8: am 10b4640d: am e2d803a0: am fb480740: Merge "Add CTS test for registering a large number of AIDs." into lmp-sprout-dev | |
| 6751a02 am 0dbf72a4: am ddbf683d: am 5aed84e2: am 86202370: am afe543da: am e9661251: am 30aaddd2: am 5de46919: am 0b355c80: CamcorderProfileTest: fix the last timelapse id value | |
| 1011b70 am 00d83539: am e624a226: am 5cea5a95: am efd30190: am ee4b24d7: am bd2a8715: am f02a812f: am 5184ef42: am 9673c600: Merge "Fix testSyncFiles_extStorageVariable and testSyncFiles_normal" into lmp-sprout-dev | |
| 7618e253 am d427caf3: am 4a892eba: am a96a2cf8: am 4f52133a: am bb8de464: am ce3378f2: am 397b952f: am 850512ce: am eebba016: am cd9ae7a8: am aa566b6a: am b49c8250: am df0e5961: am 78be3f3f: am c5b507e3: am 03a64463: am 430eeb70: am 46d82f0b: am c6fca737: am ee955b85: am 26d35 | |
| 14aa251 am 5ed69d8c: am 171f7ba7: am 343b7859: am 140d3bee: am d33f237c: am 5abc29de: am f5c3d7a5: resolved conflicts for 63b6a7d9 to lmp-sprout-dev | |
| 9354975 am 6b27b2fa: am cf3d554f: am fb6f3c45: am 16636fc7: (-s ours) am 5985ed7d: am b58c8f50: am 112ceb89: am 27228e75: am aa059250: (-s ours) DO NOT MERGE: Fix AudioManagerTest#testVolume. | |
| ccd1f16 am 47bb0066: am 322cdf30: am 2898643e: am 86a8eb20: am a3a9c5b1: am f31a1fb2: am cfc98c62: am 6a975405: am 9bd5998d: Merge "Cts tests for Settings intents" into lmp-sprout-dev | |
| 864a22e am 8061d0bb: am 097f215a: am 6714d93d: am 54c33dd5: am 87cf2a09: am 68ebf8e0: am a247f232: am 3ad9608c: am 5cd8e6a4: Merge "Remove exception check in testWipeData CTS test" into lmp-sprout-dev | |
| b96461c am 12574932: am ad06f900: am abd76666: am 2ee3f943: am 32d60672: am b07f1dcd: am 3b6f75ae: am a7c029f2: am f024450f: media: release decoder explicitly instead of relying on GC. | |
| 352c8eb am 2f573860: am ea1998d7: am d02559c3: am 12aa2762: am 8677178a: am c66cd243: am 5f2e2bfd: am 58f04ecc: am 4530b5b3: am 8c35aff7: Merge "Fix cts verifier manifest. " into lmp-dev | |
| 4a8e661 am 7d191b6f: am e225e1fa: am 04274b92: am 2fa7a5f6: am 67ba013e: am ed52ca9a: am a4d8b75b: am cd90c07f: am 7403e54f: am 9236bf39: resolved conflicts for merge of 56213945 to lmp-dev | |
| 8b572f2 am f2cd1e7b: am b5107d97: am 64d7825e: am 5460dc74: am e5c13a34: am c99e8208: am 8667cbc4: am 5f7e7a15: am 4bd6622f: Merge "Updated BoxInsetLayout with changes from main wearable support library." into lmp-sprout-dev | |
| 6c2faff am 0ac9683b: am 77c8ed55: am 51fbcf93: am 58f0c65d: am 3415a823: am 184f0b29: am c0a3a8d2: am 24b24704: am e21ff23d: am 77ae9511: Further refinement of the alarm batching test | |
| e7533e9 am 8664fff3: am 91998a63: am 905d286b: am c153cca5: am cfcd990f: am f4e9d72c: am a4c7c275: am 30a2e072: am 69c3d433: am 0d8275b2: Tweak alarm batching CTS test | |
| f4b8f57 am c24aa2b1: am 1728c4c8: am 98d55e09: am 3887df9e: am 21c22f4d: am e2b1b832: am 4d3f2054: am d983a708: am 47bd0a79: Merge "Camera: assign tonemap keys to right capability" into lmp-sprout-dev | |
| bcf63cc am d54f4223: am 09f5f21a: am feb2ebdc: am 340567b3: am 02500cb5: am d9bac5ad: am 9b0547e0: am 1e88776c: am 77274589: am be49b68a: Add alarm test for exact/inexact coalescing | |
| 5e239a7 am 079d1861: am 6bbf7d67: am 7e608dd3: am 25681a0c: am 2dbba465: am 0b1355a0: am 8955e932: am 99484603: am 23e37975: Merge "Fix the lock task cts test." into lmp-sprout-dev | |
| 42052e5 am 17e0b3f9: am 60186c0b: am 41106387: am bcb5630b: am 09774751: am bf4b0493: am bf5c137e: am f1ccf5fd: am 5ff75144: Merge "Add badged icon example to BYOD CTSVerifier test" into lmp-sprout-dev | |
| 33703d8 am 7562a0da: am 64456551: am 4b5ff38d: am 5b09f269: am bcbb712e: am b8337670: am a9a55806: am 58b5ca1d: am e1873274: Relax /dev/diag test | |
| fba2bbc am 5e22fa25: am 109c537e: am 3e5f2d4a: am 06eb96f0: am 143fd055: am 12a3fc47: am e81f3f06: am a2d15a38: am dac4e3f4: Merge "Add message about disk encryption for BYOD provisioning test." into lmp-sprout-dev | |
| a9ecf7f am 38fc08ce: am aefe54b9: am 6fbbf204: am c87ba21f: am 81e47575: am cb7b1f36: am 9daa68d4: am 68de7248: am d402c303: Merge "Use elpasedRealtime() instead of uptime() in ProjectionOffscreenActivity" into lmp-sprout-dev | |
| 0510d15 am 651ad9cf: am dc014491: am 09c5278e: am 5b0ffac4: (-s ours) am e8a9f3ba: am b2a902f8: am 347aaca8: am 90d356d9: am 731c791e: (-s ours) Merge "DO NOT MERGE: media: AdaptivePlaybackTest: properly handle missing codecs" into lmp-sprout-dev | |
| 722a08d am 18f0602f: am 96b4b208: am 34694a07: am 9496d48d: am dcebdf71: am a013c412: am 78476299: resolved conflicts for 97e70f53 to lmp-sprout-dev | |
| 0af15d4 am bbbec70f: am f2db36e7: am 2f140b04: am 99220b7d: am 510401c6: am 8182201f: am 894683c5: am f4d8853c: am f45a7cc6: am 45004cb7: am 9ce0873c: am 4d7e03fc: Merge "Fix configure check regarding AdaptivePlayback ReconfigDrcTest." into kitkat-cts-dev | |
| a8c0604 am db9ea7e2: am 43ad74df: am 0d6184e6: am 1f1b5b5a: am c402da27: am 02bfea4f: am 4f17c9ef: am a66f06e2: am fa71ec25: am f1ba62b4: am ef1481dc: am ba39064d: Merge "improve TestVirtualDisplayRecycles to reduce memory usage" into kitkat-cts-dev | |
| a4964f6 am be2d4e68: am 3091de3c: am 8c166743: am f743ea3e: am 0b453c8e: am 7a4b1d55: am 0be5d32a: am 73c4fd76: am 1bc1c1c6: am 54d7cc51: am 2f2d8d40: am 7951d40b: Merge "Fix bugs regarding Camera Video test" into kitkat-cts-dev | |
| ed454e8 am 7da1a934: am 08754586: am 8fa557af: am dbc31aed: am 37f74120: am 7502f3b6: am 2ad00f0d: am 44cfb34a: am fe88ec43: am 17607b8a: am 4106602e: am 7e84d75c: Merge "resolve merge conflicts of 930a3b5 to kitkat-cts-dev" into kitkat-cts-dev | |
| db6f981 am c1ad5adb: am 2f8c442b: am 16381480: am c9b55fd8: am 9be8a438: am 435408d6: am 83de3ad4: am ca8896cb: resolved conflicts for e6062716 to lmp-dev | |
| d99394f am 175624d0: am ed00d696: am 163ec91a: am e2a42de0: am f08d8f65: am 8d6b0367: am a4015498: am 785be5bf: am 2f3ff158: resolved conflicts for fee166c4 to klp-modular-dev | |
| fcf8110 am f82f8bcc: am 7bfbdcf8: am 361c1868: am 204ef0fa: am 9e09f05a: am 2825e469: am 814c5b0d: am 12590c93: am 1db7d811: am 7b48c977: am 39861bb3: am 37f4b540: Merge "Fix for failing test of testEOS because checksum takes too long" into jb-mr2-cts-dev automerge: a00f78c | |
| 0e961f5 am f5b0ba64: am 148ab94e: am 9c2b147c: am da3cef88: am 9d612c9e: am fb4634dd: am 7b45813d: am 43ba0c03: am 28baaec5: am ee05618c: am ca4ee5db: am ac8f57e8: Merge "Lookup private resources in run-time" into kitkat-cts-dev | |
| 99e66d8 am 94703abf: am 96a3dc29: am 1d28716b: am 3b688796: am ea25558f: am 0670036c: am 39042d3e: am 9bcbfb89: am 7d0ec798: (-s ours) am 255513d2: am e9a01330: am 8fcd7284: Merge "Fix bugs regarding ShortCodeTest that fails without "112" in ECC List." into kitkat-cts-dev | |
| a6bbc7d am ee67b123: am b9188540: am b0daa6fd: am 921778db: am 8a667a9f: am a3a74fb2: am fcf45f34: am c9d1fffc: am 3856616b: am 391ac7d4: am ef902753: am 73965a87: Merge "set delay during testPerformFiltering" into kitkat-cts-dev | |
| a2d69d2 am d0ab2a8e: am 7e0de60d: am d2362e3e: am 0038f139: am 3c1598db: am 908d2036: am 49e24450: am bd5746cb: am 5e86f0bf: am 5a6f4f38: am 74a3ed18: am 16763e64: Merge "Check for valid buffer size before proceeding with testCreateAudioRecord." into kitkat-cts-dev | |
| 9021d20 am 00d6db7e: am 68abb2f3: am ed9d8a32: am 273a8a0b: am dfd005bc: am e69b4ef7: am c1ace057: am 79892c8d: Merge "Differentiate device feature checking across Device Policy tests" into lmp-sprout-dev | |
| d0bfecc am a9b64d76: am da34492e: am 8a9e9136: am 5114f255: am 9eedfed7: am de230c5f: am a0f811ff: am 669878b9: am 6ba3009d: am 0744f81e: am 5bff7130: am 605ed8bd: am 740270dc: am 1ca6c54c: am 135b3967: am cbbfd900: am f82b9449: am 29de7b18: am 7988d7f8: am 83dd0cef: am 1d4ac | |
| d1c50b7 am 18fbd9c2: am 7625ad8b: am fadd2e21: am a60ee964: am 1437426d: am 67da8d81: am 86e0f83c: am 3d1db89f: am 888442b4: am a4806613: am b47d4caf: am 757d18ee: am 4262e900: am 4533f807: am fe32ca76: am a029dcc0: am aa58f460: am 2fcdab95: am 6cab21b6: am ab0bb72d: am e610c | |
| 1ad79c1 am fdb15d20: am fba89a1d: am dbf44c00: am 287ad838: am 31b6a4ef: am 5b4fdaa0: am ee84e875: am 9c418157: Fixed issue where location from network feature was not properly ignored. | |
| aef308e am ec9c2e42: am fde75738: am 51f1eb37: am 22a911a4: am 8add9fea: am a2e500df: am ab21b778: am 91a8163f: am e2617e7c: am 6dd2d0f5: am 2772992b: am 6614394a: am 5028a1a1: am 1eba16a5: am 86eecf46: am a15ba0e7: am b55ee96b: am f9a6b37b: am cf05e0c2: am 0969f15c: am ac08b | |
| 9b2ee4c am 3a2f68ae: am 6c8ea087: am 94c9af99: am 0f545660: am e8c6175e: am 8adaf5a9: am fdfc5247: am 7c22f6d9: am d121e03c: am 2dbf0177: am 1ab76479: am 7f541d6d: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into klp-dev | |
| 5d62e38 am da0d911e: am 5d42e158: am c6e96745: am 3b54c97e: am 22961964: am 801df1c4: am aa6c86d5: am 48f49f3d: Merge "Split SELinux neverallow rules test." into lmp-sprout-dev | |
| 2fd082f am de61cd5b: am 003321c8: am 23e740c9: am 088bdf37: am 68436e59: am efe3b9ba: am e9a6212b: am 056fff4a: Merge "Change SELinuxHostTest to new sepolicy-analyze args." into lmp-sprout-dev | |
| 591b8b9 am 1c1dfb76: am 95eee707: am 28548707: am 0c205ae4: am b6090e3f: am 4abe42d2: am 6bd212b1: am b5679b61: Merge "Fix MonkeyApp so it keeps the current screen orientation on TVs" into lmp-sprout-dev | |
| dd253ae am d51fe2f0: am 2ce330a1: am 8c94b4cb: am 71c33f33: am deaedbbe: am b335930e: am 080490ef: am 30044c61: Change SELinux neverallow tests to be sepolicy-analyze based. | |
| e4f0757 am 12a1e834: am ff1b1497: am 177ccb1d: am bce8b887: am 3fce2597: am 1ce136db: am 89b0aa33: am 13eae907: Fix SELinuxHostTest package structure. | |
| bad0e98 am 14d2c2af: am 3dad41f4: am fc2fb26f: am a9318591: am 71bf0a2d: am b7fd55bc: am f47c1f71: am d101eb99: Merge "Tests for LauncherApps" into lmp-sprout-dev | |
| f091d1e am 850ecc96: am 40a5cb25: am b89e4d3c: am f159cb91: am d4371f2d: am 90cadb45: am 7e729180: am 92f9ad2e: Merge "Exclude .notifications.PackagePriorityVerifierActivity for TV devices" into lmp-sprout-dev | |
| 8444111 am f40c4d13: am 95006ece: am ef88855e: am 19d613ff: am 2b88e5bc: am 92468b7c: am 095331ce: am 2af4089c: Merge "Update mdpi ldpi reference images for android.host.theme with API level 21" into lmp-sprout-dev | |
| f4e5640 am a7098987: am fe3c97a3: am b8ba690e: am 86b4d2ce: am 9aa34fa4: am 6ab41fb0: am ce7304f6: am 0dd5d9d9: Merge "Extend CTSVerifier tests to test for badges" into lmp-sprout-dev | |
| 50962b0 am e9f20387: am c7197726: am 2ee1cdcb: am 30589b44: am f007b0fa: am 76e3bdf3: am 92b57d49: am 3c0ee9bf: Enable Enterprise CTS tests | |
| e2a233b am a31bf9b5: am 5a3f6f86: am 4df7a245: am 90e000bb: am 0018b639: am 44a361c3: am 2016733b: am 7123c240: Merge "Optimize assets reading path in sdcard in android.host.theme" into lmp-sprout-dev | |
| d48d907 am e470491e: am c39c5bbd: am e4f97100: am d0848f33: am a4619d6a: am 33276924: am 1a8885c6: am 4cd407f4: Merge "Fix testBatchAndFlushWithMutipleSensors to handle cases where the device supports only one continuous mode sensor." into lmp-sprout-dev | |
| 926144d am dc13705f: am 5f818fdc: am e809280a: am 14563a44: am 16317a62: am 55036646: am 9df43f09: am 6b2811eb: Merge "PresentationSyncTest: disable faster-than-refresh case" into lmp-sprout-dev | |
| 3148aa2 am e468c25b: am f3b52400: am 6508f508: am d683152d: am ba8014dd: am 9c549f4f: am 7a1d92f1: am 6913fe63: Make testSetTextLong() wait for its work to finish. | |
| 496f21c am 1bd3d591: am fbf08dcf: am 2c45131f: am 529ba96f: am 44198f20: am 18a7347f: am be61051a: am 5bbff433: Merge "Slightly relax the timeout condition for testMinimumDownload" into lmp-sprout-dev | |
| 908e013 am 5979a32d: am 082e93d8: am 8e928be6: am 908c03ee: am 52608710: am 910002e7: am d638d615: am 191e50e2: Only pass power level scan test when a new mac address received. Not show advertiser test if the device does not support multi advertising. | |
| bbbe216 am 4379a15d: am de8bd058: am 45d819da: am 45d5b677: am 92a095d2: am 53600d36: am 4cb8264e: am 7e02403a: Merge "Re-enable profile owner provisioning in cts-verifier." into lmp-sprout-dev | |
| 3e13a20 am 6d107303: am f5013711: am 8b7ba963: am d9b36ac3: am 7159bb46: am 4037d89c: am a65fba28: am 10d412aa: am d72d0954: Merge "Make hardware-backed RSA keystore a non-requirement for ATVs" into lmp-dev | |
| b34ebd4 am bf46bf5d: am d8448514: am 941f0a90: (-s ours) am f7b3ede2: am 2e627f04: am f67731b0: am b541ff7f: am 670baeca: (-s ours) DO NOT MERGE - Fix JobScheduler CTS tests | |
| 07822fd am 44d7851f: am bb67bbb0: am 4140d691: am 82cfb22c: am b12adafa: am 40f61fdb: am 8766ad85: am 402009e4: Merge "Improvements to suspend state detection; code cleanups and documentation. - Added additional functions computeBaselineState() and getBaselineState() for dete | |
| e2f0cee am f5ebd01a: am f8770209: am 2517e6a0: am c00dea4a: am b9d7ab38: am fdc83efb: am b3b3f0af: am 49803a69: Merge "Verifier: Enable and disable non-market apps" into lmp-sprout-dev | |
| 3153c8e am cef8fb74: am 2a150260: am 37b31608: am 213c7dd6: am 1dbfe62d: am cad2076d: am c471683a: am 2212f189: Merge "Normalize ipv6.cts.PingTest#testLoopbackPing\'s packet size" into lmp-sprout-dev | |
| db2109b am 46ab0036: am fd1fc463: am 49d06ee8: am 53d07324: am f431b0e8: am 10b4640d: am e2d803a0: am fb480740: Merge "Add CTS test for registering a large number of AIDs." into lmp-sprout-dev | |
| 0dbf72a am ddbf683d: am 5aed84e2: am 86202370: am afe543da: am e9661251: am 30aaddd2: am 5de46919: am 0b355c80: CamcorderProfileTest: fix the last timelapse id value | |
| 00d8353 am e624a226: am 5cea5a95: am efd30190: am ee4b24d7: am bd2a8715: am f02a812f: am 5184ef42: am 9673c600: Merge "Fix testSyncFiles_extStorageVariable and testSyncFiles_normal" into lmp-sprout-dev | |
| d427caf am 4a892eba: am a96a2cf8: am 4f52133a: am bb8de464: am ce3378f2: am 397b952f: am 850512ce: am eebba016: am cd9ae7a8: am aa566b6a: am b49c8250: am df0e5961: am 78be3f3f: am c5b507e3: am 03a64463: am 430eeb70: am 46d82f0b: am c6fca737: am ee955b85: am 26d352cd: am 6558d | |
| 5ed69d8 am 171f7ba7: am 343b7859: am 140d3bee: am d33f237c: am 5abc29de: am f5c3d7a5: resolved conflicts for 63b6a7d9 to lmp-sprout-dev | |
| 6b27b2f am cf3d554f: am fb6f3c45: am 16636fc7: (-s ours) am 5985ed7d: am b58c8f50: am 112ceb89: am 27228e75: am aa059250: (-s ours) DO NOT MERGE: Fix AudioManagerTest#testVolume. | |
| 47bb006 am 322cdf30: am 2898643e: am 86a8eb20: am a3a9c5b1: am f31a1fb2: am cfc98c62: am 6a975405: am 9bd5998d: Merge "Cts tests for Settings intents" into lmp-sprout-dev | |
| 8061d0b am 097f215a: am 6714d93d: am 54c33dd5: am 87cf2a09: am 68ebf8e0: am a247f232: am 3ad9608c: am 5cd8e6a4: Merge "Remove exception check in testWipeData CTS test" into lmp-sprout-dev | |
| 1257493 am ad06f900: am abd76666: am 2ee3f943: am 32d60672: am b07f1dcd: am 3b6f75ae: am a7c029f2: am f024450f: media: release decoder explicitly instead of relying on GC. | |
| 2f57386 am ea1998d7: am d02559c3: am 12aa2762: am 8677178a: am c66cd243: am 5f2e2bfd: am 58f04ecc: am 4530b5b3: am 8c35aff7: Merge "Fix cts verifier manifest. " into lmp-dev | |
| 7d191b6 am e225e1fa: am 04274b92: am 2fa7a5f6: am 67ba013e: am ed52ca9a: am a4d8b75b: am cd90c07f: am 7403e54f: am 9236bf39: resolved conflicts for merge of 56213945 to lmp-dev | |
| f2cd1e7 am b5107d97: am 64d7825e: am 5460dc74: am e5c13a34: am c99e8208: am 8667cbc4: am 5f7e7a15: am 4bd6622f: Merge "Updated BoxInsetLayout with changes from main wearable support library." into lmp-sprout-dev | |
| 0ac9683 am 77c8ed55: am 51fbcf93: am 58f0c65d: am 3415a823: am 184f0b29: am c0a3a8d2: am 24b24704: am e21ff23d: am 77ae9511: Further refinement of the alarm batching test | |
| 8664fff am 91998a63: am 905d286b: am c153cca5: am cfcd990f: am f4e9d72c: am a4c7c275: am 30a2e072: am 69c3d433: am 0d8275b2: Tweak alarm batching CTS test | |
| c24aa2b am 1728c4c8: am 98d55e09: am 3887df9e: am 21c22f4d: am e2b1b832: am 4d3f2054: am d983a708: am 47bd0a79: Merge "Camera: assign tonemap keys to right capability" into lmp-sprout-dev | |
| d54f422 am 09f5f21a: am feb2ebdc: am 340567b3: am 02500cb5: am d9bac5ad: am 9b0547e0: am 1e88776c: am 77274589: am be49b68a: Add alarm test for exact/inexact coalescing | |
| 079d186 am 6bbf7d67: am 7e608dd3: am 25681a0c: am 2dbba465: am 0b1355a0: am 8955e932: am 99484603: am 23e37975: Merge "Fix the lock task cts test." into lmp-sprout-dev | |
| 17e0b3f am 60186c0b: am 41106387: am bcb5630b: am 09774751: am bf4b0493: am bf5c137e: am f1ccf5fd: am 5ff75144: Merge "Add badged icon example to BYOD CTSVerifier test" into lmp-sprout-dev | |
| 7562a0d am 64456551: am 4b5ff38d: am 5b09f269: am bcbb712e: am b8337670: am a9a55806: am 58b5ca1d: am e1873274: Relax /dev/diag test | |
| 5e22fa2 am 109c537e: am 3e5f2d4a: am 06eb96f0: am 143fd055: am 12a3fc47: am e81f3f06: am a2d15a38: am dac4e3f4: Merge "Add message about disk encryption for BYOD provisioning test." into lmp-sprout-dev | |
| 38fc08c am aefe54b9: am 6fbbf204: am c87ba21f: am 81e47575: am cb7b1f36: am 9daa68d4: am 68de7248: am d402c303: Merge "Use elpasedRealtime() instead of uptime() in ProjectionOffscreenActivity" into lmp-sprout-dev | |
| 651ad9c am dc014491: am 09c5278e: am 5b0ffac4: (-s ours) am e8a9f3ba: am b2a902f8: am 347aaca8: am 90d356d9: am 731c791e: (-s ours) Merge "DO NOT MERGE: media: AdaptivePlaybackTest: properly handle missing codecs" into lmp-sprout-dev | |
| 18f0602 am 96b4b208: am 34694a07: am 9496d48d: am dcebdf71: am a013c412: am 78476299: resolved conflicts for 97e70f53 to lmp-sprout-dev | |
| bbbec70 am f2db36e7: am 2f140b04: am 99220b7d: am 510401c6: am 8182201f: am 894683c5: am f4d8853c: am f45a7cc6: am 45004cb7: am 9ce0873c: am 4d7e03fc: Merge "Fix configure check regarding AdaptivePlayback ReconfigDrcTest." into kitkat-cts-dev | |
| db9ea7e am 43ad74df: am 0d6184e6: am 1f1b5b5a: am c402da27: am 02bfea4f: am 4f17c9ef: am a66f06e2: am fa71ec25: am f1ba62b4: am ef1481dc: am ba39064d: Merge "improve TestVirtualDisplayRecycles to reduce memory usage" into kitkat-cts-dev | |
| be2d4e6 am 3091de3c: am 8c166743: am f743ea3e: am 0b453c8e: am 7a4b1d55: am 0be5d32a: am 73c4fd76: am 1bc1c1c6: am 54d7cc51: am 2f2d8d40: am 7951d40b: Merge "Fix bugs regarding Camera Video test" into kitkat-cts-dev | |
| 7da1a93 am 08754586: am 8fa557af: am dbc31aed: am 37f74120: am 7502f3b6: am 2ad00f0d: am 44cfb34a: am fe88ec43: am 17607b8a: am 4106602e: am 7e84d75c: Merge "resolve merge conflicts of 930a3b5 to kitkat-cts-dev" into kitkat-cts-dev | |
| c1ad5ad am 2f8c442b: am 16381480: am c9b55fd8: am 9be8a438: am 435408d6: am 83de3ad4: am ca8896cb: resolved conflicts for e6062716 to lmp-dev | |
| 175624d am ed00d696: am 163ec91a: am e2a42de0: am f08d8f65: am 8d6b0367: am a4015498: am 785be5bf: am 2f3ff158: resolved conflicts for fee166c4 to klp-modular-dev | |
| f82f8bc am 7bfbdcf8: am 361c1868: am 204ef0fa: am 9e09f05a: am 2825e469: am 814c5b0d: am 12590c93: am 1db7d811: am 7b48c977: am 39861bb3: am 37f4b540: Merge "Fix for failing test of testEOS because checksum takes too long" into jb-mr2-cts-dev automerge: a00f78c | |
| f5b0ba6 am 148ab94e: am 9c2b147c: am da3cef88: am 9d612c9e: am fb4634dd: am 7b45813d: am 43ba0c03: am 28baaec5: am ee05618c: am ca4ee5db: am ac8f57e8: Merge "Lookup private resources in run-time" into kitkat-cts-dev | |
| 94703ab am 96a3dc29: am 1d28716b: am 3b688796: am ea25558f: am 0670036c: am 39042d3e: am 9bcbfb89: am 7d0ec798: (-s ours) am 255513d2: am e9a01330: am 8fcd7284: Merge "Fix bugs regarding ShortCodeTest that fails without "112" in ECC List." into kitkat-cts-dev | |
| ee67b12 am b9188540: am b0daa6fd: am 921778db: am 8a667a9f: am a3a74fb2: am fcf45f34: am c9d1fffc: am 3856616b: am 391ac7d4: am ef902753: am 73965a87: Merge "set delay during testPerformFiltering" into kitkat-cts-dev | |
| d0ab2a8 am 7e0de60d: am d2362e3e: am 0038f139: am 3c1598db: am 908d2036: am 49e24450: am bd5746cb: am 5e86f0bf: am 5a6f4f38: am 74a3ed18: am 16763e64: Merge "Check for valid buffer size before proceeding with testCreateAudioRecord." into kitkat-cts-dev | |
| f1aa4be am 2bbd6f9c: am afe4e4bc: am cd8261a6: am 5b6ba167: am 85fd0e64: am 9342368e: resolved conflicts for a5b3514f to lmp-mr1-dev | |
| 592e478 am 55fe1220: am e50a7198: am 9552c79e: am 640950d5: am 6f33f195: am 51e0853d: am 9c8a21ef: am fbbd4d98: resolved conflicts for 304364ee to lmp-dev | |
| 8d0d313 am 95dd07b0: am fb513576: am 5f37a48c: am 186210e6: am 6ce39403: am 22c4f4f2: am e2cd0c3f: am 08455d67: am e112e8ac: am ef6f1736: am dc3d3a43: am ac79e25f: Merge "AppSecurityTests: Do not delete in WhiteLists." into kitkat-cts-dev | |
| 8b579cb am 32ac37be: am d09c4f44: am 68c69622: am 18ecad59: am 804d56c5: am 538f593a: am 46029fcb: am e234f24e: am fa4fec5b: am 3d82159d: am 884bde4a: am d1a5a58c: Merge "Revert "As per the android documention 480p is defined as 720x480, 704x480 or 640x480. The test is hardc | |
| 696d8fe am 194b3741: am c354ad17: am 4eabcddc: am c6018c8e: (-s ours) am e5b53047: am 187c5257: am 7541004b: am e1d59a55: am f8d67fee: (-s ours) am 99b6e6a1: am c313c4c6: am ffd250a7: (-s ours) Merge "DO NOT MERGE: Cts test fix for shortcode 48000" into kitkat-cts-dev | |
| 5e50bce am a14a4a7a: am 3fb0b71d: am f68c3052: am b37f959d: am d3ebd387: am 43f9caa6: am c9d12c5b: am 570b859a: am 4580c1b5: am de9f2919: am 30e1f0fd: am 9d5a03fb: Merge "Fix for com.android.cts.verifier.camera.video.CameraVideoActivity" into kitkat-cts-dev | |
| ecf2efe am 23c7365e: am 42e445e9: am 30aae960: am 3216f656: am 849058a7: am 84ad0684: am 4abf321d: am d3d2234e: am be7ea0bb: am dc9559ab: am a6a49a7e: am 457f95e6: Merge "As per the android documention 480p is defined as 720x480, 704x480 or 640x480. The test is hardcoding 48 | |
| 3bdd16c am 0946ab99: am c28ad9a7: am 0bd41e7f: am a57620d0: (-s ours) am 4b50d86e: am 07e6e76a: am 7c5ce400: am 8e7a52d8: am 018014e6: (-s ours) am 5007744e: am d326b4f4: am b3405de8: (-s ours) Merge "DO NOT MERGE: Fix com.android.cts.monkey.VerbosityTest#testVerbosity seldom | |
| 91c5fcc am 26a1a700: am 46fd2f80: am 8042cc33: am 2c6f95c5: am cc3816c8: am f588e489: am 50bae445: am ff0b75d7: am cbbb3aed: am 375419cb: am 0f7b9b61: am 10212a15: Merge "Add 44051 to NO_DELIVERY_REPORTS, DATA_SMS, MULTIPART_SMS" into kitkat-cts-dev | |
| dfdfa82 am 50bd7c13: am 17874e9b: am e2711d1c: am e962587e: am a679f1ec: am b5c7c61a: am 5f847b4f: am 2278f872: resolved conflicts for merge of 72173a02 to lmp-dev | |
| 80a3a80 am 801062df: (-s ours) am bc2cb37e: (-s ours) am 7f06fcc7: (-s ours) am 3847bbc3: (-s ours) am 68d8ffc8: (-s ours) am aabc4959: (-s ours) am cf9d98b3: (-s ours) am 39cd933b: (-s ours) Merge "DO NOT MERGE ANYWHERE: Test whether mediaserver leaks info across invalid binder calls" | |
| 3d86735 am d8f9f2e0: am ffdc84d9: am 2b25a86a: am cfa68d68: am 49d3488a: am de6e5234: am fedff466: am 21cc5c21: Merge "Remove corrupt test file" into lmp-dev | |
| cba1a75 am 790115b7: am c54088e6: am 69754a8a: am dba037c5: am b65e2c55: am 57787c84: am 72555363: am 6ab8df91: am a1dba542: am 1a97b1e8: am 6df632c0: am 75fb0006: am f82b9449: am 29de7b18: am 7988d7f8: am 83dd0cef: am 1d4ac0f9: Merge "Update Android CTS bandaid urls that use | |
| 1429ff8 am dc5f117c: am 1a6812c0: am 0b6fdc8b: am 220b98b3: am fbfb8a6c: am 3c1834a0: am 8396fee9: am a67b9796: am 63e4e3a1: am 5b3b8790: am 67b9bef2: am 64b4f922: am aa58f460: am 2fcdab95: am 6cab21b6: am ab0bb72d: am e610cae3: Merge "Fix typo in streaming media url" into jb | |
| 0971360 am 98ba14e0: am cc7a8448: am 12672285: am 762b99ca: am 9a013616: am 3ac5da3d: am aa7055c5: am 64713daa: am 25ee6177: am 8c15db6e: am 905c1026: am 2614df0c: am b55ee96b: am f9a6b37b: am cf05e0c2: am 0969f15c: am ac08bc8a: Merge "Update Android CTS bandaid urls that use | |
| ca0861c am 06aae792: am e4867f10: am 822587ce: am 55832af8: am bfff610c: am 5af1bd76: am 8ac4694c: am 9e5370c4: am 201f937b: am dc45cfdd: am 319eccca: am 358d417b: am 46d82f0b: am c6fca737: am ee955b85: am 26d352cd: am 6558d48b: Merge "Fix test" into jb-dev automerge: 430eeb7 | |
| 7ffc5f1 am 24d6e5c2: am bc1298b0: am 88b4b16a: am 911dfcd0: am 0626c990: am a86701f1: am 730eb310: am 755666cf: am dd2cbd40: am 342cc2c7: am cc25dfef: am 877f7413: am 7733e474: am e2247907: am a4163a07: am b8c7cf77: am bba8cbda: Merge "Add tests for midi playback" into jb-dev | |
| 298315b am 6f665984: am 29bf5e52: am 1d4932a3: am 52a286db: am ef981d26: am fa8b4645: am 2b7e3c48: am ae4a93f0: am 8823f6d9: am 879eff3c: am 81bb1715: am b4aa5b3b: am 2b4962b1: am 1d438a13: am cb190b0d: am 92df8753: add tests for stream type check in audio policy binder. auto | |
| 96ba9d8 am 918a1f6e: am d62189aa: am d335b729: am 1d450cb4: am 96a8ab67: am ee26cf60: am a141be54: am 0555ec38: am b62af0bb: am 3c5e3de7: am c2822aa2: am 4659b161: am 4b3c7eaf: am 6861e8d6: am 9b9de51d: am 6a1c1372: am 4bc52341: Merge "Fix CTS case testQueryExternalMiniThum | |
| 05b6d41 am 2e6d05bf: am f7caf3e5: am 09bfffa5: am 3e0ca76f: am f7b75978: am e41491ca: am a8591216: am cc2a255d: am 9495435f: am 42b47013: am 93d5ea6b: am 739f204f: Don\'t NPE when no security message is provided. automerge: 843c1f4 automerge: 4a04f01 | |
| 313be38 am 0a5abe8a: am 91fe9fb5: am eb5793ef: am 06688081: am dbb938e5: am 6f1605e9: am a612d95d: am 8e9d9c99: am 335b82ed: Merge "Add device info field for encryption" into lmp-sprout-dev | |
| a3c802b am e51f1e44: am a61d98bc: am 518c0fc3: am bfe2a1d6: am a5019996: am ea67c1a3: am 6e3edaa2: am 63cf6b54: am 211d1fac: Skip testDnsWorks if the active network for watch is proxy. | |
| 98f2c66 am 563ee401: am a778651b: am 55ebb729: am e69ffe0e: am 2f770cf3: am 71c81e14: am 8b9f273e: am 8407a6ff: am 827a895c: media: fix vp9 decode test stream | |
| fae7e53 am 5f7aeb8c: am 344b9cd8: am b7d54946: am f1d25e19: (-s ours) am 900a956a: am 78bf39b1: am e2b090fb: am 0b9c5e83: am 4ec96370: (-s ours) am bacc1458: Merge "DO NOT MERGE: Disable Widget Framework Test for Leanback for now" into lmp-dev | |
| 2bbd6f9 am afe4e4bc: am cd8261a6: am 5b6ba167: am 85fd0e64: am 9342368e: resolved conflicts for a5b3514f to lmp-mr1-dev | |
| 55fe122 am e50a7198: am 9552c79e: am 640950d5: am 6f33f195: am 51e0853d: am 9c8a21ef: am fbbd4d98: resolved conflicts for 304364ee to lmp-dev | |
| 95dd07b am fb513576: am 5f37a48c: am 186210e6: am 6ce39403: am 22c4f4f2: am e2cd0c3f: am 08455d67: am e112e8ac: am ef6f1736: am dc3d3a43: am ac79e25f: Merge "AppSecurityTests: Do not delete in WhiteLists." into kitkat-cts-dev | |
| 32ac37b am d09c4f44: am 68c69622: am 18ecad59: am 804d56c5: am 538f593a: am 46029fcb: am e234f24e: am fa4fec5b: am 3d82159d: am 884bde4a: am d1a5a58c: Merge "Revert "As per the android documention 480p is defined as 720x480, 704x480 or 640x480. The test is hardcoding 480p to | |
| 194b374 am c354ad17: am 4eabcddc: am c6018c8e: (-s ours) am e5b53047: am 187c5257: am 7541004b: am e1d59a55: am f8d67fee: (-s ours) am 99b6e6a1: am c313c4c6: am ffd250a7: (-s ours) Merge "DO NOT MERGE: Cts test fix for shortcode 48000" into kitkat-cts-dev | |
| a14a4a7 am 3fb0b71d: am f68c3052: am b37f959d: am d3ebd387: am 43f9caa6: am c9d12c5b: am 570b859a: am 4580c1b5: am de9f2919: am 30e1f0fd: am 9d5a03fb: Merge "Fix for com.android.cts.verifier.camera.video.CameraVideoActivity" into kitkat-cts-dev | |
| 23c7365 am 42e445e9: am 30aae960: am 3216f656: am 849058a7: am 84ad0684: am 4abf321d: am d3d2234e: am be7ea0bb: am dc9559ab: am a6a49a7e: am 457f95e6: Merge "As per the android documention 480p is defined as 720x480, 704x480 or 640x480. The test is hardcoding 480p to 720x480 | |
| 0946ab9 am c28ad9a7: am 0bd41e7f: am a57620d0: (-s ours) am 4b50d86e: am 07e6e76a: am 7c5ce400: am 8e7a52d8: am 018014e6: (-s ours) am 5007744e: am d326b4f4: am b3405de8: (-s ours) Merge "DO NOT MERGE: Fix com.android.cts.monkey.VerbosityTest#testVerbosity seldom fail" into k | |
| 26a1a70 am 46fd2f80: am 8042cc33: am 2c6f95c5: am cc3816c8: am f588e489: am 50bae445: am ff0b75d7: am cbbb3aed: am 375419cb: am 0f7b9b61: am 10212a15: Merge "Add 44051 to NO_DELIVERY_REPORTS, DATA_SMS, MULTIPART_SMS" into kitkat-cts-dev | |
| 50bd7c1 am 17874e9b: am e2711d1c: am e962587e: am a679f1ec: am b5c7c61a: am 5f847b4f: am 2278f872: resolved conflicts for merge of 72173a02 to lmp-dev | |
| 801062d am bc2cb37e: (-s ours) am 7f06fcc7: (-s ours) am 3847bbc3: (-s ours) am 68d8ffc8: (-s ours) am aabc4959: (-s ours) am cf9d98b3: (-s ours) am 39cd933b: (-s ours) Merge "DO NOT MERGE ANYWHERE: Test whether mediaserver leaks info across invalid binder calls" into lmp-dev | |
| d8f9f2e am ffdc84d9: am 2b25a86a: am cfa68d68: am 49d3488a: am de6e5234: am fedff466: am 21cc5c21: Merge "Remove corrupt test file" into lmp-dev | |
| 790115b am c54088e6: am 69754a8a: am dba037c5: am b65e2c55: am 57787c84: am 72555363: am 6ab8df91: am a1dba542: am 1a97b1e8: am 6df632c0: am 75fb0006: am f82b9449: am 29de7b18: am 7988d7f8: am 83dd0cef: am 1d4ac0f9: Merge "Update Android CTS bandaid urls that use test_key1 to | |
| dc5f117 am 1a6812c0: am 0b6fdc8b: am 220b98b3: am fbfb8a6c: am 3c1834a0: am 8396fee9: am a67b9796: am 63e4e3a1: am 5b3b8790: am 67b9bef2: am 64b4f922: am aa58f460: am 2fcdab95: am 6cab21b6: am ab0bb72d: am e610cae3: Merge "Fix typo in streaming media url" into jb-dev automerg | |
| 98ba14e am cc7a8448: am 12672285: am 762b99ca: am 9a013616: am 3ac5da3d: am aa7055c5: am 64713daa: am 25ee6177: am 8c15db6e: am 905c1026: am 2614df0c: am b55ee96b: am f9a6b37b: am cf05e0c2: am 0969f15c: am ac08bc8a: Merge "Update Android CTS bandaid urls that use test_key1 to | |
| 06aae79 am e4867f10: am 822587ce: am 55832af8: am bfff610c: am 5af1bd76: am 8ac4694c: am 9e5370c4: am 201f937b: am dc45cfdd: am 319eccca: am 358d417b: am 46d82f0b: am c6fca737: am ee955b85: am 26d352cd: am 6558d48b: Merge "Fix test" into jb-dev automerge: 430eeb7 automerge: 9 | |
| 24d6e5c am bc1298b0: am 88b4b16a: am 911dfcd0: am 0626c990: am a86701f1: am 730eb310: am 755666cf: am dd2cbd40: am 342cc2c7: am cc25dfef: am 877f7413: am 7733e474: am e2247907: am a4163a07: am b8c7cf77: am bba8cbda: Merge "Add tests for midi playback" into jb-dev automerge: 8 | |
| 6f66598 am 29bf5e52: am 1d4932a3: am 52a286db: am ef981d26: am fa8b4645: am 2b7e3c48: am ae4a93f0: am 8823f6d9: am 879eff3c: am 81bb1715: am b4aa5b3b: am 2b4962b1: am 1d438a13: am cb190b0d: am 92df8753: add tests for stream type check in audio policy binder. automerge: 1245cd | |
| 918a1f6 am d62189aa: am d335b729: am 1d450cb4: am 96a8ab67: am ee26cf60: am a141be54: am 0555ec38: am b62af0bb: am 3c5e3de7: am c2822aa2: am 4659b161: am 4b3c7eaf: am 6861e8d6: am 9b9de51d: am 6a1c1372: am 4bc52341: Merge "Fix CTS case testQueryExternalMiniThumbnails failur | |
| 2e6d05b am f7caf3e5: am 09bfffa5: am 3e0ca76f: am f7b75978: am e41491ca: am a8591216: am cc2a255d: am 9495435f: am 42b47013: am 93d5ea6b: am 739f204f: Don\'t NPE when no security message is provided. automerge: 843c1f4 automerge: 4a04f01 | |
| 0a5abe8 am 91fe9fb5: am eb5793ef: am 06688081: am dbb938e5: am 6f1605e9: am a612d95d: am 8e9d9c99: am 335b82ed: Merge "Add device info field for encryption" into lmp-sprout-dev | |
| e51f1e4 am a61d98bc: am 518c0fc3: am bfe2a1d6: am a5019996: am ea67c1a3: am 6e3edaa2: am 63cf6b54: am 211d1fac: Skip testDnsWorks if the active network for watch is proxy. | |
| 563ee40 am a778651b: am 55ebb729: am e69ffe0e: am 2f770cf3: am 71c81e14: am 8b9f273e: am 8407a6ff: am 827a895c: media: fix vp9 decode test stream | |
| 5f7aeb8 am 344b9cd8: am b7d54946: am f1d25e19: (-s ours) am 900a956a: am 78bf39b1: am e2b090fb: am 0b9c5e83: am 4ec96370: (-s ours) am bacc1458: Merge "DO NOT MERGE: Disable Widget Framework Test for Leanback for now" into lmp-dev | |
| 96465f8 am a45ed126: am cd4d29df: am b9a572ce: Merge "Bug fix SignificantMotion test activity." into mnc-dev | |
| a45ed12 am cd4d29df: am b9a572ce: Merge "Bug fix SignificantMotion test activity." into mnc-dev | |
| 0481a64 am ac152996: am 3de0b200: am 1fe82777: DO NOT MERGE - Add security test for IEffect binder command | |
| ac15299 am 3de0b200: am 1fe82777: DO NOT MERGE - Add security test for IEffect binder command | |
| d581007 am 90f44f39: am 24e8b88f: am a5a27af4: Merge "Fix batch scan test bug." into mnc-dev | |
| 21a35da am 246ea053: am 90da1f85: am b79b6d40: Merge "JetPlayerTest: cleanup JetPlayer test" into mnc-dev | |
| 90f44f3 am 24e8b88f: am a5a27af4: Merge "Fix batch scan test bug." into mnc-dev | |
| 246ea05 am 90da1f85: am b79b6d40: Merge "JetPlayerTest: cleanup JetPlayer test" into mnc-dev | |
| 2db47da am 116cf165: am f471ec21: am 285cd150: Make atrace test app debuggable | |
| 116cf16 am f471ec21: am 285cd150: Make atrace test app debuggable | |
| f1b73aa am 2f23c58a: am 73678112: am 56494859: Merge "Camera: reduce number of buffers allocated in PerformanceTest" into mnc-dev | |
| 2f23c58 am 73678112: am 56494859: Merge "Camera: reduce number of buffers allocated in PerformanceTest" into mnc-dev | |
| 00146ee am d0b27881: am 05613b13: am 877f8b49: am 379ba809: am b1de5915: am ff9926ee: Revert "resolved conflicts for 5365cd9e to lmp-mr1-dev" | |
| d0b2788 am 05613b13: am 877f8b49: am 379ba809: am b1de5915: am ff9926ee: Revert "resolved conflicts for 5365cd9e to lmp-mr1-dev" | |
| 2a4197d am 13235495: am dbd13051: am 1afbbf00: Merge "Remove DeadObjectException from dumpservice failure condition." into mnc-dev | |
| 1323549 am dbd13051: am 1afbbf00: Merge "Remove DeadObjectException from dumpservice failure condition." into mnc-dev | |
| af4dbbe am 07f8fe57: am 8da5fb1a: am 91ff551d: am 5b604f6c: am 80b30d77: am 0d95d4ad: resolved conflicts for 5365cd9e to lmp-mr1-dev | |
| 07f8fe5 am 8da5fb1a: am 91ff551d: am 5b604f6c: am 80b30d77: am 0d95d4ad: resolved conflicts for 5365cd9e to lmp-mr1-dev | |
| 5159011 am a860a792: am 16f501ff: am b40e1e7e: Merge "More robust MmsTest" into mnc-dev | |
| a860a79 am 16f501ff: am b40e1e7e: Merge "More robust MmsTest" into mnc-dev | |
| a362e32 am 293e6803: am 3edae3c3: am b3e60506: am c11a4f60: am d50fb05c: am a966a521: am abfcddc6: am d5ca7e98: am 4e9b7b53: Scroll list of documents when offscreen. | |
| b1a0685 am 13ac1f73: am d871f344: am 0fe13fc6: am 78433a4b: am 301ac96e: am 5b87663a: am 80dfa52c: am ea57bc10: am e837d827: Scroll to find offscreen Documents roots. | |
| 73406fc am b6bc7210: am e34a6675: am 80016822: am a7502841: am 02f27d1f: am ec15923c: am 4cd5ecc0: am fbb304ab: am f67913c9: Merge "Added fix for Projection Scrolling List Test where items were being clipped off on round screens." into lmp-sprout-dev | |
| 53cd467 am 9fd729e8: am 35925561: am bfd541d1: am 024ed10d: am eb8c0bdc: am 72621b2a: am 4c369a10: am 247f4b70: am 3d6de021: Merge "Increased a CTS test timeout from 5 sec to 30 sec. This test was already flaky on L phones and tablets, but it almost never passed on Clockwork | |
| 5d1464a am 9def53e7: am a141ec86: am 8ecd49ac: am 38685bd7: am 59429c94: am fab354e2: am 8333af00: am 6b7609a1: am 1224400c: Merge "Fixed numbering of list items for Projection Scrolling List Test" into lmp-sprout-dev | |
| 1c688d3 am 61fc430b: am 13ac7e3e: am 5f19849a: am 5faf0fac: am b692ef1e: am 8cfaeb5d: am 882e6449: am 6d81e42c: am ca7fac84: Merge "Remove flaky tests from the official plan" into lmp-sprout-dev | |
| c474103 am 17b227cd: am 5f6fa308: am c79e4ae2: am ff97735c: am 9aca235c: am d0897938: am c02569df: am a6c406bb: am c2040741: Merge "Explicitly call out FEATURE_LOCATION_NETWORK as optional" into lmp-sprout-dev | |
| 5b1dadd am deeb1ca8: am 1f59d194: am ef3215bd: am d13650bb: am 6678e8b6: am 7523b66a: am 48a3f6a0: am edda4b44: am 58b2c43f: Merge "Removed new notification tests from watch type devices." into lmp-sprout-dev | |
| 7d78d84 am cc0b9c4c: am f89f357e: am dcd11f19: am 04c3d1ed: am 63058181: am bffda664: am 2e51ea93: resolved conflicts for 6e34a049 to lmp-sprout-dev | |
| 293e680 am 3edae3c3: am b3e60506: am c11a4f60: am d50fb05c: am a966a521: am abfcddc6: am d5ca7e98: am 4e9b7b53: Scroll list of documents when offscreen. | |
| 13ac1f7 am d871f344: am 0fe13fc6: am 78433a4b: am 301ac96e: am 5b87663a: am 80dfa52c: am ea57bc10: am e837d827: Scroll to find offscreen Documents roots. | |
| b6bc721 am e34a6675: am 80016822: am a7502841: am 02f27d1f: am ec15923c: am 4cd5ecc0: am fbb304ab: am f67913c9: Merge "Added fix for Projection Scrolling List Test where items were being clipped off on round screens." into lmp-sprout-dev | |
| 9fd729e am 35925561: am bfd541d1: am 024ed10d: am eb8c0bdc: am 72621b2a: am 4c369a10: am 247f4b70: am 3d6de021: Merge "Increased a CTS test timeout from 5 sec to 30 sec. This test was already flaky on L phones and tablets, but it almost never passed on Clockwork Coral (L) dev | |
| 9def53e am a141ec86: am 8ecd49ac: am 38685bd7: am 59429c94: am fab354e2: am 8333af00: am 6b7609a1: am 1224400c: Merge "Fixed numbering of list items for Projection Scrolling List Test" into lmp-sprout-dev | |
| 61fc430 am 13ac7e3e: am 5f19849a: am 5faf0fac: am b692ef1e: am 8cfaeb5d: am 882e6449: am 6d81e42c: am ca7fac84: Merge "Remove flaky tests from the official plan" into lmp-sprout-dev | |
| 17b227c am 5f6fa308: am c79e4ae2: am ff97735c: am 9aca235c: am d0897938: am c02569df: am a6c406bb: am c2040741: Merge "Explicitly call out FEATURE_LOCATION_NETWORK as optional" into lmp-sprout-dev | |
| deeb1ca am 1f59d194: am ef3215bd: am d13650bb: am 6678e8b6: am 7523b66a: am 48a3f6a0: am edda4b44: am 58b2c43f: Merge "Removed new notification tests from watch type devices." into lmp-sprout-dev | |
| cc0b9c4 am f89f357e: am dcd11f19: am 04c3d1ed: am 63058181: am bffda664: am 2e51ea93: resolved conflicts for 6e34a049 to lmp-sprout-dev | |
| bde98dc am c7045f56: am 61484d78: am ba52fa49: Merge "Fix string formatting in SensorParameterRangeTest." into mnc-dev | |
| bea1742 am 429298f7: am 6b45af4a: am 2297d818: am c51dd8f0: am d6ddd0ca: am ca747519: Merge "Add 5-second timeout to testFlacHeapOverflow" into lmp-mr1-dev | |
| c7045f5 am 61484d78: am ba52fa49: Merge "Fix string formatting in SensorParameterRangeTest." into mnc-dev | |
| 429298f am 6b45af4a: am 2297d818: am c51dd8f0: am d6ddd0ca: am ca747519: Merge "Add 5-second timeout to testFlacHeapOverflow" into lmp-mr1-dev | |
| 1615f2a am 5ea7e6a9: am ac833f6d: am 8e3a2cc8: am e9cc8663: am 2097ed43: am 7d69e6ce: am d4454a02: am 34892942: am e2055a5d: am 586adb3a: TV: fix tests to match updated framework behavior | |
| c55c7f1 am 130c5cad: am cceffe88: am a446d6ae: am 4638220d: am 840cdda3: am 996e9e33: am 3134d329: am 2eed31d8: am 5ab9857e: Merge "Disable Ui rendering tests on watch" into lmp-sprout-dev | |
| 76a3063 am 1caa3a29: am c0865e03: am ac411080: am 09007912: am baeb89bf: am 5661fd4e: am ece411a1: am 05fe3848: am df1c6d45: media: don\'t test video decoders & encoders on watch devices | |
| 5430b4e am 4e097e3f: am 55223005: am e163a06b: am 403a46bc: (-s ours) am 40115d86: am a96d6ff4: am b5f8c3ba: am 0f92e27b: am b732a7a8: (-s ours) Merge "DO NOT MERGE: media: fix 4k hevc test stream" into lmp-sprout-dev | |
| 5ea7e6a am ac833f6d: am 8e3a2cc8: am e9cc8663: am 2097ed43: am 7d69e6ce: am d4454a02: am 34892942: am e2055a5d: am 586adb3a: TV: fix tests to match updated framework behavior | |
| 130c5ca am cceffe88: am a446d6ae: am 4638220d: am 840cdda3: am 996e9e33: am 3134d329: am 2eed31d8: am 5ab9857e: Merge "Disable Ui rendering tests on watch" into lmp-sprout-dev | |
| 1caa3a2 am c0865e03: am ac411080: am 09007912: am baeb89bf: am 5661fd4e: am ece411a1: am 05fe3848: am df1c6d45: media: don\'t test video decoders & encoders on watch devices | |
| 4e097e3 am 55223005: am e163a06b: am 403a46bc: (-s ours) am 40115d86: am a96d6ff4: am b5f8c3ba: am 0f92e27b: am b732a7a8: (-s ours) Merge "DO NOT MERGE: media: fix 4k hevc test stream" into lmp-sprout-dev | |
| fbdc59d am e8885c5b: am 22d39659: am 77afb960: am 124b12fa: am d20efd25: am 29073811: am 41b5d581: Merge commit \'2e153b8f165bb1ebbfaf0b69ec6f679220b32886\' into manual_merge_2e153b8f | |
| e8885c5 am 22d39659: am 77afb960: am 124b12fa: am d20efd25: am 29073811: am 41b5d581: Merge commit \'2e153b8f165bb1ebbfaf0b69ec6f679220b32886\' into manual_merge_2e153b8f | |
| 41a8e7c am 56e5fda7: am 0a269e1b: am ec02c759: Permit __NR_modify_ldt via Seccomp-BPF on x86. | |
| 56e5fda am 0a269e1b: am ec02c759: Permit __NR_modify_ldt via Seccomp-BPF on x86. | |
| 799327b am 0261df29: am 93099fd8: am 99c1a72c: Merge "Increase timeout when mounting adopted storage." into mnc-dev | |
| 0261df2 am 93099fd8: am 99c1a72c: Merge "Increase timeout when mounting adopted storage." into mnc-dev | |
| b74c46a am 6a0a3fb3: am 827d2a3c: am 1d593bc6: Merge "Authentication bound key test in managed profile." into mnc-dev | |
| 6a0a3fb am 827d2a3c: am 1d593bc6: Merge "Authentication bound key test in managed profile." into mnc-dev | |
| e94612b am e8b5e0df: am 7c0b6266: am 0f13baf2: am ec30f60e: am 74814307: am c2262fd8: am 59fcf3a5: am 46e041da: am a42b40e5: Merge "Update buttom_pressed reference image" into lmp-sprout-dev | |
| 3095f59 am abdae8f0: am 39dee719: am 4adbd6d6: am 179eae0f: am 3dea0c60: am 7530f568: am 7585387b: am fceb05f5: am a7d389ba: Merge "Fix and cleanup UI rendering CTS tests" into lmp-sprout-dev | |
| 8c1b3cb am e8840063: am 7370d685: am 12a14820: am a2f10232: (-s ours) am 6743b35a: am dcf867c1: am 1b998d44: am 018b4e4a: am baf4543e: (-s ours) Merge "DO NOT MERGE: media: CTS workarounds for framework bugs" into lmp-sprout-dev | |
| 2481c5e am cc9113e8: am 16c536c0: am eed0d530: am 33dd1efd: am 7709ec23: am 0299d60e: am 72b448c6: am 333ee496: am 78bf43f5: Merge "The new AudioPolicyBinder tests are not yet robust enough to be added to the test suite, hence adding them to knownfailures" into lmp-sprout-dev | |
| e8b5e0d am 7c0b6266: am 0f13baf2: am ec30f60e: am 74814307: am c2262fd8: am 59fcf3a5: am 46e041da: am a42b40e5: Merge "Update buttom_pressed reference image" into lmp-sprout-dev | |
| abdae8f am 39dee719: am 4adbd6d6: am 179eae0f: am 3dea0c60: am 7530f568: am 7585387b: am fceb05f5: am a7d389ba: Merge "Fix and cleanup UI rendering CTS tests" into lmp-sprout-dev | |
| e884006 am 7370d685: am 12a14820: am a2f10232: (-s ours) am 6743b35a: am dcf867c1: am 1b998d44: am 018b4e4a: am baf4543e: (-s ours) Merge "DO NOT MERGE: media: CTS workarounds for framework bugs" into lmp-sprout-dev | |
| cc9113e am 16c536c0: am eed0d530: am 33dd1efd: am 7709ec23: am 0299d60e: am 72b448c6: am 333ee496: am 78bf43f5: Merge "The new AudioPolicyBinder tests are not yet robust enough to be added to the test suite, hence adding them to knownfailures" into lmp-sprout-dev | |
| 17fbf91 am dff8a018: am 7c253ee5: am bf3b628a: am 47d5254b: am 48c5e485: am a09ff239: am 14df943f: resolved conflicts for 15065e5a to lmp-sprout-dev | |
| 626528b am 6e9616b9: am 97480ef4: am b1b95169: Merge "Fix build" into mnc-dev | |
| dff8a01 am 7c253ee5: am bf3b628a: am 47d5254b: am 48c5e485: am a09ff239: am 14df943f: resolved conflicts for 15065e5a to lmp-sprout-dev | |
| 6e9616b am 97480ef4: am b1b95169: Merge "Fix build" into mnc-dev | |
| c025061 am 8cf44258: am 7f4eb8d8: am 35b30ac6: am 6045afa6: am 815b3c13: am f89fe0c3: am 323ba84e: resolved conflicts for d84bdafb to lmp-sprout-dev | |
| 8cf4425 am 7f4eb8d8: am 35b30ac6: am 6045afa6: am 815b3c13: am f89fe0c3: am 323ba84e: resolved conflicts for d84bdafb to lmp-sprout-dev | |
| 2d99de0 am 5fdc2513: am ed2208fc: am eb36bbda: am 403c076b: am 50240da3: am dee02269: am a365d6d6: resolved conflicts for c575b041 to lmp-sprout-dev | |
| 5fdc251 am ed2208fc: am eb36bbda: am 403c076b: am 50240da3: am dee02269: am a365d6d6: resolved conflicts for c575b041 to lmp-sprout-dev | |
| 3183255 am ea33eb4a: am 3daa1f2d: am 0187f638: Merge "Fix test packages." into mnc-dev | |
| ea33eb4 am 3daa1f2d: am 0187f638: Merge "Fix test packages." into mnc-dev | |
| 0e1df2b am f68598d1: am acc041ab: am 56cecb19: Merge "Don\'t check that requestRouteToHost works if we have no IPv4." into mnc-dev | |
| f68598d am acc041ab: am 56cecb19: Merge "Don\'t check that requestRouteToHost works if we have no IPv4." into mnc-dev | |
| 357b7da am 511c0373: am 81c1d458: am 562fd951: Fix build. | |
| 511c037 am 81c1d458: am 562fd951: Fix build. | |
| b7f559d am 4fb87102: am 5296bf0c: am c1da7113: Merge "CameraITS: Add stats image format." into mnc-dev | |
| 4fb8710 am 5296bf0c: am c1da7113: Merge "CameraITS: Add stats image format." into mnc-dev | |
| 691be71 am 8e61b51c: am 861ceb8b: am d052b58b: Add light status bar CTS | |
| 8e61b51 am 861ceb8b: am d052b58b: Add light status bar CTS | |
| 1648d79 am 2459f90d: am 49c3423e: am abbb7218: am 581367e0: am 2ebb3bbe: am 3dc22522: am 163002e6: resolved conflicts for 7db619d7 to lmp-sprout-dev | |
| 2459f90 am 49c3423e: am abbb7218: am 581367e0: am 2ebb3bbe: am 3dc22522: am 163002e6: resolved conflicts for 7db619d7 to lmp-sprout-dev | |
| 753f957 am a7a694da: am 0de4e05f: am c34cb56e: Merge "If there are no activities registered for voice intents, don\'t run the corresponding CTS tests. For example, Android television implementations don\'t process voice intents: battery_saver_mode." into mnc-dev | |
| a7a694d am 0de4e05f: am c34cb56e: Merge "If there are no activities registered for voice intents, don\'t run the corresponding CTS tests. For example, Android television implementations don\'t process voice intents: battery_saver_mode." into mnc-dev | |
| 2820458 am 908b3826: am b6c1e2e5: am 14b7ce8b: Merge "Do not complain about presence of pro audio feature" into mnc-dev | |
| 908b382 am b6c1e2e5: am 14b7ce8b: Merge "Do not complain about presence of pro audio feature" into mnc-dev | |
| 6d56eac am 01b547e4: am 08ca3b36: am f41ee62b: Merge "Add CtsVerifier tests for app linking." into mnc-dev | |
| 01b547e am 08ca3b36: am f41ee62b: Merge "Add CtsVerifier tests for app linking." into mnc-dev | |
| 6800c68 am d3a3ded8: am 38aa0478: am d160e599: Merge "Add CTS Verifier for the app link API in TIF" into mnc-dev | |
| d3a3ded am 38aa0478: am d160e599: Merge "Add CTS Verifier for the app link API in TIF" into mnc-dev | |
| 783f410 am b05d4737: am ec5cf03f: am 8232192a: am d5e5061c: am a62f1e73: am 052ca740: am d50381f8: am c26640b0: am 075ea8aa: Merge "media: change vorbis samples to 48kHz" into lmp-sprout-dev | |
| 8848159 am 3a7d040a: am d03968a5: am 31f615de: am 46ef0de8: am ecc146ee: am 697caace: am dc96b0d6: am 3cbd483f: am f518d4e9: Merge "media: run media tests based on device type and support" into lmp-sprout-dev | |
| c586444 am f3a1f188: am fd9da8f6: am 5672fefc: am db24db62: am 01c12bde: am a013f022: am 9bfd2707: am 3401d009: am 6905206a: Fix AudioManagerTest to handle TVs that don\'t vibrate and lack ringer functionality. | |
| e52b29f am 7c18c468: am bea12944: am 0ec59b5d: am 12a745a1: am 3299e8fc: am 640e2e05: am 564b8870: am 333b361c: am 380a0c49: Merge changes I5ffb1399,I2333765e,I64ca4e29,I6f393150 into lmp-sprout-dev | |
| a1b96a8 am ecfcdedc: am 3c6bc6ae: am 57f2c72a: am 5d3ddf33: am 22971785: am cb94a331: am 1770201d: am 8a2d6a0f: am 1f59d390: Fix heart rate cts sensor feature test | |
| 4f4f859 am 4daf0603: am e3a8f98e: am fd726a08: am 461c66d8: am b26ac70c: am d3acc965: am a482b371: am 36df50c9: am be11c2cf: Merge "Revert "Fix cts test LayoutTests#testSimpleRedLayout()"" into lmp-sprout-dev | |
| b55c727 am f5a2f5ab: am fc277869: am 609799d6: am dd08aebe: am 1a116ba8: am c90e9c15: am 7a058bff: am cd12f845: am ff248435: Merge "Fix cts test LayoutTests#testSimpleRedLayout()" into lmp-sprout-dev | |
| 2329e89 am c04b1761: am 8e6e2e3e: am 95763b16: am 0ac2ce79: am 52358e9c: am b57514ad: am e499f7fd: am 0673e041: am 78394957: Merge "Fix MediaRecorderTest to test for encoders." into lmp-sprout-dev | |
| 3786c27 am 56c39e91: am 19566ba3: am dd81f8fb: am 457e4d0c: am 57821773: am 80ba97a4: am ea6f72dd: am c310c225: am d6a68b41: Merge "Don’t run print tests on devices that do not support printing." into lmp-sprout-dev | |
| 3be3165 am 5356ebb7: am 4f46fd13: am 540fa2cb: am e270259b: am a04a2126: am 5c803bbf: am 7c26c81e: am e2658112: am 169c9098: Merge "Give tests BODY_SENSORS permissions" into lmp-sprout-dev | |
| 7679c0b am ff76dbe1: am 9b2f751c: am 4f02f079: am 69202205: am 48e518f9: am d96f42c1: am ed1ee677: am 4b50b66d: am 45037622: Merge "Add a test for package priority ranking." into lmp-sprout-dev | |
| 56d6775 am 61cd64e9: am 996baa46: am b39ca0f3: am 66a4f413: am 09269ee6: am c3a81abd: am 55b0b265: resolved conflicts for b907d87b to lmp-sprout-dev | |
| b05d473 am ec5cf03f: am 8232192a: am d5e5061c: am a62f1e73: am 052ca740: am d50381f8: am c26640b0: am 075ea8aa: Merge "media: change vorbis samples to 48kHz" into lmp-sprout-dev | |
| 3a7d040 am d03968a5: am 31f615de: am 46ef0de8: am ecc146ee: am 697caace: am dc96b0d6: am 3cbd483f: am f518d4e9: Merge "media: run media tests based on device type and support" into lmp-sprout-dev | |
| f3a1f18 am fd9da8f6: am 5672fefc: am db24db62: am 01c12bde: am a013f022: am 9bfd2707: am 3401d009: am 6905206a: Fix AudioManagerTest to handle TVs that don\'t vibrate and lack ringer functionality. | |
| 7c18c46 am bea12944: am 0ec59b5d: am 12a745a1: am 3299e8fc: am 640e2e05: am 564b8870: am 333b361c: am 380a0c49: Merge changes I5ffb1399,I2333765e,I64ca4e29,I6f393150 into lmp-sprout-dev | |
| ecfcded am 3c6bc6ae: am 57f2c72a: am 5d3ddf33: am 22971785: am cb94a331: am 1770201d: am 8a2d6a0f: am 1f59d390: Fix heart rate cts sensor feature test | |
| 4daf060 am e3a8f98e: am fd726a08: am 461c66d8: am b26ac70c: am d3acc965: am a482b371: am 36df50c9: am be11c2cf: Merge "Revert "Fix cts test LayoutTests#testSimpleRedLayout()"" into lmp-sprout-dev | |
| f5a2f5a am fc277869: am 609799d6: am dd08aebe: am 1a116ba8: am c90e9c15: am 7a058bff: am cd12f845: am ff248435: Merge "Fix cts test LayoutTests#testSimpleRedLayout()" into lmp-sprout-dev | |
| c04b176 am 8e6e2e3e: am 95763b16: am 0ac2ce79: am 52358e9c: am b57514ad: am e499f7fd: am 0673e041: am 78394957: Merge "Fix MediaRecorderTest to test for encoders." into lmp-sprout-dev | |
| 56c39e9 am 19566ba3: am dd81f8fb: am 457e4d0c: am 57821773: am 80ba97a4: am ea6f72dd: am c310c225: am d6a68b41: Merge "Don’t run print tests on devices that do not support printing." into lmp-sprout-dev | |
| 5356ebb am 4f46fd13: am 540fa2cb: am e270259b: am a04a2126: am 5c803bbf: am 7c26c81e: am e2658112: am 169c9098: Merge "Give tests BODY_SENSORS permissions" into lmp-sprout-dev | |
| ff76dbe am 9b2f751c: am 4f02f079: am 69202205: am 48e518f9: am d96f42c1: am ed1ee677: am 4b50b66d: am 45037622: Merge "Add a test for package priority ranking." into lmp-sprout-dev | |
| 61cd64e am 996baa46: am b39ca0f3: am 66a4f413: am 09269ee6: am c3a81abd: am 55b0b265: resolved conflicts for b907d87b to lmp-sprout-dev | |
| b5908d5 am 94e5cff9: am 59e5a2c1: am 720e7b1d: Merge "Remove dependence on GSA voice_interaction_service from CTS tests." into mnc-dev | |
| 94e5cff am 59e5a2c1: am 720e7b1d: Merge "Remove dependence on GSA voice_interaction_service from CTS tests." into mnc-dev | |
| 38d1dbe am b2ce2630: am 8ea83190: am 2e8c4ebb: Merge "Skip leanback test if leanback feature is not supported by the device." into mnc-dev | |
| b2ce263 am 8ea83190: am 2e8c4ebb: Merge "Skip leanback test if leanback feature is not supported by the device." into mnc-dev | |
| 07530ef am 83c27775: (-s ours) am 37af2a07: (-s ours) am 77dde618: (-s ours) am ff469d96: (-s ours) am 657309ff: (-s ours) am ce076636: (-s ours) Merge "DO NOT MERGE ANYWHERE: Test whether mediaserver leaks info across invalid binder calls" into lmp-mr1-dev | |
| 5bbf4b5 am 872095eb: am c5a6d3c9: am 9d1b3f79: am 8995deaa: am f2a7843c: am 5af0e7cf: am 927ae932: am 032b6ec9: am 0daa2aee: Fix the flakiness of this test by waiting. | |
| 1231ab8 am 12322402: am 2bb2dee0: am 92ace6ea: am 98a54bbf: am 578cd94e: am 580c3dfa: am 9edabb6c: am c35575f7: am a2f93c75: Fix remaining print test failures. | |
| 7e2f8d5 am e8a6aa4f: am fb6c84be: am 62bba534: am f6ff0388: am be5197da: am ae858472: am 477f874e: am 09f056cf: am 3951caec: Merge "Fix test break due to API not working as advertised." into lmp-sprout-dev | |
| 5bd1c72 am 1bbfe03b: am 903ab0c8: am 6baae8b2: am b08116af: am f2e77390: am a8a289fd: am 92c01cd1: am 08a522d5: am 7e91cdc9: Added vibration feedback to Projection Offscreen Test for devices without audio feedback capabilities. | |
| 0be45e0 am 0a16dd90: am 1a5d1b8a: am 89d4eeae: am c01ab882: am 4efaa29e: am 388c4515: am df649b74: am 520637a1: am db3a6c44: Merge "CameraITS: Updates to test_crop_regions_raw" into lmp-sprout-dev | |
| d05d14b am 522c3b67: am 5c733efa: am 43deb903: am e210192b: am 4fbe60a0: am 28b7f724: am f0647380: am d6e289db: am b72cdbdc: Merge "Fix MediaRecorderTest failures." into lmp-sprout-dev | |
| a0b35e7 am 37b3940f: am edca1c92: am eddb2024: am b02c33c0: am 7ebf4d1f: am 02fb350b: am 2ce9f3a1: am b5bae0fa: am 1be1323d: Merge "Add performance measurement reporting to CtsVerifier." into lmp-sprout-dev | |
| 7754471 am 35db48d1: am 32d10426: am 17d4e094: am fb08a6a1: am 19268893: am 1091c9ee: am 1d9f0bef: am 0271e0d6: am 5411164b: Merge "Fix cts test PopupWindowTest#testGetMaxAvailableHeight()" into lmp-sprout-dev | |
| 245b0d3 am 2bb57045: am 9acb8dc2: am dd7a6dbf: am e2d23459: am 2b36b780: am b5e0f7e7: am 6db39c1c: am 9e97facb: am b5c03970: Merge "Add helper APK to CtsVerifier zip." into lmp-sprout-dev | |
| 8570eef am 4716536a: am 264d5eb7: am adf499b6: am a187679c: am 2f30f704: am e8dd3693: am 9d61174e: am 1cc2c692: am aea823b0: Fix failure in testMuxer(). | |
| 27763a8 am 7447d5fe: am ad9ec491: am 180ed3b9: am a841d8c3: am 65f9da5b: am ec067de3: am 3f0aa18e: am c0c229b7: am c638e95f: Merge "Fix UiAutomationTest#testWindowAnimationFrameStats." into lmp-sprout-dev | |
| e6dfdd1 am 3fc73a4a: am a67af62f: am b77ab758: am 6306fd2e: am bbad11c9: am 3453f25a: am 8a72b4db: resolved conflicts for 97f2930b to lmp-sprout-dev | |
| 935cbf3 am a90f0a77: am 80cc3497: am 6e6d431c: am 49ef76df: (-s ours) am bbe73047: am 5925d48b: am 7419f1a6: am 0f777b5c: am 804c4e80: (-s ours) Merge "TV: fix tests to match updated framework behavior DO NOT MERGE" into lmp-sprout-dev | |
| 1d6982e am 5bf64f53: am 07413e69: am 08b5972d: am 007e7a90: am 4b48e2fa: am d1721550: am 06754026: am 53e64b9a: am 78772c41: Merge "Added multitouch requirement for Projection Multitouch Test." into lmp-sprout-dev | |
| 612ef62 am 2fab3d29: am 8e87f788: am ad9a2867: am 3083a362: am 947eef95: am bd79e1a5: am def5d0a6: am 02cb82b8: am 7d28e015: Merge "CTS tests for Dumpsys Batterystats" into lmp-sprout-dev | |
| 72b905c am 1eb5edfe: am f369100e: am c5a9da48: am 107d5a60: am ae3fe3c9: am 6a8236e5: am 081a1232: am 9ebb1756: am 7c27d04e: am 9888d696: Merge "Fix Signature test" into lmp-dev | |
| f4ee385 am 5192f7b3: am 1a265f83: am 6e051ecb: am 6a658bcc: am 974a11a7: am 5d2a6db5: am b54b1e3f: am e6e08f34: am f48a77de: Merge "Fix the NPE of testSingleLine." into lmp-sprout-dev | |
| 1575863 am 0d3f8f64: am 93672fdc: am 0e05f2a0: am 21fcfad8: am 2654eda6: am 2fd52bf4: am c1f55775: am f37a2d1f: am e8909e5d: am 816391ba: Fix cts-tradefed\'s Java version check. | |
| bfdc901 am 6688e506: am 7b1392ae: am f3dc55ae: am 0490ee77: am 0b888417: am 95711950: am ccc22199: am f33e7f47: am 0e9ce42a: Merge "Half of CTS AccessibilityEvent test fix for Wear. Wear does not alert for notifications if another activity is in the foreground. This finish()e | |
| 23f30eb am a522408f: am b0e7d08d: am 5a2a529b: am 79c7ef74: am e0dcedc4: am 152ddce2: am e6ca6832: am 8deefb42: am b65339b5: Merge "CTS tests for Dumpsys Procstats (this time in lmp-sprout-dev)" into lmp-sprout-dev | |
| 8bb4075 am 8c5888e4: am f1dbe923: am ad7415c2: am 9f8e87ba: am 984bcf38: am decb760b: am 073640c1: am 6875ca28: am febcfac8: Added wrapping padding for round screens. | |
| fbb3714 am 833c8229: am 0c8efd81: am 52fa01e5: am 2305d963: am 607db014: am fa98db01: am a221d8e1: am 02373e84: am bb702a48: Merge "Refactor notification tests to clean them up." into lmp-sprout-dev | |
| ef2ae31 am 39a92a3c: am f046f843: am dcb4b914: am 7d8664ce: am f359d91c: am 26deb0f2: am 98daa97f: am a788976c: am f912a16f: Test for the codecs in the MediaPlayerFlakyNetworkTests. | |
| fd295a6 am 727b187e: am 316bdb66: am 43a0c258: am b9a82fe6: am 04b5570f: am fd9d763e: am b2df5e75: resolved conflicts for merge of f49d0764 to lmp-sprout-dev | |
| 25f9fe9 am 682bf093: am 473481da: am 1425222c: am e2d0fec7: (-s ours) am 5a6c9fdd: am 4eb90322: Merge "[DO NOT MERGE] Fix ActivityManagerTest#testGetRunningAppProcesses" into lmp-mr1-dev | |
| 3faf7ff am 6214ae56: am f36d9246: am 0441fa58: Merge "resolved conflicts for 5cac2eeb to mnc-dev" into mnc-dev | |
| 83c2777 am 37af2a07: (-s ours) am 77dde618: (-s ours) am ff469d96: (-s ours) am 657309ff: (-s ours) am ce076636: (-s ours) Merge "DO NOT MERGE ANYWHERE: Test whether mediaserver leaks info across invalid binder calls" into lmp-mr1-dev | |
| 872095e am c5a6d3c9: am 9d1b3f79: am 8995deaa: am f2a7843c: am 5af0e7cf: am 927ae932: am 032b6ec9: am 0daa2aee: Fix the flakiness of this test by waiting. | |
| 1232240 am 2bb2dee0: am 92ace6ea: am 98a54bbf: am 578cd94e: am 580c3dfa: am 9edabb6c: am c35575f7: am a2f93c75: Fix remaining print test failures. | |
| e8a6aa4 am fb6c84be: am 62bba534: am f6ff0388: am be5197da: am ae858472: am 477f874e: am 09f056cf: am 3951caec: Merge "Fix test break due to API not working as advertised." into lmp-sprout-dev | |
| 1bbfe03 am 903ab0c8: am 6baae8b2: am b08116af: am f2e77390: am a8a289fd: am 92c01cd1: am 08a522d5: am 7e91cdc9: Added vibration feedback to Projection Offscreen Test for devices without audio feedback capabilities. | |
| 0a16dd9 am 1a5d1b8a: am 89d4eeae: am c01ab882: am 4efaa29e: am 388c4515: am df649b74: am 520637a1: am db3a6c44: Merge "CameraITS: Updates to test_crop_regions_raw" into lmp-sprout-dev | |
| 522c3b6 am 5c733efa: am 43deb903: am e210192b: am 4fbe60a0: am 28b7f724: am f0647380: am d6e289db: am b72cdbdc: Merge "Fix MediaRecorderTest failures." into lmp-sprout-dev | |
| 37b3940 am edca1c92: am eddb2024: am b02c33c0: am 7ebf4d1f: am 02fb350b: am 2ce9f3a1: am b5bae0fa: am 1be1323d: Merge "Add performance measurement reporting to CtsVerifier." into lmp-sprout-dev | |
| 35db48d am 32d10426: am 17d4e094: am fb08a6a1: am 19268893: am 1091c9ee: am 1d9f0bef: am 0271e0d6: am 5411164b: Merge "Fix cts test PopupWindowTest#testGetMaxAvailableHeight()" into lmp-sprout-dev | |
| 2bb5704 am 9acb8dc2: am dd7a6dbf: am e2d23459: am 2b36b780: am b5e0f7e7: am 6db39c1c: am 9e97facb: am b5c03970: Merge "Add helper APK to CtsVerifier zip." into lmp-sprout-dev | |
| 4716536 am 264d5eb7: am adf499b6: am a187679c: am 2f30f704: am e8dd3693: am 9d61174e: am 1cc2c692: am aea823b0: Fix failure in testMuxer(). | |
| 7447d5f am ad9ec491: am 180ed3b9: am a841d8c3: am 65f9da5b: am ec067de3: am 3f0aa18e: am c0c229b7: am c638e95f: Merge "Fix UiAutomationTest#testWindowAnimationFrameStats." into lmp-sprout-dev | |
| 3fc73a4 am a67af62f: am b77ab758: am 6306fd2e: am bbad11c9: am 3453f25a: am 8a72b4db: resolved conflicts for 97f2930b to lmp-sprout-dev | |
| a90f0a7 am 80cc3497: am 6e6d431c: am 49ef76df: (-s ours) am bbe73047: am 5925d48b: am 7419f1a6: am 0f777b5c: am 804c4e80: (-s ours) Merge "TV: fix tests to match updated framework behavior DO NOT MERGE" into lmp-sprout-dev | |
| 5bf64f5 am 07413e69: am 08b5972d: am 007e7a90: am 4b48e2fa: am d1721550: am 06754026: am 53e64b9a: am 78772c41: Merge "Added multitouch requirement for Projection Multitouch Test." into lmp-sprout-dev | |
| 2fab3d2 am 8e87f788: am ad9a2867: am 3083a362: am 947eef95: am bd79e1a5: am def5d0a6: am 02cb82b8: am 7d28e015: Merge "CTS tests for Dumpsys Batterystats" into lmp-sprout-dev | |
| 1eb5edf am f369100e: am c5a9da48: am 107d5a60: am ae3fe3c9: am 6a8236e5: am 081a1232: am 9ebb1756: am 7c27d04e: am 9888d696: Merge "Fix Signature test" into lmp-dev | |
| 5192f7b am 1a265f83: am 6e051ecb: am 6a658bcc: am 974a11a7: am 5d2a6db5: am b54b1e3f: am e6e08f34: am f48a77de: Merge "Fix the NPE of testSingleLine." into lmp-sprout-dev | |
| 0d3f8f6 am 93672fdc: am 0e05f2a0: am 21fcfad8: am 2654eda6: am 2fd52bf4: am c1f55775: am f37a2d1f: am e8909e5d: am 816391ba: Fix cts-tradefed\'s Java version check. | |
| 6688e50 am 7b1392ae: am f3dc55ae: am 0490ee77: am 0b888417: am 95711950: am ccc22199: am f33e7f47: am 0e9ce42a: Merge "Half of CTS AccessibilityEvent test fix for Wear. Wear does not alert for notifications if another activity is in the foreground. This finish()es the test ac | |
| a522408 am b0e7d08d: am 5a2a529b: am 79c7ef74: am e0dcedc4: am 152ddce2: am e6ca6832: am 8deefb42: am b65339b5: Merge "CTS tests for Dumpsys Procstats (this time in lmp-sprout-dev)" into lmp-sprout-dev | |
| 8c5888e am f1dbe923: am ad7415c2: am 9f8e87ba: am 984bcf38: am decb760b: am 073640c1: am 6875ca28: am febcfac8: Added wrapping padding for round screens. | |
| 833c822 am 0c8efd81: am 52fa01e5: am 2305d963: am 607db014: am fa98db01: am a221d8e1: am 02373e84: am bb702a48: Merge "Refactor notification tests to clean them up." into lmp-sprout-dev | |
| 39a92a3 am f046f843: am dcb4b914: am 7d8664ce: am f359d91c: am 26deb0f2: am 98daa97f: am a788976c: am f912a16f: Test for the codecs in the MediaPlayerFlakyNetworkTests. | |
| 727b187 am 316bdb66: am 43a0c258: am b9a82fe6: am 04b5570f: am fd9d763e: am b2df5e75: resolved conflicts for merge of f49d0764 to lmp-sprout-dev | |
| 682bf09 am 473481da: am 1425222c: am e2d0fec7: (-s ours) am 5a6c9fdd: am 4eb90322: Merge "[DO NOT MERGE] Fix ActivityManagerTest#testGetRunningAppProcesses" into lmp-mr1-dev | |
| 6214ae5 am f36d9246: am 0441fa58: Merge "resolved conflicts for 5cac2eeb to mnc-dev" into mnc-dev | |
| c0efc8d am 2a9a96b8: am 7bf3a7f0: am e943923c: Test whether mediaserver leaks info across invalid binder calls | |
| 2a9a96b am 7bf3a7f0: am e943923c: Test whether mediaserver leaks info across invalid binder calls | |
| 0f1b96a am ae5d372e: am 4ae3a30c: am 8563e4da: CameraITS: avoid using non-guaranteed RAW12 stream combination | |
| ae5d372 am 4ae3a30c: am 8563e4da: CameraITS: avoid using non-guaranteed RAW12 stream combination | |
| 4f5dbd5 am adfded21: am d1e4d51b: am 87a4a05d: Merge "Verify the dimension of the VoiceInteractionSession\'s content view - Also added null checks around CountDownLatches to avoid NPEs that resulted from acting on broadcasts before the TestCases were ready." into mnc-dev | |
| adfded2 am d1e4d51b: am 87a4a05d: Merge "Verify the dimension of the VoiceInteractionSession\'s content view - Also added null checks around CountDownLatches to avoid NPEs that resulted from acting on broadcasts before the TestCases were ready." into mnc-dev | |
| 6990eee am 65f3eb06: am edb6ca7d: am ad37bc7c: resolved conflicts for b5fd7234 to mnc-dev | |
| 65f3eb0 am edb6ca7d: am ad37bc7c: resolved conflicts for b5fd7234 to mnc-dev | |
| 6b5849f am 952707eb: am 0c956d82: am 85d1c826: Merge "resolved conflicts for bcb4553f to mnc-dev" into mnc-dev | |
| 952707e am 0c956d82: am 85d1c826: Merge "resolved conflicts for bcb4553f to mnc-dev" into mnc-dev | |
| 2fc8f06 am 7fbbaa42: am 64b669fc: am 7f765263: Merge "Remove unnecessary teardown command" into mnc-dev | |
| 7fbbaa4 am 64b669fc: am 7f765263: Merge "Remove unnecessary teardown command" into mnc-dev | |
| ee73108 am 8bbcde1d: am 28f521e1: am 3095b133: Merge "Camera: Fix testMixedBurstReprocessing" into mnc-dev | |
| f1860e8 am 4e0b78eb: am 827d9539: am 332cbf91: Merge "Test onProvideAssistContent and onProvideAssistData" into mnc-dev | |
| 8bbcde1 am 28f521e1: am 3095b133: Merge "Camera: Fix testMixedBurstReprocessing" into mnc-dev | |
| 4e0b78e am 827d9539: am 332cbf91: Merge "Test onProvideAssistContent and onProvideAssistData" into mnc-dev | |
| f4fe0e0 am d44be595: am eff7e22b: am 08b6b18b: Merge "CTS test for libmedia OOB write anywhere" into mnc-dev | |
| d44be59 am eff7e22b: am 08b6b18b: Merge "CTS test for libmedia OOB write anywhere" into mnc-dev | |
| a71af41 am 127e456c: am 50ce0ac3: am 0d988e1f: Merge "Test onHandleScreenshot for approximate pixel equality to expected view." into mnc-dev | |
| 127e456 am 50ce0ac3: am 0d988e1f: Merge "Test onHandleScreenshot for approximate pixel equality to expected view." into mnc-dev | |
| e4279cc am ed2852cf: am a6ca91d9: am f1f502b5: Merge "Skip CTS tests if zen_mode or airplane setting is not set or if voice intents are not supported by the platform. This can happen on certain platforms (fugu, for example) or on devices (zen_mode may not be in Settings, for | |
| ed2852c am a6ca91d9: am f1f502b5: Merge "Skip CTS tests if zen_mode or airplane setting is not set or if voice intents are not supported by the platform. This can happen on certain platforms (fugu, for example) or on devices (zen_mode may not be in Settings, for example)." in | |
| 96c6a83 am fadc4b3c: am 422bd9b2: am a4be74bb: RVCVXCheck CTS video recording bugfixes | |
| fadc4b3 am 422bd9b2: am a4be74bb: RVCVXCheck CTS video recording bugfixes | |
| 3ff0f25 am eda5a5f0: am cf873a60: am 101c115a: Merge "Remove duplicate requestRouteToHost permission test." into mnc-dev | |
| eda5a5f am cf873a60: am 101c115a: Merge "Remove duplicate requestRouteToHost permission test." into mnc-dev | |
| b744938 am 8498b698: am 6e9b4bb2: am f25fde96: CTS: do not check for read permission on oom adjust files | |
| 8498b69 am 6e9b4bb2: am f25fde96: CTS: do not check for read permission on oom adjust files | |
| f3f7e87 am b1d9fce8: am 77fd9d33: am 2c8debb6: Merge "Remove wp feature test" into mnc-dev | |
| b1d9fce am 77fd9d33: am 2c8debb6: Merge "Remove wp feature test" into mnc-dev | |
| 14599e9 am 45ebbb4e: am 8049d8b4: am 6506d305: Merge "[CtsVerifier] don\'t run Fingerprint keys test without fingerprint" into mnc-dev | |
| 45ebbb4 am 8049d8b4: am 6506d305: Merge "[CtsVerifier] don\'t run Fingerprint keys test without fingerprint" into mnc-dev | |
| d7434e3 am 6d0725a4: am 44ba3ddd: am e6542876: Few stability fixes in Telecom CTS tests. | |
| 6d0725a am 44ba3ddd: am e6542876: Few stability fixes in Telecom CTS tests. | |
| cdc8721 am 430cf963: am 19a846d6: am 58581c3d: Merge "Fix the framestats test to use its own activity" into mnc-dev | |
| 430cf96 am 19a846d6: am 58581c3d: Merge "Fix the framestats test to use its own activity" into mnc-dev | |
| 9962325 am e41c945a: am 105b1d3d: am 0723dbbc: EDI: Get device external storage path from ITestDevice (CTS) | |
| e41c945 am 105b1d3d: am 0723dbbc: EDI: Get device external storage path from ITestDevice (CTS) | |
| 13ed368 am cad68ba0: am 5973211a: am be10ebbd: Merge "Fix AtraceHostTest to not rely on parsing tgid" into mnc-dev | |
| cad68ba am 5973211a: am be10ebbd: Merge "Fix AtraceHostTest to not rely on parsing tgid" into mnc-dev | |
| 5756df8 am b7b163d5: am 7db91bc4: am 92a7dc58: Merge "Move EGL setup to separate function." into mnc-dev | |
| b7b163d am 7db91bc4: am 92a7dc58: Merge "Move EGL setup to separate function." into mnc-dev | |
| 1e79ce4 am 6caa1e3d: am 6687c713: am 63a2d8ff: am f5b228ee: am 9ba87b85: am c0c74360: am a4456f70: am c65bc434: am 62532688: Set a system property stating the device supports multicast. | |
| 0dddae9 am 2aad00ef: am 0eec942d: am 5f423e74: am a51133ff: am 9a8c6079: am c107b651: am 85ea8f35: am 498091e6: am 8c4b4833: Fix the CTS print tests. | |
| 94f4ce7 am 13407632: am d61b159f: am 1a8b135f: am ca569515: am 607774e9: am e058adde: am d8e9c16a: am 80360dc4: am e6ad305e: Merge "Skip ImageReaderDecoderTest if h.264 is not found." into lmp-sprout-dev | |
| 1b2d0a7 am d487e05b: am 2fc5c159: am a797fdf6: am c30249f2: am 5938d332: am e9099580: am 86760725: am cc77399d: am 9e50e10f: Merge "CameraITS: Add EV compensation test" into lmp-sprout-dev | |
| 90115fa am 94849613: am 22920d0e: am 39fd1c0a: am c3154e7f: am 5a2f18d6: am 148cee75: am 736b570b: am 5834bcf1: am 8152e304: CameraITS: Add DNG noise model test | |
| b99e525 am 993f62c8: am ebad9356: am ae180e89: am 9d214334: am c36cb9f6: am c0cdb362: am 26198196: am b70ba35a: am a01fb0d7: CameraITS: PDF doc updates for DNG noise model | |
| 70e0e99 am 6e84b11f: am 63cec99e: am c735a2b8: am 54accaa9: am 5b13f61a: am 24ec999a: am 72a4d623: am 56538948: am 3673d9f0: CameraITS: Added sensor fusion test. | |
| 5d5e3e1 am 2fcacb83: am cc2fc277: am b385539f: am 7ae774d4: am 7190c0b2: am 78ca52bb: am d5f8dc7b: am 276b599e: am 876ede47: CameraITS: Cleaned up and documented script to generate DNG noise model | |
| e2b8613 am cf7df7a0: am d64f1d85: am 5fa4da0b: am c003f084: am 571f843d: am 1477e2dd: am 2964e8fd: am e80808a0: am d624f970: CameraITS: Correct an out-of-date doc comment in its.image. | |
| 7d8a426 am 615108a8: am 52c58f87: am 824ffd02: am 53c34537: am a799d645: am 093e6b68: am 59863965: am f7057b97: am 483aa0b6: CameraITS: Added OpenCV to installed module list | |
| 860999b am 9ba2fe0f: am 0ac2d1ed: am d2023c61: am c6ce53c5: am a7861150: am e4286de9: am 26e02e2a: am d05409d8: am 2f54c52b: Add "-v" to any logcat commands run from within CTS tests | |
| f0d4276 am ab5b443c: am f722cbc1: am a61b85b3: am d3daab0b: am 76c9e022: am 05b1093f: am bcd0e58d: am 57e5c0da: am 8a893be3: Merge "Fix failing CTS tests." into lmp-sprout-dev | |
| c7c023d am 4731ca35: am 29d16699: am 353bb25e: am 9d244f6f: am c7c489c0: am 3cb7cae0: am b5d78746: am c5f65324: am c2cef921: Added Clear, View, and Export actions to main list for activity windows without Action Bar feature. | |
| 49edce0 am 4d3d1b4d: am 234b0d34: am ade4e4c9: am c93827ba: am ebf9b8d3: am 65c4783b: am 784bdd8f: am 16e8e01f: am 9610d4a3: Merge "CamcorderProfile: guard unknown profile qualities" into lmp-sprout-dev | |
| 0258334 am 9d882b32: am 6c9049e9: am cc5f6524: am 1071513a: am 3fb0f92a: am 173e0638: am c45414f6: am 0cd1d99f: am 46d5f094: Merge "CameraITS: allow more time for AE converge" into lmp-sprout-dev | |
| 4a63aaa am 4c62f144: am 3286de9e: am b8a96531: am 0be47df7: am f802ac07: am 3764dcbf: am 50d6f79f: am af521804: am 168154f1: Merge "Camera2: skip AE compensation test on legacy devices" into lmp-sprout-dev | |
| bcf0e61 am 1dcf4e95: am 6f3985cc: am c9e91204: am fafcac91: am 3637ac2c: am 1e65d1c4: am 0dd22c5f: am 7c95df2b: am 4c4f07d9: Camera2: add static metadata collection | |
| 0ec4810 am b3614c6b: am 7c939f9f: am 3792a80b: am c1f627d9: am f4e77e40: am d51efae7: am c06afd8c: am e9cf4cb5: am 74b936fb: Fix failing CTS tests. | |
| 2d8cb2a am 40b07828: am 34027b90: am 80d2262f: am 651cdcd9: am 2ce59026: am 02444975: am b6a2c6b1: am 63621263: am 2ae07bfd: Merge "Fixed text-to-speech tests for Android Wear. Wear devices don\'t have TTS yet, partly because they don\'t have audio-out. Once they have FEATURE | |
| 1406c9d am 7ab49492: am fb3010a5: am fdb8e4f5: am 13202fe3: am fce25797: am e2502c15: am e028209f: am c2c7420c: am 336efd31: Merge "Fix various Wear media CTS failures." into lmp-sprout-dev | |
| 4f4487d am f7a1102d: am ea40a793: am 189010b6: am fce976ec: am 6f706a09: am d22fcb61: am df5dc917: am 04b6548f: am 61998484: Merge "CameraITS: fix manual capture request" into lmp-sprout-dev | |
| 7598589 am d749a679: am a91d9e99: am 8eca7769: am 9386a509: am ddb94cff: am 12dda9f3: am e8769ba1: am 7f20f7d6: am 1b16d5ce: Don’t run RingtoneMangerTest tests on devices without audio output. | |
| 021ca89 am 15aa6b2a: am b5157ecb: am 0f38578d: am 813f4ead: am 51ba66ed: am c36c8e26: am 882ec2e4: am 436acb71: am f9e09d47: Don’t run Ringtone test if the devices without audio output. | |
| 6de49cf am 204e2d84: am cf2186a9: am 3657635b: am 4b77bb10: am f73d79d2: am 7487e81b: am 6e757b83: am aa05d868: am 354ff1ba: am c059bc6f: Merge "Update Data Backup description to accommodate more devices." into lmp-dev | |
| 8b0011e am 59b540af: am 4d777f09: am a04ca5e0: am 8bc14897: am 4d06ce79: am b304f03f: am 4b6f2421: am e442282a: am 2cd838d6: am 47a20d81: resolve merge conflicts of 6c1149d to klp-modular-dev-plus-aosp. automerge: f6f6d69 | |
| 6caa1e3 am 6687c713: am 63a2d8ff: am f5b228ee: am 9ba87b85: am c0c74360: am a4456f70: am c65bc434: am 62532688: Set a system property stating the device supports multicast. | |
| 2aad00e am 0eec942d: am 5f423e74: am a51133ff: am 9a8c6079: am c107b651: am 85ea8f35: am 498091e6: am 8c4b4833: Fix the CTS print tests. | |
| 1340763 am d61b159f: am 1a8b135f: am ca569515: am 607774e9: am e058adde: am d8e9c16a: am 80360dc4: am e6ad305e: Merge "Skip ImageReaderDecoderTest if h.264 is not found." into lmp-sprout-dev | |
| d487e05 am 2fc5c159: am a797fdf6: am c30249f2: am 5938d332: am e9099580: am 86760725: am cc77399d: am 9e50e10f: Merge "CameraITS: Add EV compensation test" into lmp-sprout-dev | |
| 9484961 am 22920d0e: am 39fd1c0a: am c3154e7f: am 5a2f18d6: am 148cee75: am 736b570b: am 5834bcf1: am 8152e304: CameraITS: Add DNG noise model test | |
| 993f62c am ebad9356: am ae180e89: am 9d214334: am c36cb9f6: am c0cdb362: am 26198196: am b70ba35a: am a01fb0d7: CameraITS: PDF doc updates for DNG noise model | |
| 6e84b11 am 63cec99e: am c735a2b8: am 54accaa9: am 5b13f61a: am 24ec999a: am 72a4d623: am 56538948: am 3673d9f0: CameraITS: Added sensor fusion test. | |
| 2fcacb8 am cc2fc277: am b385539f: am 7ae774d4: am 7190c0b2: am 78ca52bb: am d5f8dc7b: am 276b599e: am 876ede47: CameraITS: Cleaned up and documented script to generate DNG noise model | |
| cf7df7a am d64f1d85: am 5fa4da0b: am c003f084: am 571f843d: am 1477e2dd: am 2964e8fd: am e80808a0: am d624f970: CameraITS: Correct an out-of-date doc comment in its.image. | |
| 615108a am 52c58f87: am 824ffd02: am 53c34537: am a799d645: am 093e6b68: am 59863965: am f7057b97: am 483aa0b6: CameraITS: Added OpenCV to installed module list | |
| 9ba2fe0 am 0ac2d1ed: am d2023c61: am c6ce53c5: am a7861150: am e4286de9: am 26e02e2a: am d05409d8: am 2f54c52b: Add "-v" to any logcat commands run from within CTS tests | |
| ab5b443 am f722cbc1: am a61b85b3: am d3daab0b: am 76c9e022: am 05b1093f: am bcd0e58d: am 57e5c0da: am 8a893be3: Merge "Fix failing CTS tests." into lmp-sprout-dev | |
| 4731ca3 am 29d16699: am 353bb25e: am 9d244f6f: am c7c489c0: am 3cb7cae0: am b5d78746: am c5f65324: am c2cef921: Added Clear, View, and Export actions to main list for activity windows without Action Bar feature. | |
| 4d3d1b4 am 234b0d34: am ade4e4c9: am c93827ba: am ebf9b8d3: am 65c4783b: am 784bdd8f: am 16e8e01f: am 9610d4a3: Merge "CamcorderProfile: guard unknown profile qualities" into lmp-sprout-dev | |
| 9d882b3 am 6c9049e9: am cc5f6524: am 1071513a: am 3fb0f92a: am 173e0638: am c45414f6: am 0cd1d99f: am 46d5f094: Merge "CameraITS: allow more time for AE converge" into lmp-sprout-dev | |
| 4c62f14 am 3286de9e: am b8a96531: am 0be47df7: am f802ac07: am 3764dcbf: am 50d6f79f: am af521804: am 168154f1: Merge "Camera2: skip AE compensation test on legacy devices" into lmp-sprout-dev | |
| 1dcf4e9 am 6f3985cc: am c9e91204: am fafcac91: am 3637ac2c: am 1e65d1c4: am 0dd22c5f: am 7c95df2b: am 4c4f07d9: Camera2: add static metadata collection | |
| b3614c6 am 7c939f9f: am 3792a80b: am c1f627d9: am f4e77e40: am d51efae7: am c06afd8c: am e9cf4cb5: am 74b936fb: Fix failing CTS tests. | |
| 40b0782 am 34027b90: am 80d2262f: am 651cdcd9: am 2ce59026: am 02444975: am b6a2c6b1: am 63621263: am 2ae07bfd: Merge "Fixed text-to-speech tests for Android Wear. Wear devices don\'t have TTS yet, partly because they don\'t have audio-out. Once they have FEATURE_AUDIO_OUT, t | |
| 7ab4949 am fb3010a5: am fdb8e4f5: am 13202fe3: am fce25797: am e2502c15: am e028209f: am c2c7420c: am 336efd31: Merge "Fix various Wear media CTS failures." into lmp-sprout-dev | |
| f7a1102 am ea40a793: am 189010b6: am fce976ec: am 6f706a09: am d22fcb61: am df5dc917: am 04b6548f: am 61998484: Merge "CameraITS: fix manual capture request" into lmp-sprout-dev | |
| d749a67 am a91d9e99: am 8eca7769: am 9386a509: am ddb94cff: am 12dda9f3: am e8769ba1: am 7f20f7d6: am 1b16d5ce: Don’t run RingtoneMangerTest tests on devices without audio output. | |
| 15aa6b2 am b5157ecb: am 0f38578d: am 813f4ead: am 51ba66ed: am c36c8e26: am 882ec2e4: am 436acb71: am f9e09d47: Don’t run Ringtone test if the devices without audio output. | |
| 204e2d8 am cf2186a9: am 3657635b: am 4b77bb10: am f73d79d2: am 7487e81b: am 6e757b83: am aa05d868: am 354ff1ba: am c059bc6f: Merge "Update Data Backup description to accommodate more devices." into lmp-dev | |
| 59b540a am 4d777f09: am a04ca5e0: am 8bc14897: am 4d06ce79: am b304f03f: am 4b6f2421: am e442282a: am 2cd838d6: am 47a20d81: resolve merge conflicts of 6c1149d to klp-modular-dev-plus-aosp. automerge: f6f6d69 | |
| 25d0886 am 3b69364d: am b935779a: am 0eeeb74e: am 747c2d67: am 56b9d4e2: am 29abecfc: am 14be49bf: resolved conflicts for merge of 1cad200a to lmp-sprout-dev | |
| 3b69364 am b935779a: am 0eeeb74e: am 747c2d67: am 56b9d4e2: am 29abecfc: am 14be49bf: resolved conflicts for merge of 1cad200a to lmp-sprout-dev | |
| c812e4c am 2905fbbf: am ac6dfb21: am 28d30963: am 623e1fa1: am d0b325e5: am 08764e7f: am 5b92c7de: am bd93e696: am c455860c: Add processes to root WL | |
| 72c7882 am 4de7ac86: am 14a4f45a: am d2f1248a: am 0bbcec7e: am ca03abec: am 5e0965e5: am 9eb379a5: resolved conflicts for merge of 20874173 to lmp-sprout-dev | |
| 15f0135 am 1ebe5116: am 09ac03ea: am 20fc5436: am bfe6c170: am 901247f7: am f9a28b1c: am c4551f02: Merge "CameraITS: only use analog gain for RAW gain test" into lollipop-mr1-cts-dev | |
| 2905fbb am ac6dfb21: am 28d30963: am 623e1fa1: am d0b325e5: am 08764e7f: am 5b92c7de: am bd93e696: am c455860c: Add processes to root WL | |
| 4de7ac8 am 14a4f45a: am d2f1248a: am 0bbcec7e: am ca03abec: am 5e0965e5: am 9eb379a5: resolved conflicts for merge of 20874173 to lmp-sprout-dev | |
| 1ebe511 am 09ac03ea: am 20fc5436: am bfe6c170: am 901247f7: am f9a28b1c: am c4551f02: Merge "CameraITS: only use analog gain for RAW gain test" into lollipop-mr1-cts-dev | |
| c853341 am 1887fa67: am 2f821d7f: am c6ffa642: Merge "DO NOT MERGE EDI: Add collector param to DeviceInfoInstrumentation" into mnc-dev | |
| b264d2a am f758bf38: am 2daea98f: am ca49dee9: Merge "CTS: Create test for DISALLOW_INSTALL_UNKNOWN_SOURCES" into mnc-dev | |
| 6ec06c4 am e77772ec: am 8cd8158c: am 7f250064: am 4625dcfc: am 3209df9c: am 33773b30: am f00c6d17: am 9065626e: am 2914d50c: (-s ours) resolved conflicts for merge of 4992891b to klp-modular-dev | |
| aff18d0 am 36d6e601: am a44fede8: am 756731a8: am f18d4482: (-s ours) am 303dbc4c: am 83a0daa2: am 2cf4b1ad: am 9c2e83ea: Merge "DO NOT MERGE - Add CTS tests for IAudioflinger binder checks." into lmp-dev | |
| 97ca5ee am 9ecc8857: am f0f39d21: am b54aa51c: am 27ec3014: am 0b34de7f: am 674b055c: am 6010f792: am db7a0e7c: am 348363df: Merge "Camera: cross check camera2 features" into lmp-sprout-dev | |
| 510f8c7 am 29e58569: am 1ff9d1be: am b4d24798: am e44267de: am e3f1b8fa: am ca407533: am f18852d1: am 42bd663c: am d04923d0: Merge "Add bluetooth as a supported networking protocol" into lmp-sprout-dev | |
| 43d1ca6 am bcc7239b: am df7deb44: am 4b028e62: am 2c9f86d0: am 3b3a7243: am e31eb133: am 75e48953: am 6c98775c: am 9420130f: Merge "CTS Verifier: hide AID prefix reader test if no support" into lmp-sprout-dev | |
| b6c0695 am 22803708: am 4b66986c: am 54eeed82: am 469f5ce7: am ba2cf31d: am 634b4cc8: am 06b92397: am 2db8b4dc: am bccc13cc: am debc2a5f: resolved conflicts for merge of 6c1149d7 to lmp-dev | |
| 256b356 am a45b6c14: am a9974ad8: am 7f00074a: am ad85b58d: am acbc3ab2: am 70f63608: am 7fba755c: am 5b9ef496: am e3b8ad15: Merge "Gave a CTS telephony test BLUETOOTH permission. In the case where there is no telephony and no wifi, TelephonyManagerTest.testGetDeviceId() uses | |
| 260043c am d2060b71: am 3f574a0e: am ccd6d4d6: am 0a449fe2: am da05f33c: am eb116b72: am 56ce8f8a: am 30bbb8e7: am e93a70a6: Merge "Fix failing TextViewTest#testTextAttr " into lmp-sprout-dev | |
| b0585c9 am fb4c6877: am ef244981: am fd0fe227: am 5090f717: am 0a912c0c: am 6aa5861e: am 09727996: am b7072d7b: am d7e74bd3: Merge "Fix media stress tests." into lmp-sprout-dev | |
| 4d648ec am 43ff4401: am 2198cac8: am cf6873f9: am 51a42c28: am e223afce: am c8a45185: am b8283f8e: am 9f551a4f: am 63587e04: Change drmserver SELinuxDomainTest condition. | |
| c69fcc7 am c6e476bf: am 00b03865: am 8fff63c7: am 2baa7dc6: am 1d1acf1e: am 34fb8119: am 6a987820: am 7e8dcdbc: am 02c7b070: Added screen turn off capabilities to CTS sensor tests when Device Admin feature is not available. | |
| 9460c71 am 4869ce8a: am f6bd081b: am 9f81687f: am 66a7814c: am 925b0fac: am 655a6370: am e7fd914c: am 24b85a50: am e7e6a3ed: Merge "Changed behaviour on main Activity relaunch to finish immediately for clockwork devices to accomodate clockwork\'s exit to the watchface on scre | |
| 3b4f292 am 2ae4113c: am f6e8f172: am 2d0344d5: am a112b61d: am 2c671218: am d78d1364: am eef400a0: am cd458ea5: am db6a3a81: Fix UI for jobscheduler CTS on clockwork | |
| 599d58c am 17216f9b: am a1ece8ee: am d16c3cb8: am c8038197: am 450be2c9: am 685c4085: am 56a1148c: am 2ba2eba0: am b2a1e93b: Merge "Camera: test AE OFF mode only if it is supported" into lmp-sprout-dev | |
| 92e530c am d7ae9f0f: am fff8d2a4: am 480cf38f: am 0ca1a048: am c8450b32: am 6c27a8c1: am e4ed0ffb: am 843584a6: am 0bd09f25: Don’t require the codec for devices without audio output. | |
| 9e9ae72 am 98dc9685: am 0827b57c: am a680d845: am 707d0054: am 47e6e4e5: am 2adc02a7: am e36ea78f: am fdfa912d: am 10a6cebf: Fix MediaCodec tests on devices without codecs. | |
| 676dd43 am bfd52d53: am 72e08205: am 0514aa0c: am 27857361: am f423c764: am e858883c: am 9d033230: am 0ac323d5: am ab5596b1: Fix Signature test | |
| 93cf3a9 am dc8840cb: am 08859a76: am b4b4c2a3: am fba83ade: am b7661ab6: am 6d3ded41: am ca0ea526: am e2d1f179: am 62563bc4: Only run the test if the device has audio output. | |
| 1c7b447 am 58e0a90b: am c5af975a: am eea97b25: am 8052fd88: am 24a5d2ee: am 9732dec2: am 3437864c: am 0ba8304e: am fab65cd6: Don\'t run the test if the codec isn\'t installed. | |
| 9de9456 am e10bd5b7: am 306fa7bd: am e3be45e0: am 89ae5153: am 9f9a16b9: am 534de1f3: am 244e8239: am d44ac350: am ad1d56eb: am b087665b: Clean up ManifestTestListAdapter\'s filterTests loop. | |
| 2311e0d am 653bcd94: am 5a008db2: am f54ffd13: am efdb3946: am 1f7f0d83: am 8e77a43a: am 8aba65bb: am ed3791e1: am 92df3435: Merge "Increase VirtualDisplay test timeout to 40s" into lmp-sprout-dev | |
| a92cb01 am e65eb751: am 978e673f: am 53c099dc: am 6dcb5f96: am dd2c636d: am 326c6eed: am d8419c1c: am 6da37e64: am a93fddda: Merge "Connect to BLE server by BLE scanning. Set default text in edittext." into lmp-sprout-dev | |
| 49d100b am d9f6a5d8: am 99536714: am 5e9d683f: am 35b7baa1: am b4b5e806: am e9fc7e74: am e95ed96d: am 0a0d79ca: am f6ad3a23: Only run the test if the device has audio output. | |
| b1d28e9 am 9d3f3f18: am 71c21a12: am c8c5c0d1: am 6f47369e: am 13bf006e: am 6527dca3: am c5a0ae89: am 12e636c8: am 2fc38042: Merge "Remove encryption test from profile owner provisioning test." into lmp-sprout-dev | |
| 04722fc am ed403dae: am 996b4b63: am e0f20603: am d4bffda0: am c2d53b5d: am e9e72c5d: am 72e5ff84: am cf8433a8: am ca496ada: Merge "Fix CTS testTouchEvent for watches." into lmp-sprout-dev | |
| bedaa5d am f5b3342b: am 40e3c537: am 869003da: am af28ce79: am 38ff09b4: am 7ed5523a: am 9b3cecff: am 1b8b597e: am 8015d070: Merge "cts: add TestLog tags to XML report" into lmp-dev automerge: d350695 | |
| 0cb280e am ebaca981: am c34df8a6: am b1b5a211: am 9de8281c: am 84cc0a71: am af012cb6: am ce4d96b0: am 0347bace: am ffe4fca9: am 2755b55b: Merge "Revert "CTS Verifier: hide AID prefix reader test if no support"" into lmp-dev | |
| 60f568d am b8db141e: am db52b98d: am b10e0741: am 61165d9d: am bede058d: am b9dab069: am b42bd5c0: am db0d1206: am 0edd3a1a: am 66e13fe7: Merge "Bump CTS verifier to 5.0_r1" into lmp-dev | |
| d100a7e am 99196e33: am 457e5dc5: am 8fdd91f8: am 7c9771ae: am a3f90bfd: am b4adbd74: am eaf9cb57: am d6578543: am 94f14975: am ea1931a3: Merge "CTS Verifier: hide AID prefix reader test if no support" into lmp-dev | |
| 3e8730a am 7ab5f40e: am 9bb3293c: am 1d7a36ae: am 18737dd3: am 77b8ae30: am 74c689e4: am 7307cae3: am 991fe385: am 6564e92d: am a6195bc1: Merge "Hide sample test from the test list" into lmp-dev | |
| 016971c am 397c03d6: am cbfa1e39: am a35ac87c: am c494856c: am 27be9964: am 8f4ff878: am 6f55abae: am 02f2a35c: am 964ab318: am c81dee92: Merge "Cts Verifier: clarify item # projection scrolling list test" into lmp-dev | |
| f8ec1ac am a00fac08: am 066b0f2e: am d837d9af: am c914de92: am e6988030: am 2702162b: am 835c3ae1: am 02f86f80: am 206b3b50: am f9976a7b: am fbf3e597: am fa9abbdc: CTS Verifier:Fix timing issue for Ble Client Connect automerge: 4908a30 automerge: 19df51c | |
| 0498013 am 1122a707: am 305ce857: am 08baff5f: am c0c11045: am 7c859bea: am 9352a08d: am 4b9ba3aa: am a5700ce7: am fe666f85: am d550cc18: Merge "Add a test for none-mode filtering." into lmp-dev | |
| 96559c4 am f82ecabd: am 9a6c0b52: am 9512ba50: am b6747aad: am 86aa8316: am 0b1462b3: am 8cfcd499: am 2b4e2a3f: am 6c42b2c7: Merge "Don’t run video tests on devices that do not have audio output." into lmp-sprout-dev | |
| 0527712 am 4a128d56: am 31a7172c: am c7a87763: am f6e8948a: am 2b4aa481: am 76032e91: am 03bc7f9f: am 102265d1: am 690662a3: Merge "Add BODY_SENSORS permissions for testSensorOperation()" into lmp-sprout-dev | |
| fcb37bc am 8bb4671c: am 85fa341c: am ced7deef: am 5dbe7c7d: am 9ca21e34: am d0c3396e: am 32fc2f58: am c9f0751a: am 0146514b: am de16af92: Merge "CTSverifier BLE tests, feature flag added & test disabled" into lmp-dev | |
| 9b58905 am 4b99c8a2: am 2faaa220: am 251ba7c3: Merge "Fix batch scan tests for Bluetooth LE scan." into mnc-dev | |
| d7132f1 am 83be4877: am 88c4c6e0: am 96f04b0b: Merge "Fix for StandardDeviation test." into mnc-dev | |
| 1887fa6 am 2f821d7f: am c6ffa642: Merge "DO NOT MERGE EDI: Add collector param to DeviceInfoInstrumentation" into mnc-dev | |
| f758bf3 am 2daea98f: am ca49dee9: Merge "CTS: Create test for DISALLOW_INSTALL_UNKNOWN_SOURCES" into mnc-dev | |
| e77772e am 8cd8158c: am 7f250064: am 4625dcfc: am 3209df9c: am 33773b30: am f00c6d17: am 9065626e: am 2914d50c: (-s ours) resolved conflicts for merge of 4992891b to klp-modular-dev | |
| 36d6e60 am a44fede8: am 756731a8: am f18d4482: (-s ours) am 303dbc4c: am 83a0daa2: am 2cf4b1ad: am 9c2e83ea: Merge "DO NOT MERGE - Add CTS tests for IAudioflinger binder checks." into lmp-dev | |
| 9ecc885 am f0f39d21: am b54aa51c: am 27ec3014: am 0b34de7f: am 674b055c: am 6010f792: am db7a0e7c: am 348363df: Merge "Camera: cross check camera2 features" into lmp-sprout-dev | |
| 29e5856 am 1ff9d1be: am b4d24798: am e44267de: am e3f1b8fa: am ca407533: am f18852d1: am 42bd663c: am d04923d0: Merge "Add bluetooth as a supported networking protocol" into lmp-sprout-dev | |
| bcc7239 am df7deb44: am 4b028e62: am 2c9f86d0: am 3b3a7243: am e31eb133: am 75e48953: am 6c98775c: am 9420130f: Merge "CTS Verifier: hide AID prefix reader test if no support" into lmp-sprout-dev | |
| 2280370 am 4b66986c: am 54eeed82: am 469f5ce7: am ba2cf31d: am 634b4cc8: am 06b92397: am 2db8b4dc: am bccc13cc: am debc2a5f: resolved conflicts for merge of 6c1149d7 to lmp-dev | |
| a45b6c1 am a9974ad8: am 7f00074a: am ad85b58d: am acbc3ab2: am 70f63608: am 7fba755c: am 5b9ef496: am e3b8ad15: Merge "Gave a CTS telephony test BLUETOOTH permission. In the case where there is no telephony and no wifi, TelephonyManagerTest.testGetDeviceId() uses the BlueToot | |
| d2060b7 am 3f574a0e: am ccd6d4d6: am 0a449fe2: am da05f33c: am eb116b72: am 56ce8f8a: am 30bbb8e7: am e93a70a6: Merge "Fix failing TextViewTest#testTextAttr " into lmp-sprout-dev | |
| fb4c687 am ef244981: am fd0fe227: am 5090f717: am 0a912c0c: am 6aa5861e: am 09727996: am b7072d7b: am d7e74bd3: Merge "Fix media stress tests." into lmp-sprout-dev | |
| 43ff440 am 2198cac8: am cf6873f9: am 51a42c28: am e223afce: am c8a45185: am b8283f8e: am 9f551a4f: am 63587e04: Change drmserver SELinuxDomainTest condition. | |
| c6e476b am 00b03865: am 8fff63c7: am 2baa7dc6: am 1d1acf1e: am 34fb8119: am 6a987820: am 7e8dcdbc: am 02c7b070: Added screen turn off capabilities to CTS sensor tests when Device Admin feature is not available. | |
| 4869ce8 am f6bd081b: am 9f81687f: am 66a7814c: am 925b0fac: am 655a6370: am e7fd914c: am 24b85a50: am e7e6a3ed: Merge "Changed behaviour on main Activity relaunch to finish immediately for clockwork devices to accomodate clockwork\'s exit to the watchface on screen off." into | |
| 2ae4113 am f6e8f172: am 2d0344d5: am a112b61d: am 2c671218: am d78d1364: am eef400a0: am cd458ea5: am db6a3a81: Fix UI for jobscheduler CTS on clockwork | |
| 17216f9 am a1ece8ee: am d16c3cb8: am c8038197: am 450be2c9: am 685c4085: am 56a1148c: am 2ba2eba0: am b2a1e93b: Merge "Camera: test AE OFF mode only if it is supported" into lmp-sprout-dev | |
| d7ae9f0 am fff8d2a4: am 480cf38f: am 0ca1a048: am c8450b32: am 6c27a8c1: am e4ed0ffb: am 843584a6: am 0bd09f25: Don’t require the codec for devices without audio output. | |
| 98dc968 am 0827b57c: am a680d845: am 707d0054: am 47e6e4e5: am 2adc02a7: am e36ea78f: am fdfa912d: am 10a6cebf: Fix MediaCodec tests on devices without codecs. | |
| bfd52d5 am 72e08205: am 0514aa0c: am 27857361: am f423c764: am e858883c: am 9d033230: am 0ac323d5: am ab5596b1: Fix Signature test | |
| dc8840c am 08859a76: am b4b4c2a3: am fba83ade: am b7661ab6: am 6d3ded41: am ca0ea526: am e2d1f179: am 62563bc4: Only run the test if the device has audio output. | |
| 58e0a90 am c5af975a: am eea97b25: am 8052fd88: am 24a5d2ee: am 9732dec2: am 3437864c: am 0ba8304e: am fab65cd6: Don\'t run the test if the codec isn\'t installed. | |
| e10bd5b am 306fa7bd: am e3be45e0: am 89ae5153: am 9f9a16b9: am 534de1f3: am 244e8239: am d44ac350: am ad1d56eb: am b087665b: Clean up ManifestTestListAdapter\'s filterTests loop. | |
| 653bcd9 am 5a008db2: am f54ffd13: am efdb3946: am 1f7f0d83: am 8e77a43a: am 8aba65bb: am ed3791e1: am 92df3435: Merge "Increase VirtualDisplay test timeout to 40s" into lmp-sprout-dev | |
| e65eb75 am 978e673f: am 53c099dc: am 6dcb5f96: am dd2c636d: am 326c6eed: am d8419c1c: am 6da37e64: am a93fddda: Merge "Connect to BLE server by BLE scanning. Set default text in edittext." into lmp-sprout-dev | |
| d9f6a5d am 99536714: am 5e9d683f: am 35b7baa1: am b4b5e806: am e9fc7e74: am e95ed96d: am 0a0d79ca: am f6ad3a23: Only run the test if the device has audio output. | |
| 9d3f3f1 am 71c21a12: am c8c5c0d1: am 6f47369e: am 13bf006e: am 6527dca3: am c5a0ae89: am 12e636c8: am 2fc38042: Merge "Remove encryption test from profile owner provisioning test." into lmp-sprout-dev | |
| ed403da am 996b4b63: am e0f20603: am d4bffda0: am c2d53b5d: am e9e72c5d: am 72e5ff84: am cf8433a8: am ca496ada: Merge "Fix CTS testTouchEvent for watches." into lmp-sprout-dev | |
| f5b3342 am 40e3c537: am 869003da: am af28ce79: am 38ff09b4: am 7ed5523a: am 9b3cecff: am 1b8b597e: am 8015d070: Merge "cts: add TestLog tags to XML report" into lmp-dev automerge: d350695 | |
| ebaca98 am c34df8a6: am b1b5a211: am 9de8281c: am 84cc0a71: am af012cb6: am ce4d96b0: am 0347bace: am ffe4fca9: am 2755b55b: Merge "Revert "CTS Verifier: hide AID prefix reader test if no support"" into lmp-dev | |
| b8db141 am db52b98d: am b10e0741: am 61165d9d: am bede058d: am b9dab069: am b42bd5c0: am db0d1206: am 0edd3a1a: am 66e13fe7: Merge "Bump CTS verifier to 5.0_r1" into lmp-dev | |
| 99196e3 am 457e5dc5: am 8fdd91f8: am 7c9771ae: am a3f90bfd: am b4adbd74: am eaf9cb57: am d6578543: am 94f14975: am ea1931a3: Merge "CTS Verifier: hide AID prefix reader test if no support" into lmp-dev | |
| 7ab5f40 am 9bb3293c: am 1d7a36ae: am 18737dd3: am 77b8ae30: am 74c689e4: am 7307cae3: am 991fe385: am 6564e92d: am a6195bc1: Merge "Hide sample test from the test list" into lmp-dev | |
| 397c03d am cbfa1e39: am a35ac87c: am c494856c: am 27be9964: am 8f4ff878: am 6f55abae: am 02f2a35c: am 964ab318: am c81dee92: Merge "Cts Verifier: clarify item # projection scrolling list test" into lmp-dev | |
| a00fac0 am 066b0f2e: am d837d9af: am c914de92: am e6988030: am 2702162b: am 835c3ae1: am 02f86f80: am 206b3b50: am f9976a7b: am fbf3e597: am fa9abbdc: CTS Verifier:Fix timing issue for Ble Client Connect automerge: 4908a30 automerge: 19df51c | |
| 1122a70 am 305ce857: am 08baff5f: am c0c11045: am 7c859bea: am 9352a08d: am 4b9ba3aa: am a5700ce7: am fe666f85: am d550cc18: Merge "Add a test for none-mode filtering." into lmp-dev | |
| f82ecab am 9a6c0b52: am 9512ba50: am b6747aad: am 86aa8316: am 0b1462b3: am 8cfcd499: am 2b4e2a3f: am 6c42b2c7: Merge "Don’t run video tests on devices that do not have audio output." into lmp-sprout-dev | |
| 4a128d5 am 31a7172c: am c7a87763: am f6e8948a: am 2b4aa481: am 76032e91: am 03bc7f9f: am 102265d1: am 690662a3: Merge "Add BODY_SENSORS permissions for testSensorOperation()" into lmp-sprout-dev | |
| 8bb4671 am 85fa341c: am ced7deef: am 5dbe7c7d: am 9ca21e34: am d0c3396e: am 32fc2f58: am c9f0751a: am 0146514b: am de16af92: Merge "CTSverifier BLE tests, feature flag added & test disabled" into lmp-dev | |
| 4b99c8a am 2faaa220: am 251ba7c3: Merge "Fix batch scan tests for Bluetooth LE scan." into mnc-dev | |
| 83be487 am 88c4c6e0: am 96f04b0b: Merge "Fix for StandardDeviation test." into mnc-dev | |
| a3d9d5f am 7c7fb03f: am 56317010: am 7ce4c33e: Merge "Camera: make sure preview won\'t slow down video" into mnc-dev | |
| 22c0ae4 am 55d594dc: am 0035459f: am 92311e8d: Merge "Camera: allow torch ramping up and down" into mnc-dev | |
| 0ead706 am 8cd72fa8: am be8bf4b7: am 4ddc2a81: Merge "Don\'t execute CTS tests without FEATURE_CONNECTION_SERVICE" into mnc-dev | |
| 8f814a4 am 5462cc3d: am 39a1f600: am 28268a57: Merge "Update permissions tests for legacy ConnectivityManager APIs." into mnc-dev | |
| 7c7fb03 am 56317010: am 7ce4c33e: Merge "Camera: make sure preview won\'t slow down video" into mnc-dev | |
| 55d594d am 0035459f: am 92311e8d: Merge "Camera: allow torch ramping up and down" into mnc-dev | |
| 8cd72fa am be8bf4b7: am 4ddc2a81: Merge "Don\'t execute CTS tests without FEATURE_CONNECTION_SERVICE" into mnc-dev | |
| 5462cc3 am 39a1f600: am 28268a57: Merge "Update permissions tests for legacy ConnectivityManager APIs." into mnc-dev | |
| c6823f5 am 46336e42: am 28d2127f: am 0009e20d: Merge "EDI: Add PackageDeviceInfo collector to cts/common" into mnc-dev | |
| 46336e4 am 28d2127f: am 0009e20d: Merge "EDI: Add PackageDeviceInfo collector to cts/common" into mnc-dev | |
| 72eab5e am 44924eb0: am 106510a0: am 0c0c7593: Merge "Test: Clean up CTS test plans" into mnc-dev | |
| 44924eb am 106510a0: am 0c0c7593: Merge "Test: Clean up CTS test plans" into mnc-dev | |
| 811c811 am 8d1f5dd6: am b6993861: am e1e08895: Merge "CtsVerifier: Add an intent in IntentFiltersTestHelper." into mnc-dev | |
| 8d1f5dd am b6993861: am e1e08895: Merge "CtsVerifier: Add an intent in IntentFiltersTestHelper." into mnc-dev | |
| c31c434 am 98f06b2d: am a893e5e5: am 225d022f: Merge "[CtsVerifier] Added account auto-sync settings check to current BYOD scenario" into mnc-dev | |
| 98f06b2 am a893e5e5: am 225d022f: Merge "[CtsVerifier] Added account auto-sync settings check to current BYOD scenario" into mnc-dev | |
| 8257a59 am ad65e2a1: am 99df32df: am 0deefad8: Merge "Ask user to set CtsVerifier as active admin for KeyguardDisabledFeatures test" into mnc-dev | |
| 795e493 am 05374389: am 8044c5ea: am eb4c45df: Merge "Move delegated cert installer to DeviceAndProfileOwner tests" into mnc-dev | |
| ad65e2a am 99df32df: am 0deefad8: Merge "Ask user to set CtsVerifier as active admin for KeyguardDisabledFeatures test" into mnc-dev | |
| 0537438 am 8044c5ea: am eb4c45df: Merge "Move delegated cert installer to DeviceAndProfileOwner tests" into mnc-dev | |
| 8e803e5 am ec387319: am 06ac0148: am ca22dd4d: Merge "Increase timeout for testOwnerChangedBroadcast." into mnc-dev | |
| 6c62e5b am 3b533edf: am 41184570: am 1e0a65a6: Merge "In CtsVerifier, update the list of intents that need to be forwarded." into mnc-dev | |
| e6c8e0b am ffd92058: am e6910876: am 43fefd33: Merge "In CtsVerifier, grant the camera permission to self for image/video capture." into mnc-dev | |
| ec38731 am 06ac0148: am ca22dd4d: Merge "Increase timeout for testOwnerChangedBroadcast." into mnc-dev | |
| 3b533ed am 41184570: am 1e0a65a6: Merge "In CtsVerifier, update the list of intents that need to be forwarded." into mnc-dev | |
| ffd9205 am e6910876: am 43fefd33: Merge "In CtsVerifier, grant the camera permission to self for image/video capture." into mnc-dev | |
| b9f88bb am e93533ee: am b86a8381: Merge "Add ConnectivityConstraintTest to known failures" into mnc-dr-dev | |
| e93533e am b86a8381: Merge "Add ConnectivityConstraintTest to known failures" into mnc-dr-dev | |
| 0d3d9bf am 2c567cd6: am b4768104: am eb005a19: Merge "CTS: Dismiss error dialog after running DeviceAndProfileOwnerTest.testAccountManagement" into mnc-dev | |
| 2c567cd am b4768104: am eb005a19: Merge "CTS: Dismiss error dialog after running DeviceAndProfileOwnerTest.testAccountManagement" into mnc-dev | |
| b009c27 am 02ba8bf7: am d9c1aa0b: am a493eadb: Merge "Test for playback position at end of playback" into mnc-dev | |
| 02ba8bf am d9c1aa0b: am a493eadb: Merge "Test for playback position at end of playback" into mnc-dev | |
| 9d4a20b am e956a13e: (-s ours) am 46b72050: (-s ours) am 13f4ad1e: (-s ours) am 18433df2: (-s ours) am 36491811: (-s ours) am 980e787b: (-s ours) DO NOT MERGE ANYWHERE: bumping cts to 5.1r3 | |
| e956a13 am 46b72050: (-s ours) am 13f4ad1e: (-s ours) am 18433df2: (-s ours) am 36491811: (-s ours) am 980e787b: (-s ours) DO NOT MERGE ANYWHERE: bumping cts to 5.1r3 | |
| 393e2b2 am d095dda7: am 33b01aa0: am 9c085891: am bcefc92a: am dae3244b: am d46ad206: am 0b55e179: am 297b9d51: am 0c4dcb93: (-s ours) Merge "Added required features to location mode tests." into lmp-sprout-dev | |
| d095dda am 33b01aa0: am 9c085891: am bcefc92a: am dae3244b: am d46ad206: am 0b55e179: am 297b9d51: am 0c4dcb93: (-s ours) Merge "Added required features to location mode tests." into lmp-sprout-dev | |
| 8fca998 am 76163bfc: am 2b09f740: am 3eb9b6ad: Merge "[Sensors-hifi] Allow for slack in sensor range/frequenies." into mnc-dev | |
| 76163bf am 2b09f740: am 3eb9b6ad: Merge "[Sensors-hifi] Allow for slack in sensor range/frequenies." into mnc-dev | |
| 4d59615 am 9f00ea98: am 9cba0bc5: am c3c010fd: Merge "Don\'t run notification accessibility test on TVs-no nav bar" into mnc-dev | |
| 9f00ea9 am 9cba0bc5: am c3c010fd: Merge "Don\'t run notification accessibility test on TVs-no nav bar" into mnc-dev | |
| a7b86c2 am 06dff173: am 4a65273e: am 9c54ba98: CTS: verify that disabled manifest receivers don\'t get broadcasts | |
| 06dff17 am 4a65273e: am 9c54ba98: CTS: verify that disabled manifest receivers don\'t get broadcasts | |
| 1afd377 am c504809d: (-s ours) am 8174bc0c: (-s ours) am 7273bd72: (-s ours) am 6216c4ac: (-s ours) am a9f1a9f9: (-s ours) am 705405df: (-s ours) am a3d541b5: (-s ours) Merge "DO NOT MERGE ANYWHERE: bumping cts to 5.1r3" into lollipop-mr1-cts-dev | |
| 75225c2 am c993358d: am cd51c60a: am 413f951d: am e5de9542: (-s ours) am 9b0ac51e: am e05affb3: am 55cd1889: (-s ours) Merge "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch" into lollipop-mr1-cts-dev | |
| c504809 am 8174bc0c: (-s ours) am 7273bd72: (-s ours) am 6216c4ac: (-s ours) am a9f1a9f9: (-s ours) am 705405df: (-s ours) am a3d541b5: (-s ours) Merge "DO NOT MERGE ANYWHERE: bumping cts to 5.1r3" into lollipop-mr1-cts-dev | |
| c993358 am cd51c60a: am 413f951d: am e5de9542: (-s ours) am 9b0ac51e: am e05affb3: am 55cd1889: (-s ours) Merge "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch" into lollipop-mr1-cts-dev | |
| ba87542 am 6a9ea8f6: am 92575841: am 1c78e38a: am 1ba6b32d: am b21cdbb4: am 011d6864: am 86eb96aa: am 42621bb3: am 0cfa8c5d: fix VoldExploitTest | |
| 8dcae66 am 3f274ed2: am 062f0275: am 18c68de3: am 05885380: am 3a78cc7f: am 728084c0: am 0a607ed0: am b8da6b0c: am 832c4d1a: am 09d44e75: Merge "Add Features expected in Lolliop and Kitkat Watch platform versions" into lmp-dev | |
| c57b419 am f77abf85: am 2ddd57c7: am d44d4843: am 0bbc36de: am cc44bcbe: am 836278e8: am d9e15c03: am b0b7d201: am cddda826: am 1de20194: am 4908a30c: am fbf3e597: am fa9abbdc: CTS Verifier:Fix timing issue for Ble Client Connect | |
| 14edc72 am 668bd3b5: am 86317f5d: am bd342865: am fc9771e3: am 39bf1b3c: am 91c16821: am f7f4e132: am b6e0c763: am d4a4e2d5: Merge "Fixed crash in BT tests due to window feature request for progress bar (causes crash in clockwork)." into lmp-sprout-dev | |
| 0ab952c am a3d31eaa: am 0e6859c5: am 62cd8541: am 5bd6cecf: (-s ours) am aaa8651a: am f9189504: am 3dd22c18: am fdad6f95: am c2c631d5: (-s ours) am 183c3e3e: DO NOT MERGE Bump CTS versions from 4.4W_r3 to 4.4W_r4. automerge: 317c2bc -s ours automerge: 448c193 -s ours | |
| 43fef43 am 1d184b59: am be968072: am a8b44727: am 9899bcd1: am 00eed675: am dd885deb: am a937b8b7: am 5234447e: am 698ed9fc: am f83cd572: am df60b42f: am 5387a8af: am 88aacb78: am 7bd1fb2e: am 24d39459: am 9a0d27b9: am b812960d: am 4b3c7eaf: am 6861e8d6: am 9b9de51d: am 6a1c1 | |
| e1f17c0 am fcacfacf: am 7aeea2c8: am 04732414: am f18fef54: am d74f6829: am e584d754: am da877284: am 8f3da761: am c6f12c17: am 9f283bc0: am c4218db6: am ff1da43f: am 91421141: Merge "media: use proper input timestamp in VideoEncoderDecoderTest" into klp-dev automerge: 8c8f1c | |
| 4096a20 am 931b77e9: am 852e126e: am 13e50c3b: am 52814c73: am cf018d15: am f1b41f67: am 8907d45b: am 0e15adff: am 88358fbd: Merge "CameraITS: fix data copy array out of bound issue" into lmp-sprout-dev | |
| 60a31b7 am 1aaf10a9: am da5b4746: am 6b343ef7: am 72164730: am aa004eb8: am fd5f5dad: am be59bc6b: am 9a7e5a13: am e355cd45: am 890c081b: Merge "Bump CTS tradefed version to 5.0_r1" into lmp-dev | |
| 9f75ca0 am 3615edf0: am 9d7102fe: am c8cf29b8: am 599f90a6: am adc2957b: am 18d1cfcf: am e2f465c1: am 529833ce: am d62964ad: am a58b1dcf: Merge "Revert "Don\'t assert that devices have fil-PH translations."" into lmp-dev | |
| 7a86316 am 225cac1d: am 47d1085c: am f9a85235: am 28017c85: am 9d4a284f: am 9412fd26: am 0e824613: am 44aa306d: am f162ed19: (-s ours) Merge "Excluded irrelevant tests from clockwork devices." into lmp-sprout-dev | |
| 358d15c am 2876a32f: am 10f1b5a5: am 6d7f2aa9: am 2e832e30: am 84be9276: am b106a6a2: am 90546c27: am 90e20b4e: am af5381aa: am d3f2dc05: Build and install the list of preqreqs by ABI. | |
| c2ab7d5 am 87b519a1: am bc0027b4: am 77887d5b: am 53fc8a06: am ddafba02: am d01629ee: am b4ca06ac: am 68b09a86: am 19d769fe: am 7fc42cd2: Add DEQP3.0 tests to the sub-plans | |
| ff9be98 am cc1d8ec5: am 273f8a0e: am e509fc53: am e12ea6f8: am cfd74283: am 887083e6: am c06a2af9: am 9c35276d: am 486cd7aa: am 27dfbc1e: Merge "Camera2: relax the sensitivity range max required value" into lmp-dev | |
| 8031e2f am b206018a: am e2ef8351: am 640797d7: am 148c4cf5: am 30c3bf65: am f333f6a5: am e0e067ed: am feb75d1d: am b793f54d: am c2413d0e: Add tests for UsageStats API to knownfailures. | |
| b4852f7 am 067a79fa: am c5abaf8c: am 0f6cc37c: am 521125ab: am 4e8cb4a5: am a68e6224: am 6796c628: am 722415cf: am 6ab502d7: am 35898757: Triage android.Jobscheduler tests | |
| b42d32b am eb6446e4: am ad21dc05: am 3f5d568c: am 2b9ac1f2: am e8f0af6e: am 59c23e41: am 8c1b0649: am 81d03b50: am fe5e4f8e: am c176cac4: ABI Related bug fixes | |
| cdf7a2a am c7c1ec03: am fbb4a05b: am a0a06476: am d08f5bdf: am 1e4905a1: am 3148e42d: am 2e90283f: am 18fa1008: am fa2fddd6: am cd14265f: Merge "Disable notification tests on watches and TVs." into lmp-dev | |
| f08c9e8 am 05389eab: am ec1513a4: am 527799ab: am 85cd2a6f: am 2a0850ee: am dda2b038: am 7c5755aa: am 6853dbd5: am f37df93e: Merge "Added toast to long press on pass/info/fail buttons." into lmp-sprout-dev | |
| 4c18e47 am d858d438: am e3468c51: am d7034129: am b7de49bc: am 9d7a9bec: am 0abba1e8: am bf2fbf0a: am c695cc5c: am 1762e913: am fdc3a7f8: Set the max number of allowed errs to be 3. (fix bug in fugu) | |
| 7ef0fa3 am 4fd696f1: am f4786001: am 69284f40: am c40102fd: am 63e5232d: am 0b81ee5e: am 2f76fdfb: am 19ac83e6: am 6221b84c: am 63310ee0: Auto-pass when device does not support multi-advertising. | |
| 98c40e3 am 3f33889d: am a647ef91: am 2fdf8eac: am ed21eb2b: am f574f749: am 77f21819: am 7d296459: am c5a1c05b: am c3c90e1e: am 848d1740: Merge "CtsVerifier: fix orientations in camera tests" into lmp-dev | |
| ff491fa am 9fcd8b68: am 399fb914: am 2d57436a: am f1569cf9: am 9e6a9708: am 969072a8: am 2a63d49c: am 71101a5d: am 5888cdf8: am 244633ce: Don\'t assert that devices have fil-PH translations. | |
| d6dc4c3 am 1ff29890: am cd93e9ac: am 44be7069: am 8cbbeaec: (-s ours) am 5e7573f4: am cf5d20dc: am 765ad262: am f60afc4e: am 2c5747aa: (-s ours) am b4a0c47c: Merge "Port CtsVerifier to API 21 Notification Listener API. DO NOT MERGE." into lmp-dev | |
| 5f3a728 am b87c6845: am 35c444dd: am a7320590: am 0a1a08c3: am cdb2a03b: am 10fae1c5: am cc19c016: am 179f3194: am d075e273: Merge "CameraITS: Move report_result out of the ItsSession class." into lmp-sprout-dev | |
| 197c9bd am 37429010: am ce09031b: am aa2ad282: am b0c5c901: am 16622331: am e2882510: am 4a4f1380: am 5d9bc5bc: am e760ba69: CameraITS: enable several new tests | |
| 422d9aa am 68a23a7b: am a0638255: am e65508a7: am 69b28cc0: am a3cf0535: am c8b47601: am 73448652: resolved conflicts for merge of 2a2716ca to lmp-sprout-dev | |
| 478e9cc am ea3b70a6: am 7e4017ef: am b238c179: am 3b5483a6: am 32f80ee4: am 9385bd21: am 1d73c2a2: am 13696a6e: am dc2adeb5: Merge "Commented out these tests in initial L release due to stability and user friendliness. Goal is to release in L-MR1: Sensor Power Step Counter a | |
| 063661d am a838ec15: am a96e7677: am b4ae6dfc: am c7fba456: am 52d624bf: am 340c23b9: am b63967c5: am 02a1c581: am 5cebdd0d: CameraITS: Updated docs; moved README text into PDF with figures | |
| c867647 am ed96bb24: am 5e502b28: am 85c9d39f: am 9fbdddcc: am cf1a5ddd: am 22d65f65: am 79b82989: am 07ac4928: am 682faa20: CameraITS: fix typos | |
| c2430e3 am 2f7486ec: am 568c8bda: am e66497b9: am 3f6d8f7a: am e027931a: am 0dee7a0b: am f800b3f3: am 54d8e612: am 34fa85dc: CameraITS: gate tests that need per frame control | |
| 6755c89 am 88aff850: am ed275c3f: am b6651921: am 3ec2a81c: am 1f139f06: am 8c2ec4d0: am 263638ed: am edd175f5: am 82739113: CameraITS: properly gate the flash mode test | |
| d2bb3fc am 56edeb4c: am 34705e9b: am 00af8970: am b3d894d2: am 019987ec: am 0394f376: am ef9e63be: am d73c8380: am bad96caf: CameraITS: report skipped tests | |
| ab3ee70 am 1472483e: am 0f5d6379: am 9b7fd0b4: am 58d614e2: am 890815be: am 594ec784: am b2475bd9: am d8d43269: am 8b10253e: am 4be0b988: Merge "CameraCTS: relax previewFps test constraint" into lmp-dev | |
| 1ba95f1 am 1e799b51: am b7babb22: am 1fc4c85d: am 7b3857da: am f399762e: am c1595056: am e4660162: am 97e27342: am 9ec14419: am 0c2046fd: Merge "[CtsVerifier] Make sure to set camera parameters before measuring FOV." into lmp-dev | |
| 6351c17 am a5c08f75: am e2b1a093: am bcfd30b8: am b956bf3f: am c26b0f40: am 71fb0d14: am 10b1e9c7: am 2c84af73: am f597ad74: am ccd56ec0: Remove temporary sub-plan CTS-ART | |
| 4ddadf0 am 5b37212f: am 502da888: am ab805b55: am d26f545f: am ab75be7a: am 146930e0: am d0e48f68: am adb92ff5: am 2cd469db: am 255ca5b2: Merge "Remove enableNetwork(netId, disableOthers) check from CTS" into lmp-dev | |
| bc1d6c5 am 6c9a543d: am f3b37b5e: am baecd9cc: am fda1c721: am a13ed0a8: am dd10349a: am 5f2efaea: am 0df5c6da: am 5047f2aa: am 161f55f2: Merge "Relax NsdManagerTest\'s duplicate event check" into lmp-dev | |
| 09235f7 am 42cdb192: am a5c96595: am f37e53ba: am 4a66334f: am 041c2905: am c26eda4e: am 9193d17a: am 171dd0cc: am de8699d7: am 393dcad3: Merge "Fix NoExecutePermissionTest" into lmp-dev | |
| c10fb0f am 1fd1ed06: am 049e91ff: am 4153be47: am 060c17bc: am c9351a79: am 488cc924: am 7c8375a0: am 4a650205: am 35aaebdd: am e350522c: Merge "increase wait timeout and reduce dequeue buffer time-out" into lmp-dev | |
| 5a14d90 am 38fd94f3: am be195996: am e8819c70: am cc1adb43: (-s ours) am 47f09241: am 382fde05: am 06c0fe92: am c90c3cff: am 80a4fd70: (-s ours) am 56fc619d: Merge "DO NOT MERGE remove appwidget tests from lmp-dev" into lmp-dev | |
| 71b1847 am 11860a63: am dd8e262b: am 7e677edf: am fc8e4fef: am a538f449: am 71335ae4: am 18a4562e: am e123b035: am 3b63f297: am 75dadf36: Merge "Use correct printf format specifier" into lmp-dev | |
| 1794a0e am f429c5d4: am 372a76a1: am c4d9590b: am 4c1b737e: am cc619856: am 7f3fea35: am 8ae53fc6: am ac113026: am ad8ceb2b: am b5738379: Merge "Change the verification step from bit-wise comparison to whole-number-wise, especially for floating point data." into lmp-dev | |
| beef9bf am 551caccb: am 3f881623: am 7da70866: am 9aa3c007: am bd9d3a20: am b16b4703: am 09a7dde5: am 236f0b3b: am 45a32912: Merge "camera2: Fix makefile for ITS in CTS build (take 2)." into lmp-sprout-dev | |
| 094b517 am faceed8c: am 4f3c5ed3: am 04363eb8: am f6f2d695: am 286f6a06: am a32a9dc7: am 424485c6: am 85bc027f: am 1550005c: Merge "CameraITS: Allocate more buffers for ITS" into lmp-sprout-dev | |
| 1b8c66f am fb1d3da3: am 21d4066c: am 077deb36: am 44246af0: am 8f613691: am d8a20539: am 5ee8c147: am d28001ce: am ab31d6de: Merge "CameraITS: adjust yuv plus raw tests settings" into lmp-sprout-dev | |
| 106e433 am 48072613: am b4ff3253: am 66672cd7: am 84f808f0: am 62a19adc: am eef6b6a9: am 01687b9b: am 4fea65ef: am 5c37dce4: am c189d58d: Add redundant com.android.org.conscrypt tests to knownfailures | |
| 8e934dc am bcdf74eb: am 7c0fe44a: am 5dc4081d: am a5b247a2: am 55a1b817: am 3689276a: am f0b3bfaf: am 98bfc885: am cf0b7336: am 99d4b05e: Merge "Add a required feature to Projection/Presentation tests and exclude tests not meant for Leanback where test_required_features canno | |
| 1325e6b am 4431e76e: am c6fd8700: am f138df42: am cdced1b8: am fcf09f54: am ba0fadec: am 671be890: am aec51b8a: am 90c66505: am ab4d7190: Merge "skip audio effect tests when not applicable" into lmp-dev | |
| e57a782 am 0637dfdd: am bea810a6: am 77be514c: am 51f55892: am fce27816: am 3f80b47f: am b61692a3: am 83ffce47: am 1671edc5: am bc474ea7: Merge "Remove SignatureTest from known failures now that it passes." into lmp-dev | |
| 7132ba8 am 796171e7: am 204b2177: am 1f03871b: am c101ab82: am 702c146e: am 66c7d38a: am 956ab7d0: am 66b0d114: am 4a14851d: am e70c199c: Merge "Remove GlVboPerfTest tests from known failures." into lmp-dev | |
| aaa6b04 am feb0e4b8: am 8130cdca: am 3f51d2c0: am 9ea35f8e: am 5ea94d3b: am 6a55ec4e: am a7967ebe: am 513c0e8e: am 8266a5d4: am 04821b1f: media: update MediaCodecList test to use new API | |
| d1eb0d6 am 62cbf207: am e0939b09: am be8d3620: am 66a6e1f6: am dabfcc2d: am 74adc203: am 5f791c0a: am cfee52a3: am 4764bfaf: Merge "CameraITS: require ITS to pass on all cameras" into lmp-sprout-dev | |
| c2e3d70 am 495d32ac: am 0368674d: am 3b5d87e9: am fea5e868: am 233990f7: am 940048ab: am e2fcbef6: am f81251a3: am f11ad595: am c6aa3f3d: Minor cleanup to sig test. | |
| 0c1af1b am ff2857bc: am 9a6b2d94: am b2023977: am aacb10ba: am 11bbe75d: am 2cffd12b: am f25e5690: am ee6ad1d2: am 4d777350: am 206fb102: Merge "Fix CTS Signature test." into lmp-dev | |
| 029e6a8 am e5c92f09: am 95dcb019: am e1113ce3: am 14342b1d: am 0aa8241b: am a41177bf: am e614259f: am 1503fa0f: am 8b7991a1: am bc4f1bd4: Merge "Clean up visualizer in case of failure" into lmp-dev | |
| b71f614 am 9ac5e5b0: am cdac56ea: am 586b450e: am b886c645: am 9c510ccb: am 2c1415b4: am f58ad4c1: am 75324a99: am 98fc9d50: am 421e3330: Merge "Force all densities required for SplitTests." into lmp-dev | |
| f5850d0 am dc9d67bf: am 6eaf91f9: am c9344d00: am 4ad3c083: am 568e43f7: am 847a6b5e: am ec4a4c51: am 1f3d1a71: am b58aef0e: Enable sharding automerge: d54eb34 | |
| 144daad am 4aae210b: am d808fe8f: am d44c08ea: am 017c45ba: am 10899a5f: am 5e5ca495: am 6d38f4c4: am 7098d07e: am bd62af21: am 5b557e4e: Merge "Move android.view tests to the media bucket, as it requires a screen" into lmp-dev | |
| 7e103da am 22deb4ca: am 8fea3fd1: am 353a3a30: am ee5e79f3: am 5199d3ab: am f3761db6: am 3ba76c9c: am 14e47368: am bca94f34: am 4db541f3: Revert "Move android.view tests to the medium bucket, as it requires a screen" | |
| 75cc358 am 4ee6efd0: am 2e725902: am 8831e6e7: am 46666add: am 063d24b0: am 1b80334f: am 807b9108: am 068d6bf4: am 371ea933: am fa179d0d: Move android.view tests to the medium bucket, as it requires a screen | |
| aa97474 am 43aab609: am 9dad1abd: am 035b4c1e: am 51b5865b: am 1c771a16: am 5edd5ad6: am ee3f6217: am ab0b8340: am 5175847e: am f0779c01: Merge "Update android.host.theme reference images for 400dpi device" into lmp-dev | |
| eb3f3ae am f193d154: am cdb001fa: am a4297325: am cdfdd776: am f2dc446d: am eb053ff9: am e0a27408: am 9cdfaec6: am 1a7e7918: am 30ac46ec: Merge "MediaCodecTest: don\'t assume encoder can use input buffers" into lmp-dev | |
| e65e433 am 6156336a: am 8fb738aa: am 3379123c: am 1b78baa8: am 12773b50: am d23ef59e: am e36ee0e1: am 75c3a8e4: am 0763a371: am 63f67570: Merge "Wait a bit longer for DocumentsUI backends." into lmp-dev | |
| 3ff54f6 am 9b61f371: am 393bfde3: am 72a90875: am 9369e180: am 2b75a35c: am c5c319e1: am e5a0ce26: am 4129e17b: am 83524b0a: am 070f0e05: Merge "Add CTS test for Roboto fonts" into lmp-dev | |
| fcc6c37 am f86c7e81: am 90a7448e: am 351490ed: am be9478bd: am a0a12fbb: am a3f88f73: am 03c38ac8: am 55df6c94: am f23d7ff2: am bee2ddef: Merge "Fix BuildTest." into lmp-dev | |
| 75f9214 am 019aea9e: am 39717259: am a33ba164: am ebb4e518: am 43f80634: am 98d6012d: am 1894b84a: am 7b3821a5: am 379b9dcf: am b41400ac: Fix broken PTS result collection. | |
| fd83b1b am 37ef9c8f: am 9140cd44: am 95727a91: am 2dbc3b84: am 44f0d3d4: am fbf483a1: am c92f39e0: am dfebb893: am 3c37dba1: am 234dce9c: Compile CtsVerifier for both bitness (using MULTILIB) | |
| 8403787 am ce555b09: am 27c8c01c: am b7510d51: am e2408051: am 70736205: am b05da4af: am 6b02c6f0: am ddca5b70: am 4903fa9f: am 1d82a8f5: Merge "Fix LocationManagerTest#testGpsStatusListener test failure on fugu/molly/MTK boards." into lmp-dev | |
| 96d369b am 5682a25b: am 4be1107c: am 19e73380: am 1fa662f1: am 4bc3c04f: am 413bb326: am 9fa98ec5: am 8759a70a: am 2b375543: Merge "camera2: Fix makefile for ITS in CTS build." into lmp-sprout-dev | |
| 4c49276 am 7c23a2c3: am b73ec5bd: am e33de576: am 3b10911a: am cf78ead1: am 00ad085e: am 739375d1: am 02eaedbe: am edcfe23a: Merge changes Ib687cb8d,Iaa97a529 into lmp-sprout-dev | |
| 64a3fcd am 916844a3: am 26b01651: am 26a6e2da: am 875a5ecb: am 224240a5: am cb368377: am 6f60bfda: am 0f279346: am a0a3f3f6: am 208e9088: Merge "Run Virtualizer test only when effect is available" into lmp-dev | |
| c1dcfb9 am 8f19e97b: am f965b498: am 70a43420: am dd53d397: am 07a24546: am e44b14c6: am d6b35e6c: am f7d7c4a5: am 7eddc21b: Merge "CameraITS: check the reported crop region" into lmp-sprout-dev | |
| c305d0e am 8231cb48: am e62569dc: am ef5abe25: am c57290e9: am 70261fcf: am 980b7c84: am d227a017: am d18455f3: am 626b0539: am c3dedb24: Camera2: relax video snapshot error threshold | |
| 2f8b609 am 41677f2d: am 8279250d: am ed36f858: am a5539472: am c0c38b6a: am 9e43c41a: am bfffeace: am 94ec7b7d: am 1ed802f1: am 9fbbeb5a: Merge "Add support to disable \'Ambient Display\' in sensor tests. b/18033539" into lmp-dev | |
| f1037cb am 158de1c2: am 1f7b3f40: am 4bc873b4: am 21d2a462: am f033715c: am be555553: am a359bb5a: am 9e8a6983: am bca2330c: am bc50dff8: Merge "SELinuxDomainTest: fix flakiness in tests" into lmp-dev | |
| f857173 am 8257c07a: am 3304875c: am 6638e6ca: am 342c8d8f: am 9896a75e: am e82f85ed: am f510d6b4: am a1298328: am 854042c5: am 8e5bd029: Triage CTS plans | |
| f4f889a am af6c1037: am e3e1a993: am 91b897de: am d8a478fa: am 73e2fc87: am 4a5155a6: am a0bda4ef: am 0731572e: am 86f4f1e0: am 67b13f60: Modify test \'android.usage\' CTS package name to \'android.app.usage\' | |
| e1b2afc am b9c4e16d: am 38863190: am 9718b7e5: am 6dc284ed: am e0d1726c: am 57edceed: am ad07e3f0: am f0b8d3de: am 93c30693: am 0d1bad9c: Merge "Add cts test for wifi scan timestamp." into lmp-dev | |
| 111c08d am b7017a7f: am a41fb745: am 9fa928c4: am 2a599c27: am 17dd55d7: am 7fef7f2a: am b7159911: am 671eb9a1: am 1b71a1a8: am 0ed9706d: Merge "AudioPreProcessingTest only run with FEATURE_MICROPHONE" into lmp-dev | |
| 4c56f14 am f449d1d1: am 97e828a0: am 5ca00cbd: am df1e7262: am 11a26b1d: am 35e41dcb: am 19687512: am 3a899558: am 7e9b40cd: am 90f799a0: Merge "CTS tests for android.app.job" into lmp-dev | |
| 2ce11b6 am 68776990: am 2ca687c7: am 7391752c: am f4c50587: am a049492a: am 2f63beb8: am 4aa61f57: am e505721d: am 46af1cb1: am 3f56a153: Merge "Camera2: modified video snapshot test" into lmp-dev | |
| 6b47ba6 am b3ad2cea: am 6a1984c1: am 0cfa8e72: am 24083a5d: am 45912a32: am 96b9f236: am a34186d9: am 904a6820: am 8c05a408: am 6cf13c10: Have the texture view appear below the pass fail buttons for the projection tests Bug: 18011414 Change-Id: I6fe5fadb91e75d2d103a40f07f17ef | |
| e4e4617 am 60b3d57a: am 7dedf9ad: am 719b767a: am bb6edca9: am 28ba75e5: am fa605e9c: am 33b29330: am 4166f827: am bafbc449: am 11c94398: Merge "Blacklist renderscriptlegacy tests from running on 64-bit ABIs" into lmp-dev | |
| bae6dd2 am 77ad5a71: am b1f0bc67: am eadf7f28: am e57b8c92: am d033feb9: am 94ac2ca3: am cc783018: am b3d17f72: am 1c490bd6: am 33ebbadf: Merge "Play a sound after 5 secs to let the user know to turn the screen on for ProjectionOffscreenActivity" into lmp-dev | |
| 9075d59 am 10b174ed: am f1be2454: am c3f1450c: am 2105f32c: am 37ca7119: am 43886234: am bcee6c39: am fcd97b47: am 7e4a272e: am e05ab103: Merge "Fix failure to install prereq apks on fugu/arm." into lmp-dev | |
| 96ca9a5 am ddbd6021: am 258efc4e: am 6acdb863: am 1f0da53c: am f8c8afab: am f8db65c6: am f0e808cf: am 11de20eb: am 7c15a6df: am dfa9073d: Merge "Make anchor positions more stable in popup window CTS test" into lmp-dev | |
| 7ee3e69 am 23da8915: am 4365919d: am f6898d54: am 7da0f7b4: am c3a597fc: am eaa8fd32: am 04663d00: am 9755d562: am 370e2438: camera2: Move ITS tests to CTS verifier. | |
| 819923e am a0f1d97a: am e8942047: am 63484d5f: am 7615b135: am 7804bda4: am 18c4f934: am f67cb493: am 18d9a131: am 408ac9c9: am df5e90ac: Merge "Add cts native test multilib support." into lmp-dev | |
| 0d024f4 am 282f058b: am c25898f7: am da6ac4cc: am 0d8c3685: am 18185e67: am 46a75122: am d21a3e77: am 4d7f09fc: am 6e63f866: am b9354014: Merge "Make sure Documents CTS tests wake up screen." into lmp-dev | |
| 3fdbdc9 am d3297cd8: am ac706d1c: am fda4c35d: am f4df3e88: am 03bc7d2a: am 20d08ccf: am e3430893: am f84261ce: am dff10b10: am b0ac53a5: Skip BrowserBenchTest#testOctane when any of following features are defined: | |
| 3556326 am f6996175: am 5f24d18e: am 47736447: am 54f2f3d3: am 76faa1db: am c622a9d9: am 23dc3da6: am d16f6dee: am 2672f3f7: am 2c254c4a: Merge "Add more testcases to knownfailures" into lmp-dev | |
| d86a71c am 618a8c68: am 2cca01f8: am 5e9790ed: am 444b8899: (-s ours) am e5131184: am 7ad70583: am e4ae0440: am 6159fb5d: am d01a6f48: (-s ours) am 078ec29b: Merge "DO NOT MERGE:Revert "Add dot and negative sign tests in VectorDrawable CTS"" into lmp-dev | |
| 9bd82ab am ccfe78b9: am 18bbcc24: am 3dda76c4: am 0f621b6c: (-s ours) am 8421120d: am f1daf8dc: am 4930660a: am 6e808323: am 876d0072: (-s ours) am 447ad6d6: am 317c2bce: (-s ours) DO NOT MERGE Bump CTS versions from 4.4W_r3 to 4.4W_r4. | |
| 31dfe0f am 1efdc692: am 6f11f7e6: am 782b3439: am 84e6b185: am 171e7e9c: am 723b0bb8: am 05c242ca: am 703173bd: am 8a00f47e: am 8d959c10: Security tests for cross user intents. | |
| 06d404e am 9524d395: am fba2b3c8: am 9e7bec6e: am 99b7ddd3: am 5036c22a: am 0881bcc8: am c1058a06: am 28a98b84: am 26034f90: am 01c2b49b: Add abi to generated XML | |
| c93cff8 am cbf7a747: am d69e1f8b: am 5eaee04a: am 6bcb76b6: am df1258a5: am 4a864f99: am 8b0ab50c: am cfee039b: am 90a7b6c9: am a26b12c7: Make sure settings that do not apply to devices (such as clockwork) are handled appropriately. b/17949311 | |
| bffab70 am 81c24a5e: am 72bff866: am 04c44434: am 3535a87a: am e3c97430: am c1957626: am f7e7b7f0: am bf926e5a: am cc3bd686: am d61a5b5b: Merge "Declare supported ABIs in dEQP test descriptors." into lmp-dev | |
| 7635b21 am 66d86162: am ec2a85a3: am bddddae4: am ed9745bb: am 19935e5e: am 707d4c85: am d660c9b3: am a9d83446: am 9f1496ac: am 4ea415df: Merge "Exclude DeviceSetup in the report as a TestPackage" into lmp-dev | |
| f4a4bd6 am 3110344b: am 00fa30c5: am 9c5046ea: am d7ab9351: am 921f385a: am a3a52005: am d126f756: am ea031cb4: am 94ca8000: am 0e8d9cf1: Merge "Make tests more reliable by cleaning up worker threads on cancelation. b/17888343" into lmp-dev | |
| 22d47a4 am b0a1e3ea: am 12a86093: am 241e4482: am d45a4654: am e0081cf2: am ffcf8336: am e7aebe65: am 86f24ae6: am b5e4dc4c: am 834127ed: media: VP8 encoder test color format must now be the same for SW and HW | |
| e0c3c92 am 17f18494: am 4090cf3d: am 63d335c6: am ef0b14a1: am 9844b198: am d1a74459: am 507cb45d: am 8aa357e9: am efb1ce7a: am 983f6a8a: Merge "Merge privacy mac test into tx power level test." into lmp-dev | |
| bf3e9bc am 2e3908bf: am 2644f1fd: am 0383751c: am dffb8c13: am 46d30ade: am 94413cfc: am b0b90c9f: am 94a843e9: am 4ab7b3d7: am 32bdf0fb: Merge "TV: fix UI thread issues in BundledTvInputServiceTest" into lmp-dev | |
| 2bf9e0f am 75fe9131: am 6d97bd8d: am 6a22b33d: am be620bf8: am 55e3f563: am 01d3e8b3: am 364719e8: am 78f6dc09: am 85e2d7f1: am 52abbfc5: Fix typo for media tests in knownfailures | |
| 6a9ea8f am 92575841: am 1c78e38a: am 1ba6b32d: am b21cdbb4: am 011d6864: am 86eb96aa: am 42621bb3: am 0cfa8c5d: fix VoldExploitTest | |
| 3f274ed am 062f0275: am 18c68de3: am 05885380: am 3a78cc7f: am 728084c0: am 0a607ed0: am b8da6b0c: am 832c4d1a: am 09d44e75: Merge "Add Features expected in Lolliop and Kitkat Watch platform versions" into lmp-dev | |
| f77abf8 am 2ddd57c7: am d44d4843: am 0bbc36de: am cc44bcbe: am 836278e8: am d9e15c03: am b0b7d201: am cddda826: am 1de20194: am 4908a30c: am fbf3e597: am fa9abbdc: CTS Verifier:Fix timing issue for Ble Client Connect | |
| 668bd3b am 86317f5d: am bd342865: am fc9771e3: am 39bf1b3c: am 91c16821: am f7f4e132: am b6e0c763: am d4a4e2d5: Merge "Fixed crash in BT tests due to window feature request for progress bar (causes crash in clockwork)." into lmp-sprout-dev | |
| a3d31ea am 0e6859c5: am 62cd8541: am 5bd6cecf: (-s ours) am aaa8651a: am f9189504: am 3dd22c18: am fdad6f95: am c2c631d5: (-s ours) am 183c3e3e: DO NOT MERGE Bump CTS versions from 4.4W_r3 to 4.4W_r4. automerge: 317c2bc -s ours automerge: 448c193 -s ours | |
| 1d184b5 am be968072: am a8b44727: am 9899bcd1: am 00eed675: am dd885deb: am a937b8b7: am 5234447e: am 698ed9fc: am f83cd572: am df60b42f: am 5387a8af: am 88aacb78: am 7bd1fb2e: am 24d39459: am 9a0d27b9: am b812960d: am 4b3c7eaf: am 6861e8d6: am 9b9de51d: am 6a1c1372: am 4bc52 | |
| fcacfac am 7aeea2c8: am 04732414: am f18fef54: am d74f6829: am e584d754: am da877284: am 8f3da761: am c6f12c17: am 9f283bc0: am c4218db6: am ff1da43f: am 91421141: Merge "media: use proper input timestamp in VideoEncoderDecoderTest" into klp-dev automerge: 8c8f1c7 | |
| 931b77e am 852e126e: am 13e50c3b: am 52814c73: am cf018d15: am f1b41f67: am 8907d45b: am 0e15adff: am 88358fbd: Merge "CameraITS: fix data copy array out of bound issue" into lmp-sprout-dev | |
| 1aaf10a am da5b4746: am 6b343ef7: am 72164730: am aa004eb8: am fd5f5dad: am be59bc6b: am 9a7e5a13: am e355cd45: am 890c081b: Merge "Bump CTS tradefed version to 5.0_r1" into lmp-dev | |
| 3615edf am 9d7102fe: am c8cf29b8: am 599f90a6: am adc2957b: am 18d1cfcf: am e2f465c1: am 529833ce: am d62964ad: am a58b1dcf: Merge "Revert "Don\'t assert that devices have fil-PH translations."" into lmp-dev | |
| 225cac1 am 47d1085c: am f9a85235: am 28017c85: am 9d4a284f: am 9412fd26: am 0e824613: am 44aa306d: am f162ed19: (-s ours) Merge "Excluded irrelevant tests from clockwork devices." into lmp-sprout-dev | |
| 2876a32 am 10f1b5a5: am 6d7f2aa9: am 2e832e30: am 84be9276: am b106a6a2: am 90546c27: am 90e20b4e: am af5381aa: am d3f2dc05: Build and install the list of preqreqs by ABI. | |
| 87b519a am bc0027b4: am 77887d5b: am 53fc8a06: am ddafba02: am d01629ee: am b4ca06ac: am 68b09a86: am 19d769fe: am 7fc42cd2: Add DEQP3.0 tests to the sub-plans | |
| cc1d8ec am 273f8a0e: am e509fc53: am e12ea6f8: am cfd74283: am 887083e6: am c06a2af9: am 9c35276d: am 486cd7aa: am 27dfbc1e: Merge "Camera2: relax the sensitivity range max required value" into lmp-dev | |
| b206018 am e2ef8351: am 640797d7: am 148c4cf5: am 30c3bf65: am f333f6a5: am e0e067ed: am feb75d1d: am b793f54d: am c2413d0e: Add tests for UsageStats API to knownfailures. | |
| 067a79f am c5abaf8c: am 0f6cc37c: am 521125ab: am 4e8cb4a5: am a68e6224: am 6796c628: am 722415cf: am 6ab502d7: am 35898757: Triage android.Jobscheduler tests | |
| eb6446e am ad21dc05: am 3f5d568c: am 2b9ac1f2: am e8f0af6e: am 59c23e41: am 8c1b0649: am 81d03b50: am fe5e4f8e: am c176cac4: ABI Related bug fixes | |
| c7c1ec0 am fbb4a05b: am a0a06476: am d08f5bdf: am 1e4905a1: am 3148e42d: am 2e90283f: am 18fa1008: am fa2fddd6: am cd14265f: Merge "Disable notification tests on watches and TVs." into lmp-dev | |
| 05389ea am ec1513a4: am 527799ab: am 85cd2a6f: am 2a0850ee: am dda2b038: am 7c5755aa: am 6853dbd5: am f37df93e: Merge "Added toast to long press on pass/info/fail buttons." into lmp-sprout-dev | |
| d858d43 am e3468c51: am d7034129: am b7de49bc: am 9d7a9bec: am 0abba1e8: am bf2fbf0a: am c695cc5c: am 1762e913: am fdc3a7f8: Set the max number of allowed errs to be 3. (fix bug in fugu) | |
| 4fd696f am f4786001: am 69284f40: am c40102fd: am 63e5232d: am 0b81ee5e: am 2f76fdfb: am 19ac83e6: am 6221b84c: am 63310ee0: Auto-pass when device does not support multi-advertising. | |
| 3f33889 am a647ef91: am 2fdf8eac: am ed21eb2b: am f574f749: am 77f21819: am 7d296459: am c5a1c05b: am c3c90e1e: am 848d1740: Merge "CtsVerifier: fix orientations in camera tests" into lmp-dev | |
| 9fcd8b6 am 399fb914: am 2d57436a: am f1569cf9: am 9e6a9708: am 969072a8: am 2a63d49c: am 71101a5d: am 5888cdf8: am 244633ce: Don\'t assert that devices have fil-PH translations. | |
| 1ff2989 am cd93e9ac: am 44be7069: am 8cbbeaec: (-s ours) am 5e7573f4: am cf5d20dc: am 765ad262: am f60afc4e: am 2c5747aa: (-s ours) am b4a0c47c: Merge "Port CtsVerifier to API 21 Notification Listener API. DO NOT MERGE." into lmp-dev | |
| b87c684 am 35c444dd: am a7320590: am 0a1a08c3: am cdb2a03b: am 10fae1c5: am cc19c016: am 179f3194: am d075e273: Merge "CameraITS: Move report_result out of the ItsSession class." into lmp-sprout-dev | |
| 3742901 am ce09031b: am aa2ad282: am b0c5c901: am 16622331: am e2882510: am 4a4f1380: am 5d9bc5bc: am e760ba69: CameraITS: enable several new tests | |
| 68a23a7 am a0638255: am e65508a7: am 69b28cc0: am a3cf0535: am c8b47601: am 73448652: resolved conflicts for merge of 2a2716ca to lmp-sprout-dev | |
| ea3b70a am 7e4017ef: am b238c179: am 3b5483a6: am 32f80ee4: am 9385bd21: am 1d73c2a2: am 13696a6e: am dc2adeb5: Merge "Commented out these tests in initial L release due to stability and user friendliness. Goal is to release in L-MR1: Sensor Power Step Counter and Detector T | |
| a838ec1 am a96e7677: am b4ae6dfc: am c7fba456: am 52d624bf: am 340c23b9: am b63967c5: am 02a1c581: am 5cebdd0d: CameraITS: Updated docs; moved README text into PDF with figures | |
| ed96bb2 am 5e502b28: am 85c9d39f: am 9fbdddcc: am cf1a5ddd: am 22d65f65: am 79b82989: am 07ac4928: am 682faa20: CameraITS: fix typos | |
| 2f7486e am 568c8bda: am e66497b9: am 3f6d8f7a: am e027931a: am 0dee7a0b: am f800b3f3: am 54d8e612: am 34fa85dc: CameraITS: gate tests that need per frame control | |
| 88aff85 am ed275c3f: am b6651921: am 3ec2a81c: am 1f139f06: am 8c2ec4d0: am 263638ed: am edd175f5: am 82739113: CameraITS: properly gate the flash mode test | |
| 56edeb4 am 34705e9b: am 00af8970: am b3d894d2: am 019987ec: am 0394f376: am ef9e63be: am d73c8380: am bad96caf: CameraITS: report skipped tests | |
| 1472483 am 0f5d6379: am 9b7fd0b4: am 58d614e2: am 890815be: am 594ec784: am b2475bd9: am d8d43269: am 8b10253e: am 4be0b988: Merge "CameraCTS: relax previewFps test constraint" into lmp-dev | |
| 1e799b5 am b7babb22: am 1fc4c85d: am 7b3857da: am f399762e: am c1595056: am e4660162: am 97e27342: am 9ec14419: am 0c2046fd: Merge "[CtsVerifier] Make sure to set camera parameters before measuring FOV." into lmp-dev | |
| a5c08f7 am e2b1a093: am bcfd30b8: am b956bf3f: am c26b0f40: am 71fb0d14: am 10b1e9c7: am 2c84af73: am f597ad74: am ccd56ec0: Remove temporary sub-plan CTS-ART | |
| 5b37212 am 502da888: am ab805b55: am d26f545f: am ab75be7a: am 146930e0: am d0e48f68: am adb92ff5: am 2cd469db: am 255ca5b2: Merge "Remove enableNetwork(netId, disableOthers) check from CTS" into lmp-dev | |
| 6c9a543 am f3b37b5e: am baecd9cc: am fda1c721: am a13ed0a8: am dd10349a: am 5f2efaea: am 0df5c6da: am 5047f2aa: am 161f55f2: Merge "Relax NsdManagerTest\'s duplicate event check" into lmp-dev | |
| 42cdb19 am a5c96595: am f37e53ba: am 4a66334f: am 041c2905: am c26eda4e: am 9193d17a: am 171dd0cc: am de8699d7: am 393dcad3: Merge "Fix NoExecutePermissionTest" into lmp-dev | |
| 1fd1ed0 am 049e91ff: am 4153be47: am 060c17bc: am c9351a79: am 488cc924: am 7c8375a0: am 4a650205: am 35aaebdd: am e350522c: Merge "increase wait timeout and reduce dequeue buffer time-out" into lmp-dev | |
| 38fd94f am be195996: am e8819c70: am cc1adb43: (-s ours) am 47f09241: am 382fde05: am 06c0fe92: am c90c3cff: am 80a4fd70: (-s ours) am 56fc619d: Merge "DO NOT MERGE remove appwidget tests from lmp-dev" into lmp-dev | |
| 11860a6 am dd8e262b: am 7e677edf: am fc8e4fef: am a538f449: am 71335ae4: am 18a4562e: am e123b035: am 3b63f297: am 75dadf36: Merge "Use correct printf format specifier" into lmp-dev | |
| f429c5d am 372a76a1: am c4d9590b: am 4c1b737e: am cc619856: am 7f3fea35: am 8ae53fc6: am ac113026: am ad8ceb2b: am b5738379: Merge "Change the verification step from bit-wise comparison to whole-number-wise, especially for floating point data." into lmp-dev | |
| 551cacc am 3f881623: am 7da70866: am 9aa3c007: am bd9d3a20: am b16b4703: am 09a7dde5: am 236f0b3b: am 45a32912: Merge "camera2: Fix makefile for ITS in CTS build (take 2)." into lmp-sprout-dev | |
| faceed8 am 4f3c5ed3: am 04363eb8: am f6f2d695: am 286f6a06: am a32a9dc7: am 424485c6: am 85bc027f: am 1550005c: Merge "CameraITS: Allocate more buffers for ITS" into lmp-sprout-dev | |
| fb1d3da am 21d4066c: am 077deb36: am 44246af0: am 8f613691: am d8a20539: am 5ee8c147: am d28001ce: am ab31d6de: Merge "CameraITS: adjust yuv plus raw tests settings" into lmp-sprout-dev | |
| 4807261 am b4ff3253: am 66672cd7: am 84f808f0: am 62a19adc: am eef6b6a9: am 01687b9b: am 4fea65ef: am 5c37dce4: am c189d58d: Add redundant com.android.org.conscrypt tests to knownfailures | |
| bcdf74e am 7c0fe44a: am 5dc4081d: am a5b247a2: am 55a1b817: am 3689276a: am f0b3bfaf: am 98bfc885: am cf0b7336: am 99d4b05e: Merge "Add a required feature to Projection/Presentation tests and exclude tests not meant for Leanback where test_required_features cannot be applied. | |
| 4431e76 am c6fd8700: am f138df42: am cdced1b8: am fcf09f54: am ba0fadec: am 671be890: am aec51b8a: am 90c66505: am ab4d7190: Merge "skip audio effect tests when not applicable" into lmp-dev | |
| 0637dfd am bea810a6: am 77be514c: am 51f55892: am fce27816: am 3f80b47f: am b61692a3: am 83ffce47: am 1671edc5: am bc474ea7: Merge "Remove SignatureTest from known failures now that it passes." into lmp-dev | |
| 796171e am 204b2177: am 1f03871b: am c101ab82: am 702c146e: am 66c7d38a: am 956ab7d0: am 66b0d114: am 4a14851d: am e70c199c: Merge "Remove GlVboPerfTest tests from known failures." into lmp-dev | |
| feb0e4b am 8130cdca: am 3f51d2c0: am 9ea35f8e: am 5ea94d3b: am 6a55ec4e: am a7967ebe: am 513c0e8e: am 8266a5d4: am 04821b1f: media: update MediaCodecList test to use new API | |
| 62cbf20 am e0939b09: am be8d3620: am 66a6e1f6: am dabfcc2d: am 74adc203: am 5f791c0a: am cfee52a3: am 4764bfaf: Merge "CameraITS: require ITS to pass on all cameras" into lmp-sprout-dev | |
| 495d32a am 0368674d: am 3b5d87e9: am fea5e868: am 233990f7: am 940048ab: am e2fcbef6: am f81251a3: am f11ad595: am c6aa3f3d: Minor cleanup to sig test. | |
| ff2857b am 9a6b2d94: am b2023977: am aacb10ba: am 11bbe75d: am 2cffd12b: am f25e5690: am ee6ad1d2: am 4d777350: am 206fb102: Merge "Fix CTS Signature test." into lmp-dev | |
| e5c92f0 am 95dcb019: am e1113ce3: am 14342b1d: am 0aa8241b: am a41177bf: am e614259f: am 1503fa0f: am 8b7991a1: am bc4f1bd4: Merge "Clean up visualizer in case of failure" into lmp-dev | |
| 9ac5e5b am cdac56ea: am 586b450e: am b886c645: am 9c510ccb: am 2c1415b4: am f58ad4c1: am 75324a99: am 98fc9d50: am 421e3330: Merge "Force all densities required for SplitTests." into lmp-dev | |
| dc9d67b am 6eaf91f9: am c9344d00: am 4ad3c083: am 568e43f7: am 847a6b5e: am ec4a4c51: am 1f3d1a71: am b58aef0e: Enable sharding automerge: d54eb34 | |
| 4aae210 am d808fe8f: am d44c08ea: am 017c45ba: am 10899a5f: am 5e5ca495: am 6d38f4c4: am 7098d07e: am bd62af21: am 5b557e4e: Merge "Move android.view tests to the media bucket, as it requires a screen" into lmp-dev | |
| 22deb4c am 8fea3fd1: am 353a3a30: am ee5e79f3: am 5199d3ab: am f3761db6: am 3ba76c9c: am 14e47368: am bca94f34: am 4db541f3: Revert "Move android.view tests to the medium bucket, as it requires a screen" | |
| 4ee6efd am 2e725902: am 8831e6e7: am 46666add: am 063d24b0: am 1b80334f: am 807b9108: am 068d6bf4: am 371ea933: am fa179d0d: Move android.view tests to the medium bucket, as it requires a screen | |
| 43aab60 am 9dad1abd: am 035b4c1e: am 51b5865b: am 1c771a16: am 5edd5ad6: am ee3f6217: am ab0b8340: am 5175847e: am f0779c01: Merge "Update android.host.theme reference images for 400dpi device" into lmp-dev | |
| f193d15 am cdb001fa: am a4297325: am cdfdd776: am f2dc446d: am eb053ff9: am e0a27408: am 9cdfaec6: am 1a7e7918: am 30ac46ec: Merge "MediaCodecTest: don\'t assume encoder can use input buffers" into lmp-dev | |
| 6156336 am 8fb738aa: am 3379123c: am 1b78baa8: am 12773b50: am d23ef59e: am e36ee0e1: am 75c3a8e4: am 0763a371: am 63f67570: Merge "Wait a bit longer for DocumentsUI backends." into lmp-dev | |
| 9b61f37 am 393bfde3: am 72a90875: am 9369e180: am 2b75a35c: am c5c319e1: am e5a0ce26: am 4129e17b: am 83524b0a: am 070f0e05: Merge "Add CTS test for Roboto fonts" into lmp-dev | |
| f86c7e8 am 90a7448e: am 351490ed: am be9478bd: am a0a12fbb: am a3f88f73: am 03c38ac8: am 55df6c94: am f23d7ff2: am bee2ddef: Merge "Fix BuildTest." into lmp-dev | |
| 019aea9 am 39717259: am a33ba164: am ebb4e518: am 43f80634: am 98d6012d: am 1894b84a: am 7b3821a5: am 379b9dcf: am b41400ac: Fix broken PTS result collection. | |
| 37ef9c8 am 9140cd44: am 95727a91: am 2dbc3b84: am 44f0d3d4: am fbf483a1: am c92f39e0: am dfebb893: am 3c37dba1: am 234dce9c: Compile CtsVerifier for both bitness (using MULTILIB) | |
| ce555b0 am 27c8c01c: am b7510d51: am e2408051: am 70736205: am b05da4af: am 6b02c6f0: am ddca5b70: am 4903fa9f: am 1d82a8f5: Merge "Fix LocationManagerTest#testGpsStatusListener test failure on fugu/molly/MTK boards." into lmp-dev | |
| 5682a25 am 4be1107c: am 19e73380: am 1fa662f1: am 4bc3c04f: am 413bb326: am 9fa98ec5: am 8759a70a: am 2b375543: Merge "camera2: Fix makefile for ITS in CTS build." into lmp-sprout-dev | |
| 7c23a2c am b73ec5bd: am e33de576: am 3b10911a: am cf78ead1: am 00ad085e: am 739375d1: am 02eaedbe: am edcfe23a: Merge changes Ib687cb8d,Iaa97a529 into lmp-sprout-dev | |
| 916844a am 26b01651: am 26a6e2da: am 875a5ecb: am 224240a5: am cb368377: am 6f60bfda: am 0f279346: am a0a3f3f6: am 208e9088: Merge "Run Virtualizer test only when effect is available" into lmp-dev | |
| 8f19e97 am f965b498: am 70a43420: am dd53d397: am 07a24546: am e44b14c6: am d6b35e6c: am f7d7c4a5: am 7eddc21b: Merge "CameraITS: check the reported crop region" into lmp-sprout-dev | |
| 8231cb4 am e62569dc: am ef5abe25: am c57290e9: am 70261fcf: am 980b7c84: am d227a017: am d18455f3: am 626b0539: am c3dedb24: Camera2: relax video snapshot error threshold | |
| 41677f2 am 8279250d: am ed36f858: am a5539472: am c0c38b6a: am 9e43c41a: am bfffeace: am 94ec7b7d: am 1ed802f1: am 9fbbeb5a: Merge "Add support to disable \'Ambient Display\' in sensor tests. b/18033539" into lmp-dev | |
| 158de1c am 1f7b3f40: am 4bc873b4: am 21d2a462: am f033715c: am be555553: am a359bb5a: am 9e8a6983: am bca2330c: am bc50dff8: Merge "SELinuxDomainTest: fix flakiness in tests" into lmp-dev | |
| 8257c07 am 3304875c: am 6638e6ca: am 342c8d8f: am 9896a75e: am e82f85ed: am f510d6b4: am a1298328: am 854042c5: am 8e5bd029: Triage CTS plans | |
| af6c103 am e3e1a993: am 91b897de: am d8a478fa: am 73e2fc87: am 4a5155a6: am a0bda4ef: am 0731572e: am 86f4f1e0: am 67b13f60: Modify test \'android.usage\' CTS package name to \'android.app.usage\' | |
| b9c4e16 am 38863190: am 9718b7e5: am 6dc284ed: am e0d1726c: am 57edceed: am ad07e3f0: am f0b8d3de: am 93c30693: am 0d1bad9c: Merge "Add cts test for wifi scan timestamp." into lmp-dev | |
| b7017a7 am a41fb745: am 9fa928c4: am 2a599c27: am 17dd55d7: am 7fef7f2a: am b7159911: am 671eb9a1: am 1b71a1a8: am 0ed9706d: Merge "AudioPreProcessingTest only run with FEATURE_MICROPHONE" into lmp-dev | |
| f449d1d am 97e828a0: am 5ca00cbd: am df1e7262: am 11a26b1d: am 35e41dcb: am 19687512: am 3a899558: am 7e9b40cd: am 90f799a0: Merge "CTS tests for android.app.job" into lmp-dev | |
| 6877699 am 2ca687c7: am 7391752c: am f4c50587: am a049492a: am 2f63beb8: am 4aa61f57: am e505721d: am 46af1cb1: am 3f56a153: Merge "Camera2: modified video snapshot test" into lmp-dev | |
| b3ad2ce am 6a1984c1: am 0cfa8e72: am 24083a5d: am 45912a32: am 96b9f236: am a34186d9: am 904a6820: am 8c05a408: am 6cf13c10: Have the texture view appear below the pass fail buttons for the projection tests Bug: 18011414 Change-Id: I6fe5fadb91e75d2d103a40f07f17ef762c6aed5b | |
| 60b3d57 am 7dedf9ad: am 719b767a: am bb6edca9: am 28ba75e5: am fa605e9c: am 33b29330: am 4166f827: am bafbc449: am 11c94398: Merge "Blacklist renderscriptlegacy tests from running on 64-bit ABIs" into lmp-dev | |
| 77ad5a7 am b1f0bc67: am eadf7f28: am e57b8c92: am d033feb9: am 94ac2ca3: am cc783018: am b3d17f72: am 1c490bd6: am 33ebbadf: Merge "Play a sound after 5 secs to let the user know to turn the screen on for ProjectionOffscreenActivity" into lmp-dev | |
| 10b174e am f1be2454: am c3f1450c: am 2105f32c: am 37ca7119: am 43886234: am bcee6c39: am fcd97b47: am 7e4a272e: am e05ab103: Merge "Fix failure to install prereq apks on fugu/arm." into lmp-dev | |
| ddbd602 am 258efc4e: am 6acdb863: am 1f0da53c: am f8c8afab: am f8db65c6: am f0e808cf: am 11de20eb: am 7c15a6df: am dfa9073d: Merge "Make anchor positions more stable in popup window CTS test" into lmp-dev | |
| 23da891 am 4365919d: am f6898d54: am 7da0f7b4: am c3a597fc: am eaa8fd32: am 04663d00: am 9755d562: am 370e2438: camera2: Move ITS tests to CTS verifier. | |
| a0f1d97 am e8942047: am 63484d5f: am 7615b135: am 7804bda4: am 18c4f934: am f67cb493: am 18d9a131: am 408ac9c9: am df5e90ac: Merge "Add cts native test multilib support." into lmp-dev | |
| 282f058 am c25898f7: am da6ac4cc: am 0d8c3685: am 18185e67: am 46a75122: am d21a3e77: am 4d7f09fc: am 6e63f866: am b9354014: Merge "Make sure Documents CTS tests wake up screen." into lmp-dev | |
| d3297cd am ac706d1c: am fda4c35d: am f4df3e88: am 03bc7d2a: am 20d08ccf: am e3430893: am f84261ce: am dff10b10: am b0ac53a5: Skip BrowserBenchTest#testOctane when any of following features are defined: | |
| f699617 am 5f24d18e: am 47736447: am 54f2f3d3: am 76faa1db: am c622a9d9: am 23dc3da6: am d16f6dee: am 2672f3f7: am 2c254c4a: Merge "Add more testcases to knownfailures" into lmp-dev | |
| 618a8c6 am 2cca01f8: am 5e9790ed: am 444b8899: (-s ours) am e5131184: am 7ad70583: am e4ae0440: am 6159fb5d: am d01a6f48: (-s ours) am 078ec29b: Merge "DO NOT MERGE:Revert "Add dot and negative sign tests in VectorDrawable CTS"" into lmp-dev | |
| ccfe78b am 18bbcc24: am 3dda76c4: am 0f621b6c: (-s ours) am 8421120d: am f1daf8dc: am 4930660a: am 6e808323: am 876d0072: (-s ours) am 447ad6d6: am 317c2bce: (-s ours) DO NOT MERGE Bump CTS versions from 4.4W_r3 to 4.4W_r4. | |
| 1efdc69 am 6f11f7e6: am 782b3439: am 84e6b185: am 171e7e9c: am 723b0bb8: am 05c242ca: am 703173bd: am 8a00f47e: am 8d959c10: Security tests for cross user intents. | |
| 9524d39 am fba2b3c8: am 9e7bec6e: am 99b7ddd3: am 5036c22a: am 0881bcc8: am c1058a06: am 28a98b84: am 26034f90: am 01c2b49b: Add abi to generated XML | |
| cbf7a74 am d69e1f8b: am 5eaee04a: am 6bcb76b6: am df1258a5: am 4a864f99: am 8b0ab50c: am cfee039b: am 90a7b6c9: am a26b12c7: Make sure settings that do not apply to devices (such as clockwork) are handled appropriately. b/17949311 | |
| 81c24a5 am 72bff866: am 04c44434: am 3535a87a: am e3c97430: am c1957626: am f7e7b7f0: am bf926e5a: am cc3bd686: am d61a5b5b: Merge "Declare supported ABIs in dEQP test descriptors." into lmp-dev | |
| 66d8616 am ec2a85a3: am bddddae4: am ed9745bb: am 19935e5e: am 707d4c85: am d660c9b3: am a9d83446: am 9f1496ac: am 4ea415df: Merge "Exclude DeviceSetup in the report as a TestPackage" into lmp-dev | |
| 3110344 am 00fa30c5: am 9c5046ea: am d7ab9351: am 921f385a: am a3a52005: am d126f756: am ea031cb4: am 94ca8000: am 0e8d9cf1: Merge "Make tests more reliable by cleaning up worker threads on cancelation. b/17888343" into lmp-dev | |
| b0a1e3e am 12a86093: am 241e4482: am d45a4654: am e0081cf2: am ffcf8336: am e7aebe65: am 86f24ae6: am b5e4dc4c: am 834127ed: media: VP8 encoder test color format must now be the same for SW and HW | |
| 17f1849 am 4090cf3d: am 63d335c6: am ef0b14a1: am 9844b198: am d1a74459: am 507cb45d: am 8aa357e9: am efb1ce7a: am 983f6a8a: Merge "Merge privacy mac test into tx power level test." into lmp-dev | |
| 2e3908b am 2644f1fd: am 0383751c: am dffb8c13: am 46d30ade: am 94413cfc: am b0b90c9f: am 94a843e9: am 4ab7b3d7: am 32bdf0fb: Merge "TV: fix UI thread issues in BundledTvInputServiceTest" into lmp-dev | |
| 75fe913 am 6d97bd8d: am 6a22b33d: am be620bf8: am 55e3f563: am 01d3e8b3: am 364719e8: am 78f6dc09: am 85e2d7f1: am 52abbfc5: Fix typo for media tests in knownfailures | |
| 9129f97 collect memory properties in CTS | |
| 805e08a am e5a9ea5d: am 8183c2fd: am 099bdd30: Merge "Traverse and compare view hierarchy with assist structure." into mnc-dev | |
| e5a9ea5 am 8183c2fd: am 099bdd30: Merge "Traverse and compare view hierarchy with assist structure." into mnc-dev | |
| 8d5c037 am 8d61c046: am d6c18970: am 68958e98: Merge "DO NOT MERGE Copy EDI results to device-info-files directory in test result" into mnc-dev | |
| 0ecafa1 am a097d0ad: am 16ca9fba: am 9b50b935: Merge "DO NOT MERGE DeviceInfoActivity: Add ability start anonymous array and object" into mnc-dev | |
| b5f3a1d am 969fa756: am 841f14ef: am 913402e9: resolved conflicts for merge of ff567f6c to mnc-dev | |
| 8d61c04 am d6c18970: am 68958e98: Merge "DO NOT MERGE Copy EDI results to device-info-files directory in test result" into mnc-dev | |
| a097d0a am 16ca9fba: am 9b50b935: Merge "DO NOT MERGE DeviceInfoActivity: Add ability start anonymous array and object" into mnc-dev | |
| 969fa75 am 841f14ef: am 913402e9: resolved conflicts for merge of ff567f6c to mnc-dev | |
| 215b316 am fe6c7397: am f56ebe20: am d47aa524: Merge "CameraITS: tweak test_exposure" into mnc-dev | |
| fe6c739 am f56ebe20: am d47aa524: Merge "CameraITS: tweak test_exposure" into mnc-dev | |
| 8b7c77b am 334c3c3a: am 954e2a48: am 88aa8e49: am f2fa1e16: (-s ours) am 2aa0b684: am 913c472b: Merge "DO NOT MERGE: Emulate AudioTrack.write(...,timestamp) in CTS tests" into lmp-mr1-dev | |
| 334c3c3 am 954e2a48: am 88aa8e49: am f2fa1e16: (-s ours) am 2aa0b684: am 913c472b: Merge "DO NOT MERGE: Emulate AudioTrack.write(...,timestamp) in CTS tests" into lmp-mr1-dev | |
| 9d78434 am 5dac9673: am 439e37bf: am 17d6c43b: Merge "Add sched tracing to atrace test" into mnc-dev | |
| 5dac967 am 439e37bf: am 17d6c43b: Merge "Add sched tracing to atrace test" into mnc-dev | |
| d6d7e4f am ebe96344: am 156aa407: am 76082b7a: Merge "Theme tests for Material" into mnc-dev | |
| ebe9634 am 156aa407: am 76082b7a: Merge "Theme tests for Material" into mnc-dev | |
| 3a090ca am 50502cd8: am e48250c8: am 7652e16d: Merge "Update CTS test for getPositionForView" into mnc-dev | |
| 50502cd am e48250c8: am 7652e16d: Merge "Update CTS test for getPositionForView" into mnc-dev | |
| ae6ebb5 am e10b49ae: am 4856c8c7: am 28619fd8: am 3bde3d04: am 671389ab: am 77b96a8b: am 750d796e: am 11899360: am 46f2b208: am c8eebea2: am 860440a4: test if libFLAC is patched against CVE-2014-9028 | |
| e10b49a am 4856c8c7: am 28619fd8: am 3bde3d04: am 671389ab: am 77b96a8b: am 750d796e: am 11899360: am 46f2b208: am c8eebea2: am 860440a4: test if libFLAC is patched against CVE-2014-9028 | |
| 912f3e4 am edb5d185: am 28efc25c: am a4b519ff: Merge "Bug fix SignificantMotion test." into mnc-dev | |
| edb5d18 am 28efc25c: am a4b519ff: Merge "Bug fix SignificantMotion test." into mnc-dev | |
| 32c6dad am f656100e: am 3ff96ffc: am 12d30a4f: am e796ac95: (-s ours) am be46754b: am 702f51b3: am fdd3a84f: (-s ours) Merge "DO NOT MERGE: Exempt inactive backup service from ServicePermissionsTest" into lollipop-mr1-cts-dev | |
| f656100 am 3ff96ffc: am 12d30a4f: am e796ac95: (-s ours) am be46754b: am 702f51b3: am fdd3a84f: (-s ours) Merge "DO NOT MERGE: Exempt inactive backup service from ServicePermissionsTest" into lollipop-mr1-cts-dev | |
| 39853ad am a366f215: am 7c5a83fb: am 834d0146: Merge "Fix CameraEvictionTest task stack ordering." into mnc-dev | |
| a366f21 am 7c5a83fb: am 834d0146: Merge "Fix CameraEvictionTest task stack ordering." into mnc-dev | |
| eb19d88 am b68fbc5c: am 31df5b74: am 2a07c073: Merge "Camera: fix legacy level video snapshot" into mnc-dev | |
| 84e8d09 am 5477dc47: am d88ed591: am b0b6be7e: Merge "Camera: change the order of manual exposure settings" into mnc-dev | |
| b68fbc5 am 31df5b74: am 2a07c073: Merge "Camera: fix legacy level video snapshot" into mnc-dev | |
| 5477dc4 am d88ed591: am b0b6be7e: Merge "Camera: change the order of manual exposure settings" into mnc-dev | |
| ea51b87 am c9daef16: am 4572244d: am b08f69d6: Merge "CTS test for runtime permission grants" into mnc-dev | |
| c9daef1 am 4572244d: am b08f69d6: Merge "CTS test for runtime permission grants" into mnc-dev | |
| 0c2007f am 356f0de6: am b062b982: am 09adf9d4: am 5eeb319b: am 976aaf1e: am f984bc41: am 09016120: Merge "Fix error in the limited mode for ITS" into lollipop-mr1-cts-dev | |
| 31a25d5 am f451dda7: am f871ac92: am 374227ef: am 6abe1b0b: am 0558db28: am 0e1d7e85: am 33dfc507: am 37bc8c1d: am 4273e8b0: (-s ours) am aff3058b: am 943b139b: am eb8202c3: (-s ours) am 0560e4f7: am 72abc959: (-s ours) am 62a4b871: am b035585c: am b0309151: am 97ac7946: am f | |
| 54f6d45 am 5c929147: am 4f5dd4ef: am 9e05939c: am 16e7ba8d: (-s ours) am 3b400f21: am 1d55b68e: am 86f2ec1a: (-s ours) Merge "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch" into jb-dev automerge: e85b1c6 -s ours automerge: af857 | |
| 356f0de am b062b982: am 09adf9d4: am 5eeb319b: am 976aaf1e: am f984bc41: am 09016120: Merge "Fix error in the limited mode for ITS" into lollipop-mr1-cts-dev | |
| f451dda am f871ac92: am 374227ef: am 6abe1b0b: am 0558db28: am 0e1d7e85: am 33dfc507: am 37bc8c1d: am 4273e8b0: (-s ours) am aff3058b: am 943b139b: am eb8202c3: (-s ours) am 0560e4f7: am 72abc959: (-s ours) am 62a4b871: am b035585c: am b0309151: am 97ac7946: am fc0ffd49: am e | |
| 5c92914 am 4f5dd4ef: am 9e05939c: am 16e7ba8d: (-s ours) am 3b400f21: am 1d55b68e: am 86f2ec1a: (-s ours) Merge "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch" into jb-dev automerge: e85b1c6 -s ours automerge: af857be -s ours a | |
| 9f86ac0 am c2035210: am cc768313: am 430e92d0: Merge "Camera2: Update reprocess configuration test" into mnc-dev | |
| c203521 am cc768313: am 430e92d0: Merge "Camera2: Update reprocess configuration test" into mnc-dev | |
| 601353b am dba04a86: am 9b564f90: am 80253811: Merge "Add CTS test for verifying runtime permission grant scope" into mnc-dev | |
| dba04a8 am 9b564f90: am 80253811: Merge "Add CTS test for verifying runtime permission grant scope" into mnc-dev | |
| 2a0e4f9 am b6b7ca01: am 13b48791: am 2f31c05c: am a496f288: (-s ours) am da985614: am 9ee55252: am f002abc5: am 213b0059: am 1dc225cd: (-s ours) am 16640ea9: am f872d428: CTS: check non-zygote apps are not debuggable DO NOT MERGE | |
| 44ef016 am 580a527d: am cab46ae6: am 65c91ef8: am 151a3c42: (-s ours) am 4e4764df: am cd96c6e8: am d6fbf416: am 3f733482: CTS: check non-zygote apps are not debuggable | |
| b6b7ca0 am 13b48791: am 2f31c05c: am a496f288: (-s ours) am da985614: am 9ee55252: am f002abc5: am 213b0059: am 1dc225cd: (-s ours) am 16640ea9: am f872d428: CTS: check non-zygote apps are not debuggable DO NOT MERGE | |
| 580a527 am cab46ae6: am 65c91ef8: am 151a3c42: (-s ours) am 4e4764df: am cd96c6e8: am d6fbf416: am 3f733482: CTS: check non-zygote apps are not debuggable | |
| c40156f am f16d8dcc: am 61e246df: am 79ed2fbc: Merge "CTS Verifier - Request runtime permissions" into mnc-dev | |
| f16d8dc am 61e246df: am 79ed2fbc: Merge "CTS Verifier - Request runtime permissions" into mnc-dev | |
| d789eef am 3d2fd035: am 7105f243: am bad96aca: Merge "Revert "Revert "Capture Build.Version.BASE_OS and Build.Verison.SECURITY_PATCH""" into mnc-dev | |
| 3d2fd03 am 7105f243: am bad96aca: Merge "Revert "Revert "Capture Build.Version.BASE_OS and Build.Verison.SECURITY_PATCH""" into mnc-dev | |
| 9a2cb29 am c654eb23: am c56d817e: am 1f6477c6: Merge "CTS test for device encryption" into mnc-dev | |
| c654eb2 am c56d817e: am 1f6477c6: Merge "CTS test for device encryption" into mnc-dev | |
| 4d6e7aa am 50280a07: am f80f91f4: am e23e0091: Merge "Revert "Capture Build.Version.BASE_OS and Build.Verison.SECURITY_PATCH"" into mnc-dev | |
| 50280a0 am f80f91f4: am e23e0091: Merge "Revert "Capture Build.Version.BASE_OS and Build.Verison.SECURITY_PATCH"" into mnc-dev | |
| 0f69bc7 am 51a6d72b: am 88246ee7: am 59eaf921: Merge "Capture Build.Version.BASE_OS and Build.Verison.SECURITY_PATCH" into mnc-dev | |
| 51a6d72 am 88246ee7: am 59eaf921: Merge "Capture Build.Version.BASE_OS and Build.Verison.SECURITY_PATCH" into mnc-dev | |
| 0ae1201 am 5fd349c4: am fbe2261e: am 4db04227: am f294ece0: (-s ours) am 058b3c26: am d50ace98: am 6d6cf8e2: (-s ours) Merge "(DO NOT MERGE) Disable two tests for TV that fail on TV" into lollipop-mr1-cts-dev | |
| 5fd349c am fbe2261e: am 4db04227: am f294ece0: (-s ours) am 058b3c26: am d50ace98: am 6d6cf8e2: (-s ours) Merge "(DO NOT MERGE) Disable two tests for TV that fail on TV" into lollipop-mr1-cts-dev | |
| 29800d9 am f6b09486: am 1588f346: am a3d7eae7: Merge "Make BLE CTS tests beacon-agnostic." into mnc-dev | |
| f6b0948 am 1588f346: am a3d7eae7: Merge "Make BLE CTS tests beacon-agnostic." into mnc-dev | |
| 3a5ec97 am 7e816d4c: am 9f6b4c84: am 6da8c854: Merge "CTS: Bypasses DeviceTreeCpuCurrentTest for devices which doesn\'t support device tree." into mnc-dev | |
| 7e816d4 am 9f6b4c84: am 6da8c854: Merge "CTS: Bypasses DeviceTreeCpuCurrentTest for devices which doesn\'t support device tree." into mnc-dev | |
| ab88385 am 05841088: am df76b9c9: am 8ca6b491: Merge "Camera2: Add DEPTH_OUTPUT capability verification" into mnc-dev | |
| 0584108 am df76b9c9: am 8ca6b491: Merge "Camera2: Add DEPTH_OUTPUT capability verification" into mnc-dev | |
| d5d9229 am bc763463: am d4d00843: am 3f7018f9: Merge "Restore missing min and max API." into mnc-dev | |
| c111387 am 55f525f0: am 2b0df5bf: am d9229089: [hifi-verification] Adjust test parameters. Fix bug to allow noise thresholds to scale with bandwidth. Add an additional grace factor for jitter & noise. | |
| 10d0c03 am c5f479c9: am 65c56d6a: am 225b9a1c: am b99a4afc: am 8cf90a69: am 59e335fd: am 29911cb5: Merge "Temporary workaround for intermittent MediaStore_FilesTest failure" into lollipop-mr1-cts-dev | |
| 2f65eba am 7f0b44ab: am 8672b515: am bbfe8b1e: am 5e63e277: am 617dbdb0: am 31ade1dc: am c3f7c316: Merge "Improve hitrate for ClonedSecureRandomTest" into lollipop-mr1-cts-dev | |
| b62ea77 am 9d39f4b2: am d05279cd: am 1a6c797e: Merge "Fix cts test in DumpsysHostTest#testBatteryStatsOutput" into mnc-dev | |
| 7def33e am 0eeeb2eb: am 5af5b232: am 00b746b8: am c95ce81a: am d12ba605: am 43abff1c: am a277f175: Merge "Camera2: Fix waiting for surface size change" into lollipop-cts-dev automerge: 6307e35 | |
| bc76346 am d4d00843: am 3f7018f9: Merge "Restore missing min and max API." into mnc-dev | |
| 55f525f am 2b0df5bf: am d9229089: [hifi-verification] Adjust test parameters. Fix bug to allow noise thresholds to scale with bandwidth. Add an additional grace factor for jitter & noise. | |
| c5f479c am 65c56d6a: am 225b9a1c: am b99a4afc: am 8cf90a69: am 59e335fd: am 29911cb5: Merge "Temporary workaround for intermittent MediaStore_FilesTest failure" into lollipop-mr1-cts-dev | |
| 7f0b44a am 8672b515: am bbfe8b1e: am 5e63e277: am 617dbdb0: am 31ade1dc: am c3f7c316: Merge "Improve hitrate for ClonedSecureRandomTest" into lollipop-mr1-cts-dev | |
| 9d39f4b am d05279cd: am 1a6c797e: Merge "Fix cts test in DumpsysHostTest#testBatteryStatsOutput" into mnc-dev | |
| 0eeeb2e am 5af5b232: am 00b746b8: am c95ce81a: am d12ba605: am 43abff1c: am a277f175: Merge "Camera2: Fix waiting for surface size change" into lollipop-cts-dev automerge: 6307e35 | |
| 02a5f39 am 9b3b125c: am eae5f42a: am a5e7d9b6: Merge "Add CTS tests for cross profile widgets" into mnc-dev | |
| 9b3b125 am eae5f42a: am a5e7d9b6: Merge "Add CTS tests for cross profile widgets" into mnc-dev | |
| d9ad66e am a89ce0d7: am 0c428ad7: am ff1da6f5: Add LifecycleTest for the Assistant Verify that firing the Assistant does not trigger lifecycle methods such as onPause(),onStop(), etc to be called by the foregroud activity. Refactored tests to make use of BroadcastReceivers fo | |
| a89ce0d am 0c428ad7: am ff1da6f5: Add LifecycleTest for the Assistant Verify that firing the Assistant does not trigger lifecycle methods such as onPause(),onStop(), etc to be called by the foregroud activity. Refactored tests to make use of BroadcastReceivers for more fine g | |
| 8130455 am cdac35db: am 223707d8: am 4ef4fe51: am 55fabaae: am 1c19a288: am ef214cb1: am 40c1be93: Merge "fixed mockview" into kitkat-cts-dev automerge: b7a630f -s ours automerge: 307cd54 | |
| 64259c2 am 4e53fb84: am e25cc3b9: am da491d39: am da49df34: am 981466f5: am 253932b8: am ddf02f6f: Merge "StatFsTest: allow no available blocks/bytes for system" into lollipop-mr1-cts-dev | |
| cdac35d am 223707d8: am 4ef4fe51: am 55fabaae: am 1c19a288: am ef214cb1: am 40c1be93: Merge "fixed mockview" into kitkat-cts-dev automerge: b7a630f -s ours automerge: 307cd54 | |
| 4e53fb8 am e25cc3b9: am da491d39: am da49df34: am 981466f5: am 253932b8: am ddf02f6f: Merge "StatFsTest: allow no available blocks/bytes for system" into lollipop-mr1-cts-dev | |
| 14f2f5a am 18a0a15c: am 6237a672: am 140dc141: add global double check bug:23213925 | |
| 18a0a15 am 6237a672: am 140dc141: add global double check bug:23213925 | |
| 4053024 am 77d55bed: am 55e379e0: am bcf879b4: Merge "Set assist settings and tweak tests to align with platform expectations." into mnc-dev | |
| 77d55be am 55e379e0: am bcf879b4: Merge "Set assist settings and tweak tests to align with platform expectations." into mnc-dev | |
| e1bbb86 am 19467ab3: am 28c60e6e: am d20107df: Merge "Add trivial retransmission of QUIC packets" into mnc-dev | |
| 19467ab am 28c60e6e: am d20107df: Merge "Add trivial retransmission of QUIC packets" into mnc-dev | |
| 5f6f4cb am a7f818a7: am 26614c2a: am 8f03ca38: Merge "Fix android.media.cts.ClearKeySystemTest.testClearKeyPlayback" into mnc-dev | |
| a7f818a am 26614c2a: am 8f03ca38: Merge "Fix android.media.cts.ClearKeySystemTest.testClearKeyPlayback" into mnc-dev | |
| c10da20 am 94255593: am 3d557148: am 28c1c91e: Merge "[CtsVerifier] Added Battery and Data usage settings test in BYOD flow" into mnc-dev | |
| 9425559 am 3d557148: am 28c1c91e: Merge "[CtsVerifier] Added Battery and Data usage settings test in BYOD flow" into mnc-dev | |
| f62832c am c38d287b: am 6018ca0f: am dd21f260: Merge "Support multiple variants of ftrace format" into mnc-dev | |
| 170d246 am 28569783: am f91f3018: am 068bd34f: Merge "Fix AppIdleHostTest" into mnc-dev | |
| c38d287 am 6018ca0f: am dd21f260: Merge "Support multiple variants of ftrace format" into mnc-dev | |
| 2856978 am f91f3018: am 068bd34f: Merge "Fix AppIdleHostTest" into mnc-dev | |
| 94f6892 am 60a5a78b: am 2a851c0c: am 46fbb73b: Merge "Fix KeyPairGeneratorTest#testGenerate_RSA_ModernSpec_AsCustomAsPossible" into mnc-dev | |
| 60a5a78 am 2a851c0c: am 46fbb73b: Merge "Fix KeyPairGeneratorTest#testGenerate_RSA_ModernSpec_AsCustomAsPossible" into mnc-dev | |
| b65e480 am 8b4ab04d: am 052918f1: am a60d59bb: Merge "Add test that device owner cannot be set when account present" into mnc-dev | |
| 8b4ab04 am 052918f1: am a60d59bb: Merge "Add test that device owner cannot be set when account present" into mnc-dev | |
| 8b761d5 am be9083a8: am 1c6764d9: am efaf2185: Merge "CTS: check non-zygote apps are not debuggable" into mnc-dev | |
| be9083a am 1c6764d9: am efaf2185: Merge "CTS: check non-zygote apps are not debuggable" into mnc-dev | |
| bc20264 am cf545128: am 9c4016ec: am 97c4e41a: Remove tests from temp. failing list | |
| cf54512 am 9c4016ec: am 97c4e41a: Remove tests from temp. failing list | |
| 8f5c211 am 281fb4c6: am bb70577d: am c732da9f: Merge "Add CTS test for startActivity vs exported" into mnc-dev | |
| 281fb4c am bb70577d: am c732da9f: Merge "Add CTS test for startActivity vs exported" into mnc-dev | |
| e0c5c0e am 5b377a9a: am 23df7e67: am 02ab6ae1: am a3424d92: am e29a533f: am d4a47ebd: am 848062b6: Merge "Collect smallestScreenWidthDp in CTS" into kitkat-cts-dev automerge: 0dfe152 automerge: db124f7 | |
| 5b377a9 am 23df7e67: am 02ab6ae1: am a3424d92: am e29a533f: am d4a47ebd: am 848062b6: Merge "Collect smallestScreenWidthDp in CTS" into kitkat-cts-dev automerge: 0dfe152 automerge: db124f7 | |
| d6b5363 am e92597aa: am 23dac3de: am 325d7964: Merge "Skip testIsVoicemailNumber if not Telephony capable" into mnc-dev | |
| 01f130d am 1b371c40: am 285d6907: am 2dfa49db: Merge "Batching support: Check & verify FIFO length" into mnc-dev | |
| e92597a am 23dac3de: am 325d7964: Merge "Skip testIsVoicemailNumber if not Telephony capable" into mnc-dev | |
| 1b371c4 am 285d6907: am 2dfa49db: Merge "Batching support: Check & verify FIFO length" into mnc-dev | |
| 146d5c2 am 0e72894d: (-s ours) am e97e3777: (-s ours) am 717e7ad3: (-s ours) am 9de88673: (-s ours) am f7f53ecc: (-s ours) am c1b2be34: (-s ours) am 3d879345: (-s ours) Merge "DO NOT MERGE ANYWHERE: Camera: remove ITS from Lollipop" into lollipop-cts-dev automerge: d7b3609 | |
| 0e72894 am e97e3777: (-s ours) am 717e7ad3: (-s ours) am 9de88673: (-s ours) am f7f53ecc: (-s ours) am c1b2be34: (-s ours) am 3d879345: (-s ours) Merge "DO NOT MERGE ANYWHERE: Camera: remove ITS from Lollipop" into lollipop-cts-dev automerge: d7b3609 | |
| a449c6a am c8bf776f: am 96b05e0e: am a7db1207: Merge "Fix breaking NetworkUsageStats CTS" into mnc-dev | |
| c8bf776 am 96b05e0e: am a7db1207: Merge "Fix breaking NetworkUsageStats CTS" into mnc-dev | |
| d28489e am 463a0040: am c620607a: am a72c91f3: Merge "DO NOT MERGE: AudioTrack.write(...,timestamp) CTS test" into mnc-dev | |
| a609f1d am 20c5136f: am 4d7304a0: am ac40e4de: Merge "CTS Verifier Built-In Microphone frequency response" into mnc-dev | |
| 31744a9 am 4cde6298: am 4adf2109: am ef8e131a: Merge "Camera: don\'t select jpeg stream that could slow down video" into mnc-dev | |
| 463a004 am c620607a: am a72c91f3: Merge "DO NOT MERGE: AudioTrack.write(...,timestamp) CTS test" into mnc-dev | |
| 20c5136 am 4d7304a0: am ac40e4de: Merge "CTS Verifier Built-In Microphone frequency response" into mnc-dev | |
| 4cde629 am 4adf2109: am ef8e131a: Merge "Camera: don\'t select jpeg stream that could slow down video" into mnc-dev | |
| f204553 am 481c833a: am 279b5eeb: am 302a186d: Merge "DO NOT MERGE Update CTS and CTS verifier versions" into mnc-dev | |
| 33a83ab am 52ece62c: am 7f0aa998: am 587b4a48: Merge "Wait for newly formatted volume to be mounted." into mnc-dev | |
| 481c833 am 279b5eeb: am 302a186d: Merge "DO NOT MERGE Update CTS and CTS verifier versions" into mnc-dev | |
| 52ece62 am 7f0aa998: am 587b4a48: Merge "Wait for newly formatted volume to be mounted." into mnc-dev | |
| 32fff9c am e9d1cd7b: am 9ce5c33e: am f03056dd: Merge "Add support for DisplayMetrics.DENSITY_420 to tests" into mnc-dev | |
| e9d1cd7 am 9ce5c33e: am f03056dd: Merge "Add support for DisplayMetrics.DENSITY_420 to tests" into mnc-dev | |
| 7bfbad9 am 49462953: am 947f45d8: am 52e6c06e: am 326a5d6c: am f9511521: am d9a99a62: am de234ef4: Merge "Make LauncherApps tests less flakey." into lollipop-cts-dev automerge: 43a1744 | |
| 4946295 am 947f45d8: am 52e6c06e: am 326a5d6c: am f9511521: am d9a99a62: am de234ef4: Merge "Make LauncherApps tests less flakey." into lollipop-cts-dev automerge: 43a1744 | |
| 880dbd8 am 0b28d354: am 6ba67beb: am f33f9b14: Merge "Clean up 18681396b08e01c355f137dfe3ced15c4dd71707." into mnc-dev | |
| 0b28d35 am 6ba67beb: am f33f9b14: Merge "Clean up 18681396b08e01c355f137dfe3ced15c4dd71707." into mnc-dev | |
| c99e0ce am 5750f50c: am 7e65b755: am 4c990c38: resolved conflicts for merge of fe7aea72 to mnc-dev | |
| 5750f50 am 7e65b755: am 4c990c38: resolved conflicts for merge of fe7aea72 to mnc-dev | |
| 8c3f913 am 30545147: am f0548e21: am 1cf9e831: Merge "cts/tests: increase deadlines in android.security.cts.ClonedSecureRandomTest" into mnc-dev | |
| 3054514 am f0548e21: am 1cf9e831: Merge "cts/tests: increase deadlines in android.security.cts.ClonedSecureRandomTest" into mnc-dev | |
| f8c8f2d am 37d90a81: am 1e627a20: am 29bb9ae9: use dpm command to set active device admin using package prearer | |
| 37d90a8 am 1e627a20: am 29bb9ae9: use dpm command to set active device admin using package prearer | |
| b8e29ab am 6f0160bb: am b737a985: am 48e65a50: Merge "Camera2: Update all CTS tests for depth-only devices" into mnc-dev | |
| 6f0160b am b737a985: am 48e65a50: Merge "Camera2: Update all CTS tests for depth-only devices" into mnc-dev | |
| 0e4ed51 am 6fa7b777: am b224d155: am cc903445: Camera: Put CameraTest#testPreviewFpsRange into known failures | |
| 6fa7b77 am b224d155: am cc903445: Camera: Put CameraTest#testPreviewFpsRange into known failures | |
| fc3847f am 10a492db: am 10ce80d3: am fd698aa8: Fix build | |
| 10a492d am 10ce80d3: am fd698aa8: Fix build | |
| 635594d am de1e2fb5: am 4fa1d008: am 299e8512: Merge "[CtsVerfier] ScreenLockBoundKeys - use different key ID" into mnc-dev | |
| de1e2fb am 4fa1d008: am 299e8512: Merge "[CtsVerfier] ScreenLockBoundKeys - use different key ID" into mnc-dev | |
| 3cfe43f am 2cea0830: am 6fad46be: am 70824cbf: Merge "Add testBatchAndFlush to knownfailures." into mnc-dev | |
| 291e38d am 68b3f732: am 22f4746f: am 542a7387: Merge "Add an option to use log saver for generated XML report" into mnc-dev | |
| 256cacb am 8b85b7fb: am 73d4d84f: am dc850f25: Merge "Remove unnecessary layout request, avoid obtaining wrong bounds rect" into mnc-dev | |
| 8d8fece am b281d16a: am cfd55a1d: am 6c099fcb: Merge "Camera: use ZSL tempalte for preview of ReprocessingTest" into mnc-dev | |
| 2cea083 am 6fad46be: am 70824cbf: Merge "Add testBatchAndFlush to knownfailures." into mnc-dev | |
| 68b3f73 am 22f4746f: am 542a7387: Merge "Add an option to use log saver for generated XML report" into mnc-dev | |
| 8b85b7f am 73d4d84f: am dc850f25: Merge "Remove unnecessary layout request, avoid obtaining wrong bounds rect" into mnc-dev | |
| b281d16 am cfd55a1d: am 6c099fcb: Merge "Camera: use ZSL tempalte for preview of ReprocessingTest" into mnc-dev | |
| 2ad27c0 am 1efb12e4: am 6183060b: am 0ed7da3b: Merge "Update KeyStore tests to account for software digesting." into mnc-dev | |
| 1efb12e am 6183060b: am 0ed7da3b: Merge "Update KeyStore tests to account for software digesting." into mnc-dev | |
| 374550f am 7b453b6e: am 9f613633: am ec7fc6c8: Merge "Camera: fix raw size check" into mnc-dev | |
| df6e209 am f5fcc98b: am eddd1954: am 414b05a0: Merge "Add test for Keystore put overflow" into mnc-dev | |
| 7b453b6 am 9f613633: am ec7fc6c8: Merge "Camera: fix raw size check" into mnc-dev | |
| f5fcc98 am eddd1954: am 414b05a0: Merge "Add test for Keystore put overflow" into mnc-dev | |
| 99bfade am bfbb0ffa: am 1ddae939: resolved conflicts for merge of addf6c32 to mnc-dr-dev | |
| bfbb0ff am 1ddae939: resolved conflicts for merge of addf6c32 to mnc-dr-dev | |
| 5310fb1 am a2562e91: am 17bea7a7: am 78e94a43: Merge "Add test for InCallService.getCalls" into mnc-dev | |
| e2bb148 am bd2e2e32: am 9f503326: am 5170b8ef: Merge "Add test for TelecomManager.getSimCallManager" into mnc-dev | |
| a2562e9 am 17bea7a7: am 78e94a43: Merge "Add test for InCallService.getCalls" into mnc-dev | |
| bd2e2e3 am 9f503326: am 5170b8ef: Merge "Add test for TelecomManager.getSimCallManager" into mnc-dev | |
| c3b464e am daa0ac09: am 217dbc7c: am ecb037ab: Merge "Adding some more PhoneAccount API tests." into mnc-dev | |
| daa0ac0 am 217dbc7c: am ecb037ab: Merge "Adding some more PhoneAccount API tests." into mnc-dev | |
| 891c10b am f9c409bf: am 57725208: am 5af0967e: Merge "Camera: fix false alarms when no camera on device" into mnc-dev | |
| f9c409b am 57725208: am 5af0967e: Merge "Camera: fix false alarms when no camera on device" into mnc-dev | |
| 0f62767 am a0df333b: am 75d1a292: am 6e88e2f9: Merge "Changing media dest from mnt/sdcard to /sdcard" into mnc-dev | |
| a0df333 am 75d1a292: am 6e88e2f9: Merge "Changing media dest from mnt/sdcard to /sdcard" into mnc-dev | |
| af45fc3 am fa881232: am 44d66a02: am a807f1b0: Merge "Split NIST AES CAVP test into smaller tests." into mnc-dev | |
| fa88123 am 44d66a02: am a807f1b0: Merge "Split NIST AES CAVP test into smaller tests." into mnc-dev | |
| 6f824f5 am 695152a2: am 19497e8d: am 7c5ba904: Merge "CTS Verifier Speaker and Microphone frequency response" into mnc-dev | |
| 695152a am 19497e8d: am 7c5ba904: Merge "CTS Verifier Speaker and Microphone frequency response" into mnc-dev | |
| e831f2b am 2f5eddd3: am 8b5349cf: am c3494a45: Merge "Checking for multiuser before trying to create one" into mnc-dev | |
| 2f5eddd am 8b5349cf: am c3494a45: Merge "Checking for multiuser before trying to create one" into mnc-dev | |
| 65f8294 am 5d7909f6: am 2bc29e74: am 013f2daf: Merge "cts: get video size from CamcorderProfile" into mnc-dev | |
| 5d7909f am 2bc29e74: am 013f2daf: Merge "cts: get video size from CamcorderProfile" into mnc-dev | |
| 3fbc718 am b5bcc123: am 9eb4e7ca: am 3f4ed278: Merge "Fix GeolocationTest" into mnc-dev | |
| c730bd2 am d8eace3c: am 480713cd: am a28a572d: am 1ddbb3ba: am bf6a2a70: am 35944a11: am 46ba1f8b: Merge "Should create a decoder from MediaCodecList" into lollipop-cts-dev automerge: e791827 | |
| 73cc4d5 am 27571e1d: am 7ea2dcff: am 11c907e6: am 087d30ee: am b7d0debe: am 066c5434: am 8fc80070: Merge "Send broadcasts to the CTS Robot even if it is stopped." into lollipop-cts-dev automerge: 72dc4bc | |
| b5bcc12 am 9eb4e7ca: am 3f4ed278: Merge "Fix GeolocationTest" into mnc-dev | |
| d8eace3 am 480713cd: am a28a572d: am 1ddbb3ba: am bf6a2a70: am 35944a11: am 46ba1f8b: Merge "Should create a decoder from MediaCodecList" into lollipop-cts-dev automerge: e791827 | |
| 27571e1 am 7ea2dcff: am 11c907e6: am 087d30ee: am b7d0debe: am 066c5434: am 8fc80070: Merge "Send broadcasts to the CTS Robot even if it is stopped." into lollipop-cts-dev automerge: 72dc4bc | |
| b9ac3ac am 55282d90: am cb7eacc7: am 6418ba2d: Merge "Change name of rs_kernel_context parameter." into mnc-dev | |
| 55282d9 am cb7eacc7: am 6418ba2d: Merge "Change name of rs_kernel_context parameter." into mnc-dev | |
| d717268 am 9b224982: am b0b8bdb0: am a9bed5b4: Merge "update attention management test for M release" into mnc-dev | |
| 9b22498 am b0b8bdb0: am a9bed5b4: Merge "update attention management test for M release" into mnc-dev | |
| 8239691 am 8e730de6: am 42d6352b: am 78de670d: Add some ConnectionServiceTests | |
| 8e730de am 42d6352b: am 78de670d: Add some ConnectionServiceTests | |
| 31b1476 am 5223c577: am 80d60df2: am 7d0be0f3: Merge "Ensure layout occurs before testing divider height" into mnc-dev | |
| 5223c57 am 80d60df2: am 7d0be0f3: Merge "Ensure layout occurs before testing divider height" into mnc-dev | |
| e2519cc am 4e6492b5: am ab802a9e: am b907f028: Merge "CTS test that account management works for managed profile" into mnc-dev | |
| 4e6492b am ab802a9e: am b907f028: Merge "CTS test that account management works for managed profile" into mnc-dev | |
| e1b7753 am eee15c75: am f7e94c33: am c9f9235b: Bug: 22979576 Fix CTS: RingtoneManagerTest failing | |
| eee15c7 am f7e94c33: am c9f9235b: Bug: 22979576 Fix CTS: RingtoneManagerTest failing | |
| b422af0 am 9cb0e811: am cd87d23f: am f297a2b9: Bug: 23003511 Fix CTS: AudioManagerTest#testSoundEffects failing | |
| 9cb0e81 am cd87d23f: am f297a2b9: Bug: 23003511 Fix CTS: AudioManagerTest#testSoundEffects failing | |
| e23070b am f8127391: am 69b65d5a: am 1cd85c85: Merge "Add CtsVerifier tests for settings lockdowns" into mnc-dev | |
| 555448e am 8b39eba7: am a9971737: am 063857ad: Merge "Add Device Owner CtsVerifier test for device admin settings" into mnc-dev | |
| f812739 am 69b65d5a: am 1cd85c85: Merge "Add CtsVerifier tests for settings lockdowns" into mnc-dev | |
| 8b39eba am a9971737: am 063857ad: Merge "Add Device Owner CtsVerifier test for device admin settings" into mnc-dev | |
| 1fbfe64 am 8df8321b: am d526c335: am 90a0691d: Merge "Add test for flag secure app" into mnc-dev | |
| 8df8321 am d526c335: am 90a0691d: Merge "Add test for flag secure app" into mnc-dev | |
| d373a1b am 270415c2: am 71fbd240: am e9cd5f6f: Merge "Verify that per-user storage is isolated." into mnc-dev | |
| 270415c am 71fbd240: am e9cd5f6f: Merge "Verify that per-user storage is isolated." into mnc-dev | |
| 6f761e4 am 9d36862b: am 47b679ad: am 2268f438: Merge "CTS runner fixes" into mnc-dev | |
| 9d36862 am 47b679ad: am 2268f438: Merge "CTS runner fixes" into mnc-dev | |
| f995e5f am 5e8732e3: am bd3be66f: am 223de423: Merge "MIDI CTS: remove tests that pass null callback" into mnc-dev | |
| 5e8732e am bd3be66f: am 223de423: Merge "MIDI CTS: remove tests that pass null callback" into mnc-dev | |
| 0fd3724 am 0fb7401d: am e05e2383: am 61143e53: Merge "Revert "Bug: 23003511 CTS: AudioManagerTest#testSoundEffects failing"" into mnc-dev | |
| 0fb7401 am e05e2383: am 61143e53: Merge "Revert "Bug: 23003511 CTS: AudioManagerTest#testSoundEffects failing"" into mnc-dev | |
| 3740f3f am 4b2e5f63: am 3a9a68ea: am 7cf3e08a: Merge "SensorParameterRange, SensorSupport, Noise SD, Jitter Tests" into mnc-dev | |
| 4b2e5f6 am 3a9a68ea: am 7cf3e08a: Merge "SensorParameterRange, SensorSupport, Noise SD, Jitter Tests" into mnc-dev | |
| 3f84de3 am 2f53acff: am b409cb53: am 3742c39d: Merge "Revert "Modify user agent CTS test to (optionally) match new webview user agent."" into mnc-dev | |
| 2f53acf am b409cb53: am 3742c39d: Merge "Revert "Modify user agent CTS test to (optionally) match new webview user agent."" into mnc-dev | |
| 9942667 am 6bcec2a9: am d75e394d: am 7f5866e2: Merge "Add further test for device owner pre-conditions" into mnc-dev | |
| 20559d0 am 017f78df: am 507e7011: am 7f155732: Test that all runtime permissions are in the right groups | |
| 6bcec2a am d75e394d: am 7f5866e2: Merge "Add further test for device owner pre-conditions" into mnc-dev | |
| 017f78d am 507e7011: am 7f155732: Test that all runtime permissions are in the right groups | |
| e7c5ea8 am 4be0dcde: am 4b218b9b: am 80b13757: Merge "media: log result raw data in test error message" into mnc-dev | |
| c57e356 am 8c055f64: am 67c8e9b1: am c1c1a48e: Bug: 23003511 CTS: AudioManagerTest#testSoundEffects failing | |
| 4be0dcd am 4b218b9b: am 80b13757: Merge "media: log result raw data in test error message" into mnc-dev | |
| 8c055f6 am 67c8e9b1: am c1c1a48e: Bug: 23003511 CTS: AudioManagerTest#testSoundEffects failing | |
| 8a3adf0 am b48f80e9: am f7c7a16d: am 53dc1e9f: Bug: 22979576 CTS: RingtoneManagerTest failing | |
| b48f80e am f7c7a16d: am 53dc1e9f: Bug: 22979576 CTS: RingtoneManagerTest failing | |
| 30f049a am 0175ff73: am a0e0dea6: am 03ba0b23: Merge "Make sure to skip Telecom CTS tests on unsupported devices" into mnc-dev | |
| 0175ff7 am a0e0dea6: am 03ba0b23: Merge "Make sure to skip Telecom CTS tests on unsupported devices" into mnc-dev | |
| cd34299 am 111e17eb: am a60d67c5: am 06494920: Merge "CTS Verifier Loopback frequency response" into mnc-dev | |
| b71c0aa am e6f69ccb: am e9bed3d9: am 3ae0ff67: am 3f4ed301: (-s ours) am c48f1420: am 96d6e739: am a1538ecf: (-s ours) Merge "DO NOT MERGE: adding 1 more knownfailure" into kitkat-cts-dev automerge: aace927 -s ours automerge: f24c7e3 | |
| 724e7f9 am 618920b8: am f203d8aa: am cff16058: am 48b1d220: (-s ours) am 3806299c: am 7c732fe1: am ff744cdc: (-s ours) Merge "DO NOT MERGE: Bumping CTS 4.4 R4" into kitkat-cts-dev automerge: cdcc28e -s ours automerge: 3c3da0f | |
| 423cfe0 am ac5afe0b: am 80bc6bdf: am 4044ee47: am 37cddadd: (-s ours) am ee7c6eed: am b0149966: am d316140d: (-s ours) Merge "DO NOT MERGE: Adding known failures for CTS 4.4 R4" into kitkat-cts-dev automerge: 43602dd -s ours automerge: 54286d2 | |
| 111e17e am a60d67c5: am 06494920: Merge "CTS Verifier Loopback frequency response" into mnc-dev | |
| e6f69cc am e9bed3d9: am 3ae0ff67: am 3f4ed301: (-s ours) am c48f1420: am 96d6e739: am a1538ecf: (-s ours) Merge "DO NOT MERGE: adding 1 more knownfailure" into kitkat-cts-dev automerge: aace927 -s ours automerge: f24c7e3 | |
| 618920b am f203d8aa: am cff16058: am 48b1d220: (-s ours) am 3806299c: am 7c732fe1: am ff744cdc: (-s ours) Merge "DO NOT MERGE: Bumping CTS 4.4 R4" into kitkat-cts-dev automerge: cdcc28e -s ours automerge: 3c3da0f | |
| ac5afe0 am 80bc6bdf: am 4044ee47: am 37cddadd: (-s ours) am ee7c6eed: am b0149966: am d316140d: (-s ours) Merge "DO NOT MERGE: Adding known failures for CTS 4.4 R4" into kitkat-cts-dev automerge: 43602dd -s ours automerge: 54286d2 | |
| 5898cb5 am e06b2b6e: am 425b210e: am a31bb01e: Merge "Add Keyguard disabled features CTS and CTSVerifier tests" into mnc-dev | |
| 63583db am f796667b: am 9e8e6f45: am 2b204957: resolved conflicts for merge of fbf97a70 to mnc-dev | |
| e06b2b6 am 425b210e: am a31bb01e: Merge "Add Keyguard disabled features CTS and CTSVerifier tests" into mnc-dev | |
| f796667 am 9e8e6f45: am 2b204957: resolved conflicts for merge of fbf97a70 to mnc-dev | |
| 3bf4612 am 35a548e1: am ca6150b2: am c2aaf355: Merge "Update CTS for unsupported legacy ConnectivityManager APIs" into mnc-dev | |
| 35a548e am ca6150b2: am c2aaf355: Merge "Update CTS for unsupported legacy ConnectivityManager APIs" into mnc-dev | |
| 4a98799 am 0788f3ba: am d12aa42b: am f4daddc4: Merge "Fix EventGapVerificationTest#testVerify_missing_events." into mnc-dev | |
| 0788f3b am d12aa42b: am f4daddc4: Merge "Fix EventGapVerificationTest#testVerify_missing_events." into mnc-dev | |
| 36784f1 am dd97d70a: am 09b4dbf8: am cd8be67f: Merge "Fix testGetPhoneCount() for PHONE_TYPE_NONE." into mnc-dev | |
| dd97d70 am 09b4dbf8: am cd8be67f: Merge "Fix testGetPhoneCount() for PHONE_TYPE_NONE." into mnc-dev | |
| efb97a0 am 8f5c5ea7: am 1060f431: am f30cdb8d: Merge "CameraITS: Update ZSL mode check" into mnc-dev | |
| 8f5c5ea am 1060f431: am f30cdb8d: Merge "CameraITS: Update ZSL mode check" into mnc-dev | |
| f548a46 am 955cabde: am 3627cf5f: am 22fddace: Merge "Use test app in separate package from assistant." into mnc-dev | |
| 955cabd am 3627cf5f: am 22fddace: Merge "Use test app in separate package from assistant." into mnc-dev | |
| bc242bc am 0613eacf: am 1fabd68b: am a5c4f768: Merge "media: test audio codecs in testGetMaxSupportedInstances" into mnc-dev | |
| 0613eac am 1fabd68b: am a5c4f768: Merge "media: test audio codecs in testGetMaxSupportedInstances" into mnc-dev | |
| 9278aef am c15d4a5a: am ad29ef6e: am c2be101f: Merge "Fix bugs in test_devicesInfoFields()." into mnc-dev | |
| c15d4a5 am ad29ef6e: am c2be101f: Merge "Fix bugs in test_devicesInfoFields()." into mnc-dev | |
| 3101f37 am e6e2b0c6: am 84524684: am a38249c4: Merge "Protect runtime storage mount points." into mnc-dev | |
| e6e2b0c am 84524684: am a38249c4: Merge "Protect runtime storage mount points." into mnc-dev | |
| 4bc233f am 3a26115c: am 2b504387: am 9c5bdd5b: Merge "Track Connection setPostDialWait and setNextPostDialChar" into mnc-dev | |
| 3a26115 am 2b504387: am 9c5bdd5b: Merge "Track Connection setPostDialWait and setNextPostDialChar" into mnc-dev | |
| 4cd6c7e am e327d01a: am 9d3e2597: am 7de0eed5: Merge "Revert "Work around deqp log file creation issues."" into mnc-dev | |
| e327d01 am 9d3e2597: am 7de0eed5: Merge "Revert "Work around deqp log file creation issues."" into mnc-dev | |
| 7e712b7 am 71a0ce89: am 9eaa1380: am 48e3c76c: am 8dd77d2b: am 2321a695: am 860c298b: am 440e1494: Merge "CTS Sensor: Perform EventOrderVerificationTest for all sensor types except ONE-SHOT" into lollipop-mr1-cts-dev | |
| a23896a am 280e5737: am 52912f0e: am 284f75a1: am 0a3c1be3: am 643f7916: am e6efca72: CTS Sensor: Perform EventOrderVerificationTest for all sensor types except ONE-SHOT | |
| a12e850 am 482f39a5: am 31b9f00f: am f1cb8832: am 7f754b55: am 4156835c: am 9382efe4: am f0a0009b: Merge "Fix the bug in the logic for testMinimumMemory." into lollipop-mr1-cts-dev | |
| 4385b55 am 0bb6f928: am 80689995: am 0ee91418: am 2be7a47e: am 7675f634: am c35968f2: am 39258b60: Merge "Fix for checkKernelWakelock function : It contains a comma character in the "Kernel Wakelock". So When parts arr\'s length is more than 7, Fix check routine." into lollip | |
| 65923f7 am 82ff74ad: am 4a575a2f: am a4a88050: am b3bb1f3e: am 9accf44a: am c38471f0: am d8f16bb6: Merge "Camera: Increase timeout for long-running test." into lollipop-mr1-cts-dev | |
| af12539 am 705e7276: am e285e7f0: am e9f6c68d: am 2bdf109f: am be3bcecc: am 8660b44a: am 43375216: Merge "Camera: fix early timeout for long exposure captures" into lollipop-mr1-cts-dev | |
| f0c0af7 am 57221480: am 05dc8dbc: am cfdbc914: am c90bcc00: am 926bec19: am 2b44bd54: am f6c1543c: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 5295dc6 automerge: 85cd818 | |
| 2a011cd am a5e61001: am 88942be0: am c930539f: am 513d5d6e: am 80677d78: am 31f8e8f2: am 622e55a0: Merge "Revert "Cts test fix for shortcode 48000"" into kitkat-cts-dev automerge: 5e6120e automerge: 1712bff | |
| 082083e am 75907b54: am 0ca081a8: am a254bb56: am 5230c23a: am c780339f: am 01349431: am 5d221056: Merge "Revert "improve TestVirtualDisplayRecycles to reduce memory usage"" into kitkat-cts-dev automerge: 73c024c automerge: 60a6110 | |
| bc0a137 am a676e597: am e8a8ea05: am 4417dd4c: am 8dc159b6: am df4b4e81: am a10977cb: am e45b24b6: Merge "Fix AudioTrackTest.testGetTimestamp" into kitkat-cts-dev automerge: 61f6182 -s ours automerge: f3dd5ae | |
| b19e403 am 4c9a7a9a: am a1238cb5: am f3dc0ceb: am 7a138f7a: am db02a5b6: am 18051d38: am 23ba9755: Merge "Revert "fix audio policy service binder security tests."" into kitkat-cts-dev automerge: f394d10 automerge: 6ec683d | |
| 79bccac am 5af9b0a0: am 3444fbcc: am cc7dcc80: am c4616963: am 57910b56: am d9145f30: am b08e0fb0: Merge "Revert "Fix AudioTrackTest.testGetTimestamp"" into kitkat-cts-dev automerge: c59abe4 -s ours automerge: 47e02eb | |
| 2ad0ee3 am e06756ab: am 39b79ce2: am 9f7a245a: am 95369b77: am 97b234f5: am b0517aca: am b19860ce: Merge "fix audio policy service binder security tests." into kitkat-cts-dev automerge: 6716898 automerge: f1fac19 -s ours | |
| 53af8d1 am 45a7d8a4: am 33836484: am bcba3633: am 82473236: am 3fa72a17: am 00018c88: am 975bd65d: Merge "Fix build due to bad merge resolution." into lollipop-mr1-cts-dev | |
| be47658 am b119ebf6: am cf82eef2: am 49d85789: am a1821944: am a00f3e79: am 2aed56ba: am f4530e8b: Merge "Changed the size of MockView according to resolution." into kitkat-cts-dev automerge: 4a53e93 -s ours automerge: a1eb3bf | |
| ce04188 am b8bb4c9f: am 2bd193d0: am 3e674f4c: am b04016c8: am cbe6ca3e: am f6d44c47: am 7f1ed1b1: Merge "Fix AudioTrackTest.testGetTimestamp" into kitkat-cts-dev automerge: aea6a23 -s ours automerge: c9dd710 | |
| 7d48d73 am f630381a: am a86ccd39: am 6550effc: am cd8204b4: am e343d0a0: am 59c06496: am 4905b06e: Merge "increase wait timeout and reduce dequeue buffer time-out" into kitkat-cts-dev automerge: dcf21f4 -s ours automerge: 8c94827 | |
| 71a0ce8 am 9eaa1380: am 48e3c76c: am 8dd77d2b: am 2321a695: am 860c298b: am 440e1494: Merge "CTS Sensor: Perform EventOrderVerificationTest for all sensor types except ONE-SHOT" into lollipop-mr1-cts-dev | |
| 280e573 am 52912f0e: am 284f75a1: am 0a3c1be3: am 643f7916: am e6efca72: CTS Sensor: Perform EventOrderVerificationTest for all sensor types except ONE-SHOT | |
| 482f39a am 31b9f00f: am f1cb8832: am 7f754b55: am 4156835c: am 9382efe4: am f0a0009b: Merge "Fix the bug in the logic for testMinimumMemory." into lollipop-mr1-cts-dev | |
| 0bb6f92 am 80689995: am 0ee91418: am 2be7a47e: am 7675f634: am c35968f2: am 39258b60: Merge "Fix for checkKernelWakelock function : It contains a comma character in the "Kernel Wakelock". So When parts arr\'s length is more than 7, Fix check routine." into lollipop-mr1-cts-de | |
| 82ff74a am 4a575a2f: am a4a88050: am b3bb1f3e: am 9accf44a: am c38471f0: am d8f16bb6: Merge "Camera: Increase timeout for long-running test." into lollipop-mr1-cts-dev | |
| 705e727 am e285e7f0: am e9f6c68d: am 2bdf109f: am be3bcecc: am 8660b44a: am 43375216: Merge "Camera: fix early timeout for long exposure captures" into lollipop-mr1-cts-dev | |
| 5722148 am 05dc8dbc: am cfdbc914: am c90bcc00: am 926bec19: am 2b44bd54: am f6c1543c: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 5295dc6 automerge: 85cd818 | |
| a5e6100 am 88942be0: am c930539f: am 513d5d6e: am 80677d78: am 31f8e8f2: am 622e55a0: Merge "Revert "Cts test fix for shortcode 48000"" into kitkat-cts-dev automerge: 5e6120e automerge: 1712bff | |
| 75907b5 am 0ca081a8: am a254bb56: am 5230c23a: am c780339f: am 01349431: am 5d221056: Merge "Revert "improve TestVirtualDisplayRecycles to reduce memory usage"" into kitkat-cts-dev automerge: 73c024c automerge: 60a6110 | |
| a676e59 am e8a8ea05: am 4417dd4c: am 8dc159b6: am df4b4e81: am a10977cb: am e45b24b6: Merge "Fix AudioTrackTest.testGetTimestamp" into kitkat-cts-dev automerge: 61f6182 -s ours automerge: f3dd5ae | |
| 4c9a7a9 am a1238cb5: am f3dc0ceb: am 7a138f7a: am db02a5b6: am 18051d38: am 23ba9755: Merge "Revert "fix audio policy service binder security tests."" into kitkat-cts-dev automerge: f394d10 automerge: 6ec683d | |
| 5af9b0a am 3444fbcc: am cc7dcc80: am c4616963: am 57910b56: am d9145f30: am b08e0fb0: Merge "Revert "Fix AudioTrackTest.testGetTimestamp"" into kitkat-cts-dev automerge: c59abe4 -s ours automerge: 47e02eb | |
| e06756a am 39b79ce2: am 9f7a245a: am 95369b77: am 97b234f5: am b0517aca: am b19860ce: Merge "fix audio policy service binder security tests." into kitkat-cts-dev automerge: 6716898 automerge: f1fac19 -s ours | |
| 45a7d8a am 33836484: am bcba3633: am 82473236: am 3fa72a17: am 00018c88: am 975bd65d: Merge "Fix build due to bad merge resolution." into lollipop-mr1-cts-dev | |
| b119ebf am cf82eef2: am 49d85789: am a1821944: am a00f3e79: am 2aed56ba: am f4530e8b: Merge "Changed the size of MockView according to resolution." into kitkat-cts-dev automerge: 4a53e93 -s ours automerge: a1eb3bf | |
| b8bb4c9 am 2bd193d0: am 3e674f4c: am b04016c8: am cbe6ca3e: am f6d44c47: am 7f1ed1b1: Merge "Fix AudioTrackTest.testGetTimestamp" into kitkat-cts-dev automerge: aea6a23 -s ours automerge: c9dd710 | |
| f630381 am a86ccd39: am 6550effc: am cd8204b4: am e343d0a0: am 59c06496: am 4905b06e: Merge "increase wait timeout and reduce dequeue buffer time-out" into kitkat-cts-dev automerge: dcf21f4 -s ours automerge: 8c94827 | |
| dbd9a50 am 671e1d1a: am 77cc3f44: am 49fcc854: resolved conflicts for merge of c22edce6 to mnc-dev | |
| 671e1d1 am 77cc3f44: am 49fcc854: resolved conflicts for merge of c22edce6 to mnc-dev | |
| 9f5916f am 598f7ca0: am 071d9e3a: am ecc168fb: Merge "RemoteConnection.VideoProvider CTS tests." into mnc-dev | |
| 51d2b0d am a1feee12: am 41737c0d: am b3257983: Merge "Update testOnCannedTextResponsesLoaded" into mnc-dev | |
| 93bee3d am 1c3faae4: am c1b2b543: am 4f214849: am d8995ada: (-s ours) am 3f0e8c96: am 632e4d91: am c2ab9326: (-s ours) Merge "DO NOT MERGE: Camera: don\'t always require ZSL template" into lollipop-cts-dev automerge: fdfa976 | |
| 56a000a am db5d232a: am 8171259e: am f85bdaa3: am 7c4aa7a8: am 0616d0d4: am d7adb8bc: am dd6dc04a: Merge "Ensure JobScheduler Connectivity CTS reenables WiFI" into lollipop-cts-dev automerge: 3b0dc26 | |
| 3801914 am f19fab64: am 1937b96e: am 9124bdea: am 00bf7582: (-s ours) am ebc351d2: am 34796907: am ddd85c18: Merge "resolve merge conflicts of 950a898 to lollipop-mr1-cts-dev." into lollipop-mr1-cts-dev | |
| 598f7ca am 071d9e3a: am ecc168fb: Merge "RemoteConnection.VideoProvider CTS tests." into mnc-dev | |
| a1feee1 am 41737c0d: am b3257983: Merge "Update testOnCannedTextResponsesLoaded" into mnc-dev | |
| 1c3faae am c1b2b543: am 4f214849: am d8995ada: (-s ours) am 3f0e8c96: am 632e4d91: am c2ab9326: (-s ours) Merge "DO NOT MERGE: Camera: don\'t always require ZSL template" into lollipop-cts-dev automerge: fdfa976 | |
| db5d232 am 8171259e: am f85bdaa3: am 7c4aa7a8: am 0616d0d4: am d7adb8bc: am dd6dc04a: Merge "Ensure JobScheduler Connectivity CTS reenables WiFI" into lollipop-cts-dev automerge: 3b0dc26 | |
| f19fab6 am 1937b96e: am 9124bdea: am 00bf7582: (-s ours) am ebc351d2: am 34796907: am ddd85c18: Merge "resolve merge conflicts of 950a898 to lollipop-mr1-cts-dev." into lollipop-mr1-cts-dev | |
| 238f85d am db2a11ab: am 507836c3: am 8d3320a0: am 9877b7d8: am 4434fb3e: am d466d2d1: am 516e3b2c: (-s ours) Merge "Fix the TV detection logic for Shadow CTS test" into lollipop-mr1-cts-dev | |
| db2a11a am 507836c3: am 8d3320a0: am 9877b7d8: am 4434fb3e: am d466d2d1: am 516e3b2c: (-s ours) Merge "Fix the TV detection logic for Shadow CTS test" into lollipop-mr1-cts-dev | |
| ffe9d9c am d745620e: am b032d300: am b0b2e44e: Merge "Augment tests for Connection-related APIs" into mnc-dev | |
| d745620 am b032d300: am b0b2e44e: Merge "Augment tests for Connection-related APIs" into mnc-dev | |
| 23dd446 am df45ccf5: am eb02e6dc: am 12ce15f5: Merge "Remote Conference Callbacks tests." into mnc-dev | |
| df45ccf am eb02e6dc: am 12ce15f5: Merge "Remote Conference Callbacks tests." into mnc-dev | |
| 5f39344 am 3f026639: am 8be5623c: am c143ec0c: Merge "Provide better diagnostics on CTS failures." into mnc-dev | |
| 0233275 am a426cb5a: am 53662b33: am 6ffe2ba7: Add test for onCannedTextResponsesLoaded | |
| 3f02663 am 8be5623c: am c143ec0c: Merge "Provide better diagnostics on CTS failures." into mnc-dev | |
| a426cb5 am 53662b33: am 6ffe2ba7: Add test for onCannedTextResponsesLoaded | |
| 2c809d5 am c114ca58: am 1d7441e7: am abc60991: Merge "Add post dial continue and wait test" into mnc-dev | |
| c114ca5 am 1d7441e7: am abc60991: Merge "Add post dial continue and wait test" into mnc-dev | |
| cc9ad4a am 8a8d9a57: am 57627b40: am 06373fe7: Bug: 22873823 CTS: android.provider.cts.Settings related tests failing: SecurityException | |
| 8a8d9a5 am 57627b40: am 06373fe7: Bug: 22873823 CTS: android.provider.cts.Settings related tests failing: SecurityException | |
| bb09a6a am 9f06d23f: am 775111ae: am 3b8a8639: Merge "Remote Connection Callbacks tests." into mnc-dev | |
| 9f06d23 am 775111ae: am 3b8a8639: Merge "Remote Connection Callbacks tests." into mnc-dev | |
| fdb52c7 am 9589b08e: am 220be71d: am aec642dc: Merge "Added AbsListViewTest.testFling" into mnc-dev | |
| 9589b08 am 220be71d: am aec642dc: Merge "Added AbsListViewTest.testFling" into mnc-dev | |
| 5e60ee4 am 2a10de56: am 83c21ece: am 05e0420e: Merge "Fix PhoneNumberTest.testGetLine1Number" into mnc-dev | |
| 2a10de5 am 83c21ece: am 05e0420e: Merge "Fix PhoneNumberTest.testGetLine1Number" into mnc-dev | |
| 9ac1fb2 am 80a1d067: am 01f998bd: am 26e5362a: Merge "Test for onCallAudioStateChanged callback" into mnc-dev | |
| 80a1d06 am 01f998bd: am 26e5362a: Merge "Test for onCallAudioStateChanged callback" into mnc-dev | |
| 5e3bfad am d2cea7f8: am e2e1b859: am d264b1da: Merge "Update build Sdk for PermissionApp" into mnc-dev | |
| d2cea7f am e2e1b859: am d264b1da: Merge "Update build Sdk for PermissionApp" into mnc-dev | |
| 8bfa941 am 867d2ccd: am 71e418cc: am cf39360e: Merge "Test that the device owner changed broadcast is sent." into mnc-dev | |
| 867d2cc am 71e418cc: am cf39360e: Merge "Test that the device owner changed broadcast is sent." into mnc-dev | |
| d6bc2f5 am a768f913: am 7fd859d2: am 8748c035: Merge "Renew leanback jank test to test with continuous scroll animation." into mnc-dev | |
| a768f91 am 7fd859d2: am 8748c035: Merge "Renew leanback jank test to test with continuous scroll animation." into mnc-dev | |
| ea88b36 am 7d3145f8: am 026121b0: am 0928fbb0: Merge "Assist CTS test" into mnc-dev | |
| 5f99ada am 83a533c9: am 9fab4047: am b5d9e2e1: Merge "Add OnBringToForegroundTest" into mnc-dev | |
| 992f2fa am a737e78a: am a7c4e522: am 3624feac: Merge "Revert "Revert "Store result directory in build attributes.""" into mnc-dev | |
| 0b1f294 am 8e4fb73b: am 574fcff1: am d92e66c3: Merge "Fix contacts provider cts tests" into mnc-dev | |
| 0f73b26 am 1439cce5: am 28927ed3: resolved conflicts for merge of b9e371de to mnc-dr-dev | |
| 7d3145f am 026121b0: am 0928fbb0: Merge "Assist CTS test" into mnc-dev | |
| 83a533c am 9fab4047: am b5d9e2e1: Merge "Add OnBringToForegroundTest" into mnc-dev | |
| a737e78 am a7c4e522: am 3624feac: Merge "Revert "Revert "Store result directory in build attributes.""" into mnc-dev | |
| 8e4fb73 am 574fcff1: am d92e66c3: Merge "Fix contacts provider cts tests" into mnc-dev | |
| 1439cce am 28927ed3: resolved conflicts for merge of b9e371de to mnc-dr-dev | |
| 7c864d7 am b59c910c: am 8ec21423: am bec12893: Merge "Add CTS tests for Conference setter API testing." into mnc-dev | |
| b59c910 am 8ec21423: am bec12893: Merge "Add CTS tests for Conference setter API testing." into mnc-dev | |
| c845454 am 77e2d71a: am c7e9b192: am c9b114fa: Merge "Fix expected misc output of dumpsys BatteryStats test" into mnc-dev | |
| 77e2d71 am c7e9b192: am c9b114fa: Merge "Fix expected misc output of dumpsys BatteryStats test" into mnc-dev | |
| b447a89 am 6afa8fb4: am 20dfdc18: am f87279c6: Merge "media: combine log to reduce the size" into mnc-dev | |
| 6afa8fb am 20dfdc18: am f87279c6: Merge "media: combine log to reduce the size" into mnc-dev | |
| a1c9360 am 7bfdbba1: am ef341611: am 1ea46b33: Merge "MediaRandomTest: restrict domain of setAudioSource() test" into mnc-dev | |
| 7e9fc6b am f6e99cb6: am 1286e313: am e770e1cf: Merge "videoperf: end the decoder test if exceed the time limit." into mnc-dev | |
| 054f4dc am da81dc65: am 850e3121: am 0832d3fc: Merge "Add tests for InCallService.canAddCall" into mnc-dev | |
| 4c048f0 am d43e7a03: am 23c3da6a: am daf252ee: Merge "Add a 3 seconds delay before running each CTS test." into mnc-dev | |
| 84508b2 am 8b78f0cd: am 35f24148: am d28e999e: Merge "Adjust Android Keystore AES-GCM test to handle IVs from BC." into mnc-dev | |
| d3e07fc am eb00e7a6: am 9d8d5d56: am f6bee2b1: Merge "Fix build." into mnc-dev | |
| c0eaec7 am 95b517c9: am 19b25f9f: am 7eff318e: Add RemoteConference API Cts tests. | |
| 6248dc6 am 5972a7dd: am 125aa714: am 8b06a19e: Merge "Fix Telecom CTS tests to use valid phone numbers" into mnc-dev | |
| a4cfd8f am e9ba54c5: am eca50ae6: am 7a814581: Merge "Revert "Store result directory in build attributes."" into mnc-dev | |
| 2292224 am 72144156: am 7a460b00: am e01750a3: Merge "testDecodeMonoGsm: skip iff Gsm decoding is not supported" into mnc-dev | |
| a676a8b am 2cb98aff: am 04d11027: am fcfdbac8: Merge "Store result directory in build attributes." into mnc-dev | |
| 7bfdbba am ef341611: am 1ea46b33: Merge "MediaRandomTest: restrict domain of setAudioSource() test" into mnc-dev | |
| f6e99cb am 1286e313: am e770e1cf: Merge "videoperf: end the decoder test if exceed the time limit." into mnc-dev | |
| da81dc6 am 850e3121: am 0832d3fc: Merge "Add tests for InCallService.canAddCall" into mnc-dev | |
| d43e7a0 am 23c3da6a: am daf252ee: Merge "Add a 3 seconds delay before running each CTS test." into mnc-dev | |
| 8b78f0c am 35f24148: am d28e999e: Merge "Adjust Android Keystore AES-GCM test to handle IVs from BC." into mnc-dev | |
| eb00e7a am 9d8d5d56: am f6bee2b1: Merge "Fix build." into mnc-dev | |
| 95b517c am 19b25f9f: am 7eff318e: Add RemoteConference API Cts tests. | |
| 5972a7d am 125aa714: am 8b06a19e: Merge "Fix Telecom CTS tests to use valid phone numbers" into mnc-dev | |
| e9ba54c am eca50ae6: am 7a814581: Merge "Revert "Store result directory in build attributes."" into mnc-dev | |
| 7214415 am 7a460b00: am e01750a3: Merge "testDecodeMonoGsm: skip iff Gsm decoding is not supported" into mnc-dev | |
| 2cb98af am 04d11027: am fcfdbac8: Merge "Store result directory in build attributes." into mnc-dev | |
| 9c0e4ec am f4edddbf: am 6338e62c: am d3d60838: Merge "CameraITS: Update DNG noise model generator script." into mnc-dev | |
| f4edddb am 6338e62c: am d3d60838: Merge "CameraITS: Update DNG noise model generator script." into mnc-dev | |
| d7d12ca am 3c74ce91: am e6a7e453: am 00a5e040: Merge "Add tests for pre-conditions of setProfileOwner and setDeviceOwner" into mnc-dev | |
| 3c74ce9 am e6a7e453: am 00a5e040: Merge "Add tests for pre-conditions of setProfileOwner and setDeviceOwner" into mnc-dev | |
| 5333360 am 13f5b6b1: am e917c5a7: am b66dbea4: Merge "Move tests for setApplicationHidden to CTS" into mnc-dev | |
| 13f5b6b am e917c5a7: am b66dbea4: Merge "Move tests for setApplicationHidden to CTS" into mnc-dev | |
| 19a322b am 4590914d: am 835f9e3f: am 0b66a87b: Merge "Update AudioNativeTest to check odd channel counts" into mnc-dev | |
| 4590914 am 835f9e3f: am 0b66a87b: Merge "Update AudioNativeTest to check odd channel counts" into mnc-dev | |
| af38a81 am b0e31500: am 4dbe88da: am 7bc02147: Merge "Permissions: Fix Auth CTS tests to reflect changes." into mnc-dev | |
| 5d09ea6 am d2369927: am 6c02a693: am 7701775a: Merge "testDecodeMonoGsm: skip on non-phones without Gsm decoder" into mnc-dev | |
| 740016d am 96360778: am 5bd80276: am dc469df7: Merge "cts: VideoEncoderTest: increase 1st frame timeout to 2sec" into mnc-dev | |
| b0e3150 am 4dbe88da: am 7bc02147: Merge "Permissions: Fix Auth CTS tests to reflect changes." into mnc-dev | |
| d236992 am 6c02a693: am 7701775a: Merge "testDecodeMonoGsm: skip on non-phones without Gsm decoder" into mnc-dev | |
| 9636077 am 5bd80276: am dc469df7: Merge "cts: VideoEncoderTest: increase 1st frame timeout to 2sec" into mnc-dev | |
| dd23095 am 1b52f086: am 090c695c: am f5bd2df3: Merge "Move tests from CTS-DEQP-staging to CTS-DEQP" into mnc-dev | |
| 7917ba2 am 87119c8f: am 8aee12c9: am 8b7705e6: Merge "Fix CTS to deal with wifi-only devices." into mnc-dev | |
| 5e2e583 am 89178cc8: am bc30d08e: am e94a2793: Merge "Skip SeccompTests that fail when running under an emulated ABI." into mnc-dev | |
| 1b52f08 am 090c695c: am f5bd2df3: Merge "Move tests from CTS-DEQP-staging to CTS-DEQP" into mnc-dev | |
| 87119c8 am 8aee12c9: am 8b7705e6: Merge "Fix CTS to deal with wifi-only devices." into mnc-dev | |
| 89178cc am bc30d08e: am e94a2793: Merge "Skip SeccompTests that fail when running under an emulated ABI." into mnc-dev | |
| 539c220 am 52d70c97: am bcba7c08: am 43ef55c2: Merge "Verify uninstall using "pm list"." into mnc-dev | |
| 52d70c9 am bcba7c08: am 43ef55c2: Merge "Verify uninstall using "pm list"." into mnc-dev | |
| 11150ab am 103dbf55: am 359297b7: am 0ba8cd23: testExtractAlpha was asserting a bug | |
| 5ca5db6 am c795e231: am fb661db8: am 997ed6a4: Merge "Test the getter methods of Conference API\'s." into mnc-dev | |
| 103dbf5 am 359297b7: am 0ba8cd23: testExtractAlpha was asserting a bug | |
| c795e23 am fb661db8: am 997ed6a4: Merge "Test the getter methods of Conference API\'s." into mnc-dev | |
| fc71be1 am f7bc28b0: am 1914399d: am 9e5440f9: Merge "Add MIDI feature to MNC section" into mnc-dev | |
| bcc3ac8 am 887b3d37: am d84d30cd: am 909238a4: Merge "CTS: TelephonyProviderTest failing" into mnc-dev | |
| f7bc28b am 1914399d: am 9e5440f9: Merge "Add MIDI feature to MNC section" into mnc-dev | |
| 887b3d3 am d84d30cd: am 909238a4: Merge "CTS: TelephonyProviderTest failing" into mnc-dev | |
| 7b6af22 am 92ad79dd: am fda7591c: am e2f7b6f6: Merge "Extend screen capture disabled test" into mnc-dev | |
| 92ad79d am fda7591c: am e2f7b6f6: Merge "Extend screen capture disabled test" into mnc-dev | |
| 62ec69e am 8b67c639: am 46a071ad: am e0482c1b: Merge "Add CTSVerifier tests for checking permission grant states." into mnc-dev | |
| 8b67c63 am 46a071ad: am e0482c1b: Merge "Add CTSVerifier tests for checking permission grant states." into mnc-dev | |
| 3bb32df am 2e274938: am 2e78e61b: am c60e19ee: Merge "Report GFX metrics of Leanback jank test, in addition to ones based on SurfaceFlinger." into mnc-dev | |
| 2e27493 am 2e78e61b: am c60e19ee: Merge "Report GFX metrics of Leanback jank test, in addition to ones based on SurfaceFlinger." into mnc-dev | |
| c43ae51 am a491840d: am c4e42201: am 0c06d02a: Merge "CameraITS: Support connecting multiple devices" into mnc-dev | |
| ada7333 am e8bc6e3f: am 0334b8ec: am 7d370d8f: Merge "New tests for (un)registerNetworkCallback with PendingIntent." into mnc-dev | |
| a491840 am c4e42201: am 0c06d02a: Merge "CameraITS: Support connecting multiple devices" into mnc-dev | |
| e8bc6e3 am 0334b8ec: am 7d370d8f: Merge "New tests for (un)registerNetworkCallback with PendingIntent." into mnc-dev | |
| 4ae208d am 907a8981: am ca12adf9: am 8638def6: Merge "Adding RemoteConnection API Cts tests." into mnc-dev | |
| 907a898 am ca12adf9: am 8638def6: Merge "Adding RemoteConnection API Cts tests." into mnc-dev | |
| 586311c am 03abab34: am e5d5acc6: am 7ffe1aff: media: compute measured fps from frame time diff | |
| 0b44d4b am f1825848: am f15fb099: am 4d478a45: Merge "DO NOT MERGE media: import Stat." into mnc-dev | |
| 03abab3 am e5d5acc6: am 7ffe1aff: media: compute measured fps from frame time diff | |
| f182584 am f15fb099: am 4d478a45: Merge "DO NOT MERGE media: import Stat." into mnc-dev | |
| c678fb4 am 6ec28d2b: am 9fc4e8cc: am 6a4d762c: Merge "Fix for ScanResultTest and WifiManagerTest" into mnc-dev | |
| 6ec28d2 am 9fc4e8cc: am 6a4d762c: Merge "Fix for ScanResultTest and WifiManagerTest" into mnc-dev | |
| 6c630a3 am 122d508c: am 3d0a35ac: am d114860e: Merge "videoperf: compute measured fps from frame time diff" into mnc-dev | |
| 122d508 am 3d0a35ac: am d114860e: Merge "videoperf: compute measured fps from frame time diff" into mnc-dev | |
| 28f88b2 am be84301e: am 34cfdfa9: am e6b2323c: CTS test to ensure RelativeLayout alignBaseline works correctly | |
| be84301 am 34cfdfa9: am e6b2323c: CTS test to ensure RelativeLayout alignBaseline works correctly | |
| 3d3536f am a8a14231: am 36797581: am a7e037a3: Merge "Revert "Turn on verbose logging to debug flaky test cases"" into mnc-dev | |
| a8a1423 am 36797581: am a7e037a3: Merge "Revert "Turn on verbose logging to debug flaky test cases"" into mnc-dev | |
| 2187dd7 am a55c5983: am 2c3a385d: am 37f63783: Merge "CTS test whether managed provisioning is installed" into mnc-dev | |
| f3bdc02 am 3e8c3e73: am ebe87a07: am 2ffcbfd5: Merge "Refactor CtsVerifier BYOD tests to use existing classes" into mnc-dev | |
| a55c598 am 2c3a385d: am 37f63783: Merge "CTS test whether managed provisioning is installed" into mnc-dev | |
| 3e8c3e7 am ebe87a07: am 2ffcbfd5: Merge "Refactor CtsVerifier BYOD tests to use existing classes" into mnc-dev | |
| af1c511 am 29b0ff91: am 1b153440: am 4a768873: Merge "Revert "Revert "Assert that digest/padding NONE doesn\'t mean ANY.""" into mnc-dev | |
| 29b0ff9 am 1b153440: am 4a768873: Merge "Revert "Revert "Assert that digest/padding NONE doesn\'t mean ANY.""" into mnc-dev | |
| 83fc202 am 1f8c83bf: am d2ad30ed: am 472aa112: Merge "DeviceSuspendTests for non wake-up sensors." into mnc-dev | |
| 1f8c83b am d2ad30ed: am 472aa112: Merge "DeviceSuspendTests for non wake-up sensors." into mnc-dev | |
| 78f30d1 am b7f9f25a: am f9a641ba: am 3c7b99db: Merge "Camera: fix testYuvBurst flaky timeout issue" into mnc-dev | |
| b7f9f25 am f9a641ba: am 3c7b99db: Merge "Camera: fix testYuvBurst flaky timeout issue" into mnc-dev | |
| 221de1c am 99c92bf2: am 07e80e0d: am 3500e290: Merge "CTS Coverage Report Support for generic types" into mnc-dev | |
| 99c92bf am 07e80e0d: am 3500e290: Merge "CTS Coverage Report Support for generic types" into mnc-dev | |
| c07542cc am fb40f176: am c45570f6: am d0e1da0a: Merge "Move PersistentIntentResolvingTest to DeviceAndProfileOwner" into mnc-dev | |
| ee5d4aa am b8fe6b70: am b6977251: am dccb9b2b: Merge "Move ScreenCaptureDisabledTest to DeviceAndProfileOwner" into mnc-dev | |
| 827f3e6 am fbb5b11d: am 98446026: am ebc03eb2: Merge "Move ApplicationRestrictionsTest to DeviceAndProfileOwner" into mnc-dev | |
| fb40f17 am c45570f6: am d0e1da0a: Merge "Move PersistentIntentResolvingTest to DeviceAndProfileOwner" into mnc-dev | |
| b8fe6b7 am b6977251: am dccb9b2b: Merge "Move ScreenCaptureDisabledTest to DeviceAndProfileOwner" into mnc-dev | |
| fbb5b11 am 98446026: am ebc03eb2: Merge "Move ApplicationRestrictionsTest to DeviceAndProfileOwner" into mnc-dev | |
| 6446351 am 9dd47617: am e3acdde5: am 750082e8: Merge "More CTS conference tests" into mnc-dev | |
| 9dd4761 am e3acdde5: am 750082e8: Merge "More CTS conference tests" into mnc-dev | |
| c96943e am 2b7edd64: am 59aa1121: am e012f1e8: Merge "Avoid leaking eviction test service in tearDown." into mnc-dev | |
| 2b7edd6 am 59aa1121: am e012f1e8: Merge "Avoid leaking eviction test service in tearDown." into mnc-dev | |
| 82c1936 am 860c678f: am 4fcca724: am 8eb198f8: Merge "CameraITS: Update writer socket when it\'s closed" into mnc-dev | |
| 592d6e6 am bbbf0ebf: am 4cc3f7c2: am 17d36c7e: Merge changes from topic \'cherrypick-edi-to-mnc\' into mnc-dev | |
| 860c678 am 4fcca724: am 8eb198f8: Merge "CameraITS: Update writer socket when it\'s closed" into mnc-dev | |
| bbbf0eb am 4cc3f7c2: am 17d36c7e: Merge changes from topic \'cherrypick-edi-to-mnc\' into mnc-dev | |
| 2b72d2c am c212874d: am 1cb9427b: am 71a1ea67: Merge "DO NOT MERGE videoperf: switch to use DeviceReportLog" into mnc-dev | |
| c212874 am 1cb9427b: am 71a1ea67: Merge "DO NOT MERGE videoperf: switch to use DeviceReportLog" into mnc-dev | |
| 2e5d904 am 355808ac: am f2e00261: am 3016c320: Merge "Add check for bitmap get/set alpha_8 config" into mnc-dev | |
| c0ef844 am 230dc155: am 6825c5ab: am 0b857abf: Couple of bug fixes in CTS tests. | |
| 4766a47 am 715a4846: am bbb85042: am e2fa5d47: Merge "Add CTS conference test" into mnc-dev | |
| 355808a am f2e00261: am 3016c320: Merge "Add check for bitmap get/set alpha_8 config" into mnc-dev | |
| 230dc15 am 6825c5ab: am 0b857abf: Couple of bug fixes in CTS tests. | |
| 715a484 am bbb85042: am e2fa5d47: Merge "Add CTS conference test" into mnc-dev | |
| baff871 am f3bbe99b: am fdebcad2: am a21d7e3f: Merge "Bug: 22118093 CTS: ProviderPermissionTest#testWriteSettings failing" into mnc-dev | |
| f3bbe99 am fdebcad2: am a21d7e3f: Merge "Bug: 22118093 CTS: ProviderPermissionTest#testWriteSettings failing" into mnc-dev | |
| 26730e8 am 5ca3ddb5: am 1685838d: am d56f0067: Merge "QUIC port 80 support is going away" into mnc-dev | |
| a0ff980 am 3b502594: am 191dbb88: am 1d24769b: Add CTS for QueueItem | |
| 5ca3ddb am 1685838d: am d56f0067: Merge "QUIC port 80 support is going away" into mnc-dev | |
| 3b50259 am 191dbb88: am 1d24769b: Add CTS for QueueItem | |
| c0ca2b5 am 051cb29d: am 35648dec: am c0797d52: Merge "Bug: 22601850 CTS: DisplayTest#testModeSwitch failing" into mnc-dev | |
| 051cb29 am 35648dec: am c0797d52: Merge "Bug: 22601850 CTS: DisplayTest#testModeSwitch failing" into mnc-dev | |
| 28acb6d am f3a3c107: am 605e5678: am 5b1ad50d: Merge "Runtime permission tests for MediaStore." into mnc-dev | |
| a9af95e am 62a1fce0: am b28d3a7d: am 74951a16: Merge "resolved conflicts for merge of fe9be818 to mnc-dev" into mnc-dev | |
| 63add60 am 077fbaaf: am 9f96d3c4: am 21afdf1b: Merge "AudioNativeTest: do not run record tests without microphone" into mnc-dev | |
| f3a3c10 am 605e5678: am 5b1ad50d: Merge "Runtime permission tests for MediaStore." into mnc-dev | |
| 62a1fce am b28d3a7d: am 74951a16: Merge "resolved conflicts for merge of fe9be818 to mnc-dev" into mnc-dev | |
| 077fbaa am 9f96d3c4: am 21afdf1b: Merge "AudioNativeTest: do not run record tests without microphone" into mnc-dev | |
| 06b0ec7 am 83091e0e: am aeb0d0d1: am 366c8fe1: am b70c3ba4: (-s ours) am 930658b8: am d4116cbf: am 34fb6b5b: (-s ours) Merge "DO NOT MERGE: Camera: don\'t always require ZSL template" into lollipop-mr1-cts-dev | |
| 83091e0 am aeb0d0d1: am 366c8fe1: am b70c3ba4: (-s ours) am 930658b8: am d4116cbf: am 34fb6b5b: (-s ours) Merge "DO NOT MERGE: Camera: don\'t always require ZSL template" into lollipop-mr1-cts-dev | |
| 55cbd2f am d5aa2485: am 38f084d4: am ee5c7e6d: Merge "resolved conflicts for merge of f5961eb0 to mnc-dev" into mnc-dev | |
| a7e6515 am 8c7224cb: am 25f2b952: am 79e97a22: Merge "increase tolerance in RSResizeTest test bug:22357417" into mnc-dev | |
| d5aa248 am 38f084d4: am ee5c7e6d: Merge "resolved conflicts for merge of f5961eb0 to mnc-dev" into mnc-dev | |
| 8c7224c am 25f2b952: am 79e97a22: Merge "increase tolerance in RSResizeTest test bug:22357417" into mnc-dev | |
| a22e6ae am 536ab224: am 43f6218a: am 6fc292c9: am fd5849fc: am 6c630ac5: Merge commit \'d395c6c7\' into lmp-mr1-app-dev | |
| bd6d8f7 am 8322337c: am 6358085e: am c963ef98: am 8e7c7909: am 7504dc4f: am 4e54fd8c: am 00e949a0: Merge "Update instructions for the Car Dock test" into lollipop-mr1-cts-dev | |
| 536ab22 am 43f6218a: am 6fc292c9: am fd5849fc: am 6c630ac5: Merge commit \'d395c6c7\' into lmp-mr1-app-dev | |
| 8322337 am 6358085e: am c963ef98: am 8e7c7909: am 7504dc4f: am 4e54fd8c: am 00e949a0: Merge "Update instructions for the Car Dock test" into lollipop-mr1-cts-dev | |
| 9a606bb am 5ed23469: am ce7bd989: am 5aec6ebd: Merge "Modify CTS tests for AlarmClock to include testing for CompleteVoiceRequest and AbortVoiceRequest hanlding by whatever Clock app is included (DeskClock in stock Android case)." into mnc-dev | |
| 5ed2346 am ce7bd989: am 5aec6ebd: Merge "Modify CTS tests for AlarmClock to include testing for CompleteVoiceRequest and AbortVoiceRequest hanlding by whatever Clock app is included (DeskClock in stock Android case)." into mnc-dev | |
| 5ff311e am 03417fa9: am 6c420096: am 12ae307b: Merge "Bug: 22567809 CTS: Fugu: android.text.format.cts related tests failing" into mnc-dev | |
| 03417fa am 6c420096: am 12ae307b: Merge "Bug: 22567809 CTS: Fugu: android.text.format.cts related tests failing" into mnc-dev | |
| 1e0571b am c7caecb9: am 0a56a87d: am 5b5fb5e6: Merge "Simplify CTS testing for policies that apply to DO and PO" into mnc-dev | |
| 092d8fa am 8985053a: am d792755c: am 94601eb2: Merge "Bug: 22477687 CTS RingtoneTest#testRingtone failing" into mnc-dev | |
| c7caecb am 0a56a87d: am 5b5fb5e6: Merge "Simplify CTS testing for policies that apply to DO and PO" into mnc-dev | |
| 8985053 am d792755c: am 94601eb2: Merge "Bug: 22477687 CTS RingtoneTest#testRingtone failing" into mnc-dev | |
| 01473b8 am 802a5813: am 093a2123: am 34673b8b: Merge "Add a jank test with Leanback UI." into mnc-dev | |
| 02a3d59 am 4d2e3b33: am 0008277a: am e4bc918f: Merge "Add FEATURE_FINGERPRINT to PackageManager\'s feature list" into mnc-dev | |
| 1ea9808 am 912a623b: am 47aafdb7: am 8ad06b49: Merge "media: fix potential memory leak in test." into mnc-dev | |
| bbb0f7f am dd30d2ff: am c8b5d884: am a18399f6: Merge "AudioRecordTest: Don\'t consider notifications after stop" into mnc-dev | |
| f2eb6fe am ffc96fad: am fa85b7b1: am 6cf6c807: Merge "Revert "DO NOT MERGE media: collect frame time diff log for certain build"" into mnc-dev | |
| 9aa95fd am 12dc3433: am ab0232a9: am 425b73d6: Merge "Tests to verify behavior of adoptable disks." into mnc-dev | |
| 1562fb6 am 9bc15a48: am c830ba49: am de98cf52: Merge "media: use small frame size for resource manager test." into mnc-dev | |
| 070195f am 306a040e: am b00e58fc: am ba2314e4: Merge "Add tests for ArraySet (newly made public in mnc)." into mnc-dev | |
| f1d6e58 am faec5db3: am 02d3aedb: am ba5bcc17: Merge "[SecurityTests] test for transactional fingerprint keys" into mnc-dev | |
| 58e7424 am c885672d: am 894f2347: am 7364dcae: Merge "Add very basic CTS test cases for FingerprintManager" into mnc-dev | |
| 5336751 am 63a97273: am 4b93a2bf: am 1dc44de0: Merge "[SecurityTests] test for screen lock bound keys" into mnc-dev | |
| d8c6c31 am 0f01ebfb: am 9e44a3c7: am 089c6ed3: Merge "Update last public framework attribute to pass CTS test." into mnc-dev | |
| 55e9842 am 8d17964f: am ba497701: am 085d6012: Merge "Add UsageStatsManager#isAppInactive test" into mnc-dev | |
| 7e32d21 am 8e6661cb: am c0943ac0: am 30b2b78e: Merge "Revert "Assert that digest/padding NONE doesn\'t mean ANY."" into mnc-dev | |
| 21acbcf am 2a2d0c77: am 74a7caf1: am 1f3a90fa: Merge "Add Ble test cases to BuildCtsTemporarilyKnownFailureList." into mnc-dev | |
| 77030db am 078b2e25: am 1b5026a1: am f37253ef: Merge "Assert that digest/padding NONE doesn\'t mean ANY." into mnc-dev | |
| 3737159 am 9fa2b85b: am 057af1fa: am 5c04a866: Merge "Revert "add more logging to monkey seed test"" into mnc-dev | |
| 802a581 am 093a2123: am 34673b8b: Merge "Add a jank test with Leanback UI." into mnc-dev | |
| 4d2e3b3 am 0008277a: am e4bc918f: Merge "Add FEATURE_FINGERPRINT to PackageManager\'s feature list" into mnc-dev | |
| 912a623 am 47aafdb7: am 8ad06b49: Merge "media: fix potential memory leak in test." into mnc-dev | |
| dd30d2f am c8b5d884: am a18399f6: Merge "AudioRecordTest: Don\'t consider notifications after stop" into mnc-dev | |
| ffc96fa am fa85b7b1: am 6cf6c807: Merge "Revert "DO NOT MERGE media: collect frame time diff log for certain build"" into mnc-dev | |
| 12dc343 am ab0232a9: am 425b73d6: Merge "Tests to verify behavior of adoptable disks." into mnc-dev | |
| 9bc15a4 am c830ba49: am de98cf52: Merge "media: use small frame size for resource manager test." into mnc-dev | |
| 306a040 am b00e58fc: am ba2314e4: Merge "Add tests for ArraySet (newly made public in mnc)." into mnc-dev | |
| faec5db am 02d3aedb: am ba5bcc17: Merge "[SecurityTests] test for transactional fingerprint keys" into mnc-dev | |
| c885672 am 894f2347: am 7364dcae: Merge "Add very basic CTS test cases for FingerprintManager" into mnc-dev | |
| 63a9727 am 4b93a2bf: am 1dc44de0: Merge "[SecurityTests] test for screen lock bound keys" into mnc-dev | |
| 0f01ebf am 9e44a3c7: am 089c6ed3: Merge "Update last public framework attribute to pass CTS test." into mnc-dev | |
| 8d17964 am ba497701: am 085d6012: Merge "Add UsageStatsManager#isAppInactive test" into mnc-dev | |
| 8e6661c am c0943ac0: am 30b2b78e: Merge "Revert "Assert that digest/padding NONE doesn\'t mean ANY."" into mnc-dev | |
| 2a2d0c7 am 74a7caf1: am 1f3a90fa: Merge "Add Ble test cases to BuildCtsTemporarilyKnownFailureList." into mnc-dev | |
| 078b2e2 am 1b5026a1: am f37253ef: Merge "Assert that digest/padding NONE doesn\'t mean ANY." into mnc-dev | |
| 9fa2b85 am 057af1fa: am 5c04a866: Merge "Revert "add more logging to monkey seed test"" into mnc-dev | |
| 6f5a5e3 am 5eb531be: am 392304ed: am 0f19d7f6: Merge "Fix build: Revert "Add CTS tests for NDK tracing"" into mnc-dev | |
| c135de3 am 9b8a514c: am e4f25559: am e306bf44: Merge "Add CTS tests for NDK tracing" into mnc-dev | |
| fde00c5 am f835c73a: am 0fb56ec5: am 1aa05d6a: Merge "Remove Thread.sleep from device admin cts tests." into mnc-dev | |
| c590a14 am 2b49ade7: am 3cdcc761: am 68558e67: Merge "CTS-test Android Keystore raw RSA Cipher corner cases." into mnc-dev | |
| 73ffea6 am efea19b5: am b2769cbf: am 2c7ddfda: Merge "Cts tests for cross-profile app linking." into mnc-dev | |
| 08f578e am ce8ad026: am 63b5c75f: am e52bd3c2: Merge "Add UiAutomation test for runtime permissions" into mnc-dev | |
| 0096302 am 6fab1936: am ab6e2992: am a6ba6ca8: Merge "Fix flaky permission tests" into mnc-dev | |
| 6a138cd am d53bbeed: am 31f37674: am 3e81d4ee: Merge "videoperf: remove raw data logging" into mnc-dev | |
| 9c2f78b am 7e0e37b2: am df751194: am d95b38b7: Merge "Changes to support conference calls in CTS tests." into mnc-dev | |
| d2e86c1 am 9f85228d: am fb922c7c: am 1547e52e: Merge "Camera: check all required stream configurations" into mnc-dev | |
| 5eb531b am 392304ed: am 0f19d7f6: Merge "Fix build: Revert "Add CTS tests for NDK tracing"" into mnc-dev | |
| 9b8a514 am e4f25559: am e306bf44: Merge "Add CTS tests for NDK tracing" into mnc-dev | |
| f835c73 am 0fb56ec5: am 1aa05d6a: Merge "Remove Thread.sleep from device admin cts tests." into mnc-dev | |
| 2b49ade am 3cdcc761: am 68558e67: Merge "CTS-test Android Keystore raw RSA Cipher corner cases." into mnc-dev | |
| efea19b am b2769cbf: am 2c7ddfda: Merge "Cts tests for cross-profile app linking." into mnc-dev | |
| ce8ad02 am 63b5c75f: am e52bd3c2: Merge "Add UiAutomation test for runtime permissions" into mnc-dev | |
| 6fab193 am ab6e2992: am a6ba6ca8: Merge "Fix flaky permission tests" into mnc-dev | |
| d53bbee am 31f37674: am 3e81d4ee: Merge "videoperf: remove raw data logging" into mnc-dev | |
| 7e0e37b am df751194: am d95b38b7: Merge "Changes to support conference calls in CTS tests." into mnc-dev | |
| 9f85228 am fb922c7c: am 1547e52e: Merge "Camera: check all required stream configurations" into mnc-dev | |
| 368f236 am f496808e: am e461f3cc: am 42f0bc3c: Merge "Split out storage tests, get them running again." into mnc-dev | |
| f496808 am e461f3cc: am 42f0bc3c: Merge "Split out storage tests, get them running again." into mnc-dev | |
| c964551 am 4d45f85d: am 8506b569: am 0d0faba3: Merge "Make some tests more robust to orientation changes." into mnc-dev | |
| 4d45f85 am 8506b569: am 0d0faba3: Merge "Make some tests more robust to orientation changes." into mnc-dev | |
| 4e17536 am a460460b: am 6268de10: am aaaad647: DO NOT MERGE. Revert "Add Gamepad HID tests." | |
| a460460 am 6268de10: am aaaad647: DO NOT MERGE. Revert "Add Gamepad HID tests." | |
| 212266e am 6ca35a05: am edaad1c9: am 62540e2a: Merge "IME interferes with print UI tests" into mnc-dev | |
| fe75e8c am 2f3bfca8: am e4fdc279: am 4aa8a167: Merge "Revert "IME interferes with print UI tests"" into mnc-dev | |
| 6ca35a0 am edaad1c9: am 62540e2a: Merge "IME interferes with print UI tests" into mnc-dev | |
| 2f3bfca am e4fdc279: am 4aa8a167: Merge "Revert "IME interferes with print UI tests"" into mnc-dev | |
| aec6a48 am 2278ce2a: am 2de345de: am d72bc694: Merge "IME interferes with print UI tests" into mnc-dev | |
| 2278ce2 am 2de345de: am d72bc694: Merge "IME interferes with print UI tests" into mnc-dev | |
| f52e03a am cb20b4d0: am 9e69023e: am e5743abf: Merge "Add OpenSL ES multichannel record test" into mnc-dev | |
| cb20b4d am 9e69023e: am e5743abf: Merge "Add OpenSL ES multichannel record test" into mnc-dev | |
| 803a56a am 96c5850b: am b57ec986: am 7058632d: Merge "Add OpenSL ES multichannel playback test" into mnc-dev | |
| 96c5850 am b57ec986: am 7058632d: Merge "Add OpenSL ES multichannel playback test" into mnc-dev | |
| c53e1fb am 3e8ff45f: am fc084440: am 3756a253: Merge "Inital stubbing-in of OpenSLES tests." into mnc-dev | |
| 3e8ff45 am fc084440: am 3756a253: Merge "Inital stubbing-in of OpenSLES tests." into mnc-dev | |
| 4cfbc64 am ec6616d9: am df9b05fa: am 448557ef: Merge "Various updates to CTS coverage tool" into mnc-dev | |
| ec6616d am df9b05fa: am 448557ef: Merge "Various updates to CTS coverage tool" into mnc-dev | |
| 2a20d24 am 3b289598: am 4939a4b2: am 0a8b5143: Merge "Remove EventOrderingVerificationTest_testSameTimestamp" into mnc-dev | |
| 3b28959 am 4939a4b2: am 0a8b5143: Merge "Remove EventOrderingVerificationTest_testSameTimestamp" into mnc-dev | |
| 944d939 am 08a056fc: am a4636911: am 29043621: Merge "Verify signal strength and neighbor info for telephony." into mnc-dev | |
| 00fee4a am 2b58889a: am 5406184a: am e50cdc49: Merge "media: move timeout timer to the worker thread to unblock onCreate." into mnc-dev | |
| 08a056f am a4636911: am 29043621: Merge "Verify signal strength and neighbor info for telephony." into mnc-dev | |
| 2b58889 am 5406184a: am e50cdc49: Merge "media: move timeout timer to the worker thread to unblock onCreate." into mnc-dev | |
| 534458c am 0fc6048a: am 76366d3d: am dcee5a56: Merge "CameraITS: Update for FAST EE/NR expectations" into mnc-dev | |
| 0fc6048 am 76366d3d: am dcee5a56: Merge "CameraITS: Update for FAST EE/NR expectations" into mnc-dev | |
| e9e6253 am b649beca: am 56076146: am 322ac312: Merge "More CTS tests for Android Keystore HMACs." into mnc-dev | |
| b649bec am 56076146: am 322ac312: Merge "More CTS tests for Android Keystore HMACs." into mnc-dev | |
| 38b63ba am 039a95af: am 914de0dd: am 6af9068c: Merge "CTS-test Android Keystore primitives accept empty." into mnc-dev | |
| 039a95a am 914de0dd: am 6af9068c: Merge "CTS-test Android Keystore primitives accept empty." into mnc-dev | |
| 8a6080e am caccc600: am b59a695b: am be3d048c: CTS-test Android Keystore import supports required key sizes. | |
| caccc60 am b59a695b: am be3d048c: CTS-test Android Keystore import supports required key sizes. | |
| 5ae9239 am 24191849: am 950f7efe: am 6e6895ba: Merge "More CTS tests for Cipher with different key sizes." into mnc-dev | |
| 2419184 am 950f7efe: am 6e6895ba: Merge "More CTS tests for Cipher with different key sizes." into mnc-dev | |
| 36337f9 am 8fe2e596: am 13ca879f: am 47fede10: am bcc9e1ab: am 7e23f029: am f88ebb11: am 74da13d6: Merge "TIF: use term \'3rd-party\' instead of \'third-party\'" into lollipop-cts-dev automerge: 6ea7b78 | |
| 8fe2e59 am 13ca879f: am 47fede10: am bcc9e1ab: am 7e23f029: am f88ebb11: am 74da13d6: Merge "TIF: use term \'3rd-party\' instead of \'third-party\'" into lollipop-cts-dev automerge: 6ea7b78 | |
| f84bd63 am b44f0f6f: am 24115afd: am 49175aea: am 26fb5e4c: am 4fabed10: am d3303b5a: am 20c50498: Merge "Modified testRecorderCamera() to get camera supported resolution for testing." into kitkat-cts-dev automerge: 52a2733 automerge: 0d8dcd5 | |
| b44f0f6 am 24115afd: am 49175aea: am 26fb5e4c: am 4fabed10: am d3303b5a: am 20c50498: Merge "Modified testRecorderCamera() to get camera supported resolution for testing." into kitkat-cts-dev automerge: 52a2733 automerge: 0d8dcd5 | |
| 477fa1e am 7cdd2657: am 4c6686e4: am 8dcb307f: Merge "More CTS tests for ECDSA and RSA signatures." into mnc-dev | |
| 7cdd265 am 4c6686e4: am 8dcb307f: Merge "More CTS tests for ECDSA and RSA signatures." into mnc-dev | |
| 3c8c9db am d986105f: am bb2bca9a: am 7e8b1baf: Increase timeout when hitting external servers. | |
| d986105 am bb2bca9a: am 7e8b1baf: Increase timeout when hitting external servers. | |
| 032da81 am e8a22649: am dbf85208: am 751f7aad: Merge "CTS tests for CommandRequest & supportsCommands() API in VoiceInteractor." into mnc-dev | |
| 9b945bf am 6a94ab3b: am 17adf5aa: am be675066: Merge "Need to ask for both storage permissions." into mnc-dev | |
| e8a2264 am dbf85208: am 751f7aad: Merge "CTS tests for CommandRequest & supportsCommands() API in VoiceInteractor." into mnc-dev | |
| 6a94ab3 am 17adf5aa: am be675066: Merge "Need to ask for both storage permissions." into mnc-dev | |
| 7fd5fcd am 7729b780: am c363eb8b: am 781c5be7: Merge "New CTS test for ConnectivityManager.(un)registerNetworkCallback." into mnc-dev | |
| 7729b78 am c363eb8b: am 781c5be7: Merge "New CTS test for ConnectivityManager.(un)registerNetworkCallback." into mnc-dev | |
| b86ec39 am 9e268d73: am b7c0e3b2: am 9f6c8146: Merge "Turn on verbose logging to debug flaky test cases" into mnc-dev | |
| 9e268d7 am b7c0e3b2: am 9f6c8146: Merge "Turn on verbose logging to debug flaky test cases" into mnc-dev | |
| a939bb0 am 19a9ef7f: am bc712f88: am 7597faa9: Merge "media: handle MediaSyncTest video decoder callbacks on a separate thread" into mnc-dev | |
| 19a9ef7 am bc712f88: am 7597faa9: Merge "media: handle MediaSyncTest video decoder callbacks on a separate thread" into mnc-dev | |
| 28742ff am 132a6e97: am b3cd6a15: am 84e680ab: am 790a8e1c: am cd758f62: am 8c34f39c: am 75a568d1: Merge "TIF: use \'TV app\' instead of \'Live Channels\'" into lollipop-cts-dev automerge: 7f2984f | |
| 1c028de am 832c1881: am c33012a8: am 4cd827e0: Merge "Add logging statements to debug hangs." into mnc-dev | |
| 132a6e9 am b3cd6a15: am 84e680ab: am 790a8e1c: am cd758f62: am 8c34f39c: am 75a568d1: Merge "TIF: use \'TV app\' instead of \'Live Channels\'" into lollipop-cts-dev automerge: 7f2984f | |
| 832c188 am c33012a8: am 4cd827e0: Merge "Add logging statements to debug hangs." into mnc-dev | |
| 5a78584 am bc8f67b1: am 63a86223: am b6121206: Revert "Track rename of compatibility-device-util" | |
| bc8f67b am 63a86223: am b6121206: Revert "Track rename of compatibility-device-util" | |
| bd089bd am 63295fcb: am de6f0145: am da9312b4: Track rename of compatibility-device-util | |
| 63295fc am de6f0145: am da9312b4: Track rename of compatibility-device-util | |
| 274356c am 0050b85f: am 36287e8f: am 2f2f69a1: Merge "DO NOT MERGE media: collect frame time diff log for certain build" into mnc-dev | |
| 1b1a18c am ce599320: am adc0062b: am e14dc28e: Unbreak SecretKeySpec CTS test. | |
| 0050b85 am 36287e8f: am 2f2f69a1: Merge "DO NOT MERGE media: collect frame time diff log for certain build" into mnc-dev | |
| ce59932 am adc0062b: am e14dc28e: Unbreak SecretKeySpec CTS test. | |
| 802e3ba am 6bb2e1e6: am 1e5b148a: am 9462a7f1: Merge "CTS-test that HMAC key can be authorized for one digest only." into mnc-dev | |
| 8435feb am 45511f25: am aefff64a: am edbf1334: Merge "Tests for managed WiFi deleting on owner removal" into mnc-dev | |
| 6bb2e1e am 1e5b148a: am 9462a7f1: Merge "CTS-test that HMAC key can be authorized for one digest only." into mnc-dev | |
| 45511f2 am aefff64a: am edbf1334: Merge "Tests for managed WiFi deleting on owner removal" into mnc-dev | |
| dfe5137 am 33bda2db: am ae45058d: am 55d5d81a: Merge "media: deliver report to host" into mnc-dev | |
| 33bda2d am ae45058d: am 55d5d81a: Merge "media: deliver report to host" into mnc-dev | |
| 931905f am cb8e8767: am 71c3cbff: am 03645f8f: Merge "Sensor CTS fixes" into mnc-dev | |
| cb8e876 am 71c3cbff: am 03645f8f: Merge "Sensor CTS fixes" into mnc-dev | |
| c4d7de0 am dac45891: am 85fa4a77: am 70dee7da: am a211c7db: am d3dde803: am 7d113ea3: am 0f851e71: Merge "CtsVerifier: update mPreviewTex in case of mismatch with mFormatView" into jb-mr1.1-cts-dev automerge: db2f7f4 automerge: 8236bcd automerge: 675f1cc automerge: 37581fa | |
| 6d51423 am 7da24fb9: am 74359019: am d6e1b19c: am 9398328f: am 7164fa31: am 03b84ca4: am cda2560f: Merge "Handling NPE in case of AVC level under 2" into kitkat-cts-dev automerge: d84cacb -s ours automerge: d830264 | |
| dac4589 am 85fa4a77: am 70dee7da: am a211c7db: am d3dde803: am 7d113ea3: am 0f851e71: Merge "CtsVerifier: update mPreviewTex in case of mismatch with mFormatView" into jb-mr1.1-cts-dev automerge: db2f7f4 automerge: 8236bcd automerge: 675f1cc automerge: 37581fa | |
| 7da24fb am 74359019: am d6e1b19c: am 9398328f: am 7164fa31: am 03b84ca4: am cda2560f: Merge "Handling NPE in case of AVC level under 2" into kitkat-cts-dev automerge: d84cacb -s ours automerge: d830264 | |
| f6d5e02 am 10266540: am fe39bede: am 95a9e4a0: Merge "CTS tests for entropy consumption by Cipher and Signature." into mnc-dev | |
| d09b4c3 am bd613c75: am 0bd5c1c0: am 736d5b80: Merge "Remove accidental System.out.println." into mnc-dev | |
| 1026654 am fe39bede: am 95a9e4a0: Merge "CTS tests for entropy consumption by Cipher and Signature." into mnc-dev | |
| bd613c7 am 0bd5c1c0: am 736d5b80: Merge "Remove accidental System.out.println." into mnc-dev | |
| a4d13e6 am a82abcf4: am 9e88c10c: am 5fa5496f: Merge "Fixed UserDictionary_WordsTest" into mnc-dev | |
| a82abcf am 9e88c10c: am 5fa5496f: Merge "Fixed UserDictionary_WordsTest" into mnc-dev | |
| a858a9f am ed1a37b1: am f30532d4: am 85d33ed5: Merge "media: test with platform limit instead of reported limit" into mnc-dev | |
| e5e515f am 2cea7e84: am 76e9138f: am 94541e38: Merge "videoperf: specify timeout for VideoEncoderDecoderTest" into mnc-dev | |
| e53a11a am 46509aaf: am a95a3200: am 59e07f95: Merge "media: release codec in the case of exception" into mnc-dev | |
| ed1a37b am f30532d4: am 85d33ed5: Merge "media: test with platform limit instead of reported limit" into mnc-dev | |
| 2cea7e8 am 76e9138f: am 94541e38: Merge "videoperf: specify timeout for VideoEncoderDecoderTest" into mnc-dev | |
| 46509aa am a95a3200: am 59e07f95: Merge "media: release codec in the case of exception" into mnc-dev | |
| be603e6 am 3fae4215: am 4156442e: am 8cac2d90: Merge "New CTS test for ConnectivityManager.getActiveNetwork." into mnc-dev | |
| 3fae421 am 4156442e: am 8cac2d90: Merge "New CTS test for ConnectivityManager.getActiveNetwork." into mnc-dev | |
| 0d0256f am fd1ad86d: am d03cd44c: am 5b769438: Merge "Added more logging to permissions tests" into mnc-dev | |
| fd1ad86 am d03cd44c: am 5b769438: Merge "Added more logging to permissions tests" into mnc-dev | |
| 24d3e32 am 20b784f5: am 4339416c: am e0762464: Merge "Add LLCP version check for M or later." into mnc-dev | |
| 20b784f am 4339416c: am e0762464: Merge "Add LLCP version check for M or later." into mnc-dev | |
| 85ce4a5 am 4bf94c9a: am 838c0159: am 5afbad4d: Merge "mark TAG as final so they don\'t get nullified between test methods" into mnc-dev | |
| 4bf94c9 am 838c0159: am 5afbad4d: Merge "mark TAG as final so they don\'t get nullified between test methods" into mnc-dev | |
| 7d49c8c am fccf70c5: am 0e5443e6: am f0db2699: Merge "CTS: Fix VM-tests new-instance VFE7 test" into mnc-dev | |
| fccf70c am 0e5443e6: am f0db2699: Merge "CTS: Fix VM-tests new-instance VFE7 test" into mnc-dev | |
| a1e3652 am 9e2728c2: am 30e66626: am ee99e2a1: am ce9769b4: am acc1b752: am 4792a1fe: am 3ff1216c: Merge "Fix CTS verifier camera orientation test." into kitkat-cts-dev automerge: 674617f automerge: d6e0ed1 | |
| 9e2728c am 30e66626: am ee99e2a1: am ce9769b4: am acc1b752: am 4792a1fe: am 3ff1216c: Merge "Fix CTS verifier camera orientation test." into kitkat-cts-dev automerge: 674617f automerge: d6e0ed1 | |
| 4269146 am 2086b41d: am 2078ed59: am d4279c88: Merge "CTS Verifier test for Audio Loopback Latency" into mnc-dev | |
| 05910f8 am 303489d8: am 0e31a492: am 4f9551a0: Merge "Assert WebView works with Android Keystore keys for client certs." into mnc-dev | |
| 2086b41 am 2078ed59: am d4279c88: Merge "CTS Verifier test for Audio Loopback Latency" into mnc-dev | |
| 303489d am 0e31a492: am 4f9551a0: Merge "Assert WebView works with Android Keystore keys for client certs." into mnc-dev | |
| b7057c7 am 69da6df6: am 0d6674e0: am 2f734960: am 3b1f5dcb: am f1f5c2de: am 8e17dcf8: am 9aa7a21a: Merge "Revert "Check for microphone feature in video camera recording tests."" into kitkat-cts-dev automerge: 1f6e28c -s ours automerge: 424644f | |
| 8c9f5a8 am f52765fd: am d34a53ce: am 75c8bd04: am 95693023: am a55fc69e: am 1297653c: am 910fe63f: Merge "Revert "Update CTS Verifier camera video tests to check for a microphone in camera video recording tests."" into kitkat-cts-dev automerge: 3323726 automerge: ef8b550 | |
| a948636 am 9dd39fba: am fdd292a3: am 42576a40: am 12c67372: am 03416610: am f982dd78: am dfe68ad5: Merge "MediaRecorderStressTest: use smallest supported preview size." into kitkat-cts-dev automerge: beaa1c1 automerge: 43772d1 | |
| 866a98b am e6405be9: am 19bf4c8e: am 13fda6e4: am 438ae843: am b633ca60: am 8455ab44: am 34bdc963: Merge "Update CTS Verifier camera video tests to check for a microphone in camera video recording tests." into kitkat-cts-dev automerge: b5b05ae automerge: 557dddb | |
| 49c4c17 am 65f71009: am 4f5e61e7: am fbe3acb4: am 09ae6083: am 9d9a014c: am dd8019ab: am 06a59630: Merge "Check for microphone feature in video camera recording tests." into kitkat-cts-dev automerge: 72893be -s ours automerge: a9bb8ed | |
| 91b2f64 am bc7087b7: am dce16af9: am 347a176e: am 52f025a5: am 03bc8b12: am e55d32ee: am 532edee0: Merge "Change assertcode of checkSignalStrength in DumpsysHostTest" into lollipop-cts-dev automerge: d2162c8 | |
| 7d46164 am 409e99df: am 9e707281: am a91e732c: am af96c051: am f8049bd6: am c72f1040: am da00b7ac: Merge "Fix bugs regarding AdapterView layout size with large font scale in AdapterViewTest" into jb-mr1.1-cts-dev automerge: ca0d846 automerge: 30e83c0 automerge: 76c8e3d autome | |
| 0d18ce7 am 53acdb4e: am 7531c80c: am 4ecdced3: am 725ef4f2: am ff17c0d0: am 7e29ca7e: am 2ea4182f: Merge "Revert "Fix android.webkit.cts.WebViewTest#testFindNext seldom fail"" into jb-mr1.1-cts-dev automerge: 7e9df5b automerge: e167a31 automerge: 1aa503c automerge: e866e41 | |
| 69da6df am 0d6674e0: am 2f734960: am 3b1f5dcb: am f1f5c2de: am 8e17dcf8: am 9aa7a21a: Merge "Revert "Check for microphone feature in video camera recording tests."" into kitkat-cts-dev automerge: 1f6e28c -s ours automerge: 424644f | |
| f52765f am d34a53ce: am 75c8bd04: am 95693023: am a55fc69e: am 1297653c: am 910fe63f: Merge "Revert "Update CTS Verifier camera video tests to check for a microphone in camera video recording tests."" into kitkat-cts-dev automerge: 3323726 automerge: ef8b550 | |
| 9dd39fb am fdd292a3: am 42576a40: am 12c67372: am 03416610: am f982dd78: am dfe68ad5: Merge "MediaRecorderStressTest: use smallest supported preview size." into kitkat-cts-dev automerge: beaa1c1 automerge: 43772d1 | |
| e6405be am 19bf4c8e: am 13fda6e4: am 438ae843: am b633ca60: am 8455ab44: am 34bdc963: Merge "Update CTS Verifier camera video tests to check for a microphone in camera video recording tests." into kitkat-cts-dev automerge: b5b05ae automerge: 557dddb | |
| 65f7100 am 4f5e61e7: am fbe3acb4: am 09ae6083: am 9d9a014c: am dd8019ab: am 06a59630: Merge "Check for microphone feature in video camera recording tests." into kitkat-cts-dev automerge: 72893be -s ours automerge: a9bb8ed | |
| bc7087b am dce16af9: am 347a176e: am 52f025a5: am 03bc8b12: am e55d32ee: am 532edee0: Merge "Change assertcode of checkSignalStrength in DumpsysHostTest" into lollipop-cts-dev automerge: d2162c8 | |
| 409e99d am 9e707281: am a91e732c: am af96c051: am f8049bd6: am c72f1040: am da00b7ac: Merge "Fix bugs regarding AdapterView layout size with large font scale in AdapterViewTest" into jb-mr1.1-cts-dev automerge: ca0d846 automerge: 30e83c0 automerge: 76c8e3d automerge: fde9054 | |
| 53acdb4 am 7531c80c: am 4ecdced3: am 725ef4f2: am ff17c0d0: am 7e29ca7e: am 2ea4182f: Merge "Revert "Fix android.webkit.cts.WebViewTest#testFindNext seldom fail"" into jb-mr1.1-cts-dev automerge: 7e9df5b automerge: e167a31 automerge: 1aa503c automerge: e866e41 | |
| 9433e46 am 87d4d357: am d8b27c0b: am 6d616edb: Merge "Add connection tests" into mnc-dev | |
| 87d4d35 am d8b27c0b: am 6d616edb: Merge "Add connection tests" into mnc-dev | |
| 8444260 am 9d8ab01d: am bb34bbaf: am a7eb3844: am 1583dca5: am b5010ce1: am 4e7386bd: am f10c7fad: Merge "Fix CTS build" into lollipop-cts-dev automerge: f6b2775 | |
| 9d8ab01 am bb34bbaf: am a7eb3844: am 1583dca5: am b5010ce1: am 4e7386bd: am f10c7fad: Merge "Fix CTS build" into lollipop-cts-dev automerge: f6b2775 | |
| af448be am 8c8e990f: am 5fb5abb8: am e1450592: Merge "Test that modifications made by kernels to input arguments are not reflected back in the Allocation." into mnc-dev | |
| 8c8e990 am 5fb5abb8: am e1450592: Merge "Test that modifications made by kernels to input arguments are not reflected back in the Allocation." into mnc-dev | |
| 512df52 am 525d2597: am d57e21f4: am a8a7282c: Merge "Fix CTS build" into mnc-dev | |
| e00b10a am c56923d0: am fc48292f: am 0c0b57d3: Merge "Fix AbsListViewTest.testSetOnScrollListener()" into mnc-dev | |
| 525d259 am d57e21f4: am a8a7282c: Merge "Fix CTS build" into mnc-dev | |
| c56923d am fc48292f: am 0c0b57d3: Merge "Fix AbsListViewTest.testSetOnScrollListener()" into mnc-dev | |
| 8855f0e am 208f169c: am d904a049: am 2f768b04: am 5c388615: am 37701d73: am 1b7d441c: am c25b1b5e: Merge "Adding 53024, NZC as it does not support report delivery." into kitkat-cts-dev automerge: de56635 automerge: 74338c1 | |
| 609b0ad am 2cc166a1: am 58392f8a: am 00ab19b1: am f8accbd8: am 191214cc: am e51fb92a: am 9b379ec1: Merge "CtsUiAutomatorTest pinchin/pinout test case: add support for 480X320 pixel solution device. The pinchin/pinout test need the device solution bigger than ***X400. This is | |
| 6c97ba8 am c7939e14: am 1cb927fe: am 46a3b3dd: am f85cbad8: am 21341494: am 4ed821c5: am 0f1d4b95: Merge "Fix CTS android.provider package testAccountRemovalWithMergedContact_doesNotDeleteContactAndTimestampUpdated seldom fail issue" into jb-mr2-cts-dev automerge: fcd7cb7 aut | |
| d16d07a am 13e1b33f: am 9601ba63: am 7cdd1514: am 231657df: (-s ours) am 495adcaa: am 2f594332: am 2e321bcc: (-s ours) Merge "DO NOT MERGE: Mimmum application memory should be 96MB" into kitkat-cts-dev automerge: 09c6bcf -s ours automerge: 906578c | |
| e5fa89f am 1b202910: am a836fc55: am bfe2ee46: am 5695eb5b: am befe5feb: am 09db5570: am d264fc1f: Merge "DEV HACK: cts: increase permitted colour delta" into kitkat-cts-dev automerge: 52948ac automerge: 0ff36b1 | |
| e07bdb6 am 08f44722: am 7db4b8e6: am 2e2c2418: am 2ab45572: am d8220e55: am 9a032e01: am d1df4f6e: Merge "Fix android.webkit.cts.WebViewTest#testFindNext seldom fail" into jb-mr1.1-cts-dev automerge: b28682b automerge: 7032ac7 automerge: 3efc0e5 automerge: dcdb68d | |
| e3552c6 am 948f41ce: am 4f42ec1d: am fc09cd21: am a36a627b: am 9581ce5e: am 02ec9974: am 944793c9: Merge "Fix CTS com.android.cts.videoperf.VideoEncoderDecoderTest issue" into kitkat-cts-dev automerge: ef92ab3 -s ours automerge: 451b577 | |
| ec616f2 am 224b6611: am 9f0c649c: am 5726f084: am a2d0b115: am af2c3cf0: am f30ce37f: am dab0bd91: Merge "Update lists of OpenMobileCommuticaton operators" into kitkat-cts-dev automerge: 3aac281 automerge: c09bc3f | |
| c4286ed am b7b40725: am f34080c0: am a0090ec7: am 445b4631: am 306c79ba: am 0b3abbb8: am 0d894a9e: Merge "Verify the failed test case of CTS for WebView" into kitkat-cts-dev automerge: 7228fac -s ours automerge: 39e0e01 | |
| 45d34d5 am ebf5b4ba: am 6a80b07f: am 6a793dac: am 265d3b21: am b3b402b8: am f3e7c9d9: am 3071e7ae: Merge "Improve the usability of CTS Verifier "Camera Formats"" into kitkat-cts-dev automerge: f54af35 -s ours automerge: e2a2343 | |
| 849341f am e0e07137: am 2494aa7b: am 5bc1d25c: am 6703fc92: am 2507dec3: am eb0ef89b: am 4967c3e7: Merge "Use Supported Camera resolution." into kitkat-cts-dev automerge: 628c43a -s ours automerge: dbdeb0f | |
| 208f169 am d904a049: am 2f768b04: am 5c388615: am 37701d73: am 1b7d441c: am c25b1b5e: Merge "Adding 53024, NZC as it does not support report delivery." into kitkat-cts-dev automerge: de56635 automerge: 74338c1 | |
| 2cc166a am 58392f8a: am 00ab19b1: am f8accbd8: am 191214cc: am e51fb92a: am 9b379ec1: Merge "CtsUiAutomatorTest pinchin/pinout test case: add support for 480X320 pixel solution device. The pinchin/pinout test need the device solution bigger than ***X400. This is hardcode in t | |
| c7939e1 am 1cb927fe: am 46a3b3dd: am f85cbad8: am 21341494: am 4ed821c5: am 0f1d4b95: Merge "Fix CTS android.provider package testAccountRemovalWithMergedContact_doesNotDeleteContactAndTimestampUpdated seldom fail issue" into jb-mr2-cts-dev automerge: fcd7cb7 automerge: c73d8 | |
| 13e1b33 am 9601ba63: am 7cdd1514: am 231657df: (-s ours) am 495adcaa: am 2f594332: am 2e321bcc: (-s ours) Merge "DO NOT MERGE: Mimmum application memory should be 96MB" into kitkat-cts-dev automerge: 09c6bcf -s ours automerge: 906578c | |
| 1b20291 am a836fc55: am bfe2ee46: am 5695eb5b: am befe5feb: am 09db5570: am d264fc1f: Merge "DEV HACK: cts: increase permitted colour delta" into kitkat-cts-dev automerge: 52948ac automerge: 0ff36b1 | |
| 08f4472 am 7db4b8e6: am 2e2c2418: am 2ab45572: am d8220e55: am 9a032e01: am d1df4f6e: Merge "Fix android.webkit.cts.WebViewTest#testFindNext seldom fail" into jb-mr1.1-cts-dev automerge: b28682b automerge: 7032ac7 automerge: 3efc0e5 automerge: dcdb68d | |
| 948f41c am 4f42ec1d: am fc09cd21: am a36a627b: am 9581ce5e: am 02ec9974: am 944793c9: Merge "Fix CTS com.android.cts.videoperf.VideoEncoderDecoderTest issue" into kitkat-cts-dev automerge: ef92ab3 -s ours automerge: 451b577 | |
| 224b661 am 9f0c649c: am 5726f084: am a2d0b115: am af2c3cf0: am f30ce37f: am dab0bd91: Merge "Update lists of OpenMobileCommuticaton operators" into kitkat-cts-dev automerge: 3aac281 automerge: c09bc3f | |
| b7b4072 am f34080c0: am a0090ec7: am 445b4631: am 306c79ba: am 0b3abbb8: am 0d894a9e: Merge "Verify the failed test case of CTS for WebView" into kitkat-cts-dev automerge: 7228fac -s ours automerge: 39e0e01 | |
| ebf5b4b am 6a80b07f: am 6a793dac: am 265d3b21: am b3b402b8: am f3e7c9d9: am 3071e7ae: Merge "Improve the usability of CTS Verifier "Camera Formats"" into kitkat-cts-dev automerge: f54af35 -s ours automerge: e2a2343 | |
| e0e0713 am 2494aa7b: am 5bc1d25c: am 6703fc92: am 2507dec3: am eb0ef89b: am 4967c3e7: Merge "Use Supported Camera resolution." into kitkat-cts-dev automerge: 628c43a -s ours automerge: dbdeb0f | |
| 1f8958f am e5176e5f: am 77558cb5: am f2c365e4: Merge "Add tests for C++ vector reflection in RenderScript." into mnc-dev | |
| 511f757 am 10f11eff: am 9ab43486: am 740e52aa: Merge "RenderScript cts: Fix issues related to concurrency." into mnc-dev | |
| 608706e am 309359aa: am 38489303: am 79782882: am c9127db6: am d3bb31e9: am 1a0ae5fa: am 6017872d: Merge "Adjust 480p ratio range in CameraVideoActivity.java." into kitkat-cts-dev automerge: c282df3 automerge: 6444b0f | |
| c4e24e0 am 21effa0a: am ae084bc2: am 0612a389: am a20a516d: am 7a7a49db: am 1140944e: am ae2989a5: Merge "AbiTest: Include QDSP6 ELF binaries in validity check" into kitkat-cts-dev automerge: 639522d -s ours automerge: 44fed25 | |
| 7586292 am 91de6458: am d3d94e66: am ed48991a: am 1cfca89c: am 94079893: am 00ce144e: am fb7eb117: Merge "Remove bad test cases from MemoryFileTest." into kitkat-cts-dev automerge: 36db51e automerge: e17becc | |
| 4566db2 am 7e1545f9: am 856e2aba: am 94cbf337: am ecc799c6: am c0b670b7: am 4e0a94f5: am 0e909b04: Merge "Skip encoding tests for unsupported resolutions." into kitkat-cts-dev automerge: f34f376 -s ours automerge: c0cc7ed | |
| 177e30a am abab974c: am de7a4802: am d909071d: am c9f86eaf: (-s ours) am c2f240e1: am 18d19445: am 51c10bac: Merge "Fix configure check regarding AdaptivePlayback ReconfigDrcTest." into kitkat-cts-dev automerge: 4d7e03f automerge: d62c086 | |
| 2f161e3 am 04f85a10: am 0e4441b8: am d5d4cfc0: am a59ccea5: am 326b5f3d: am d5fb0d60: am 0ca5bbe9: Merge "improve TestVirtualDisplayRecycles to reduce memory usage" into kitkat-cts-dev automerge: ba39064 automerge: 83ca91c | |
| ff66652 am 8934302a: am b8dae867: am 82eeb6ab: am 32ca0c85: am a3ad2551: am e2050200: am 5ff6fde9: Merge "Fix bugs regarding Camera Video test" into kitkat-cts-dev automerge: 7951d40 automerge: 19b8f3b | |
| 11fc5ab am d619018e: am c92c2780: am 551d670f: am c24eb6ba: am e2e09783: am 183662b8: am 58b7fa1a: Merge "resolve merge conflicts of 930a3b5 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75 automerge: c881940 | |
| 28a8bee am 1a52279d: am 68fd9576: am b177ff6a: am 71a2cc8a: am 8dda264a: am 627e9977: am 973c7367: Merge "Chage the timeout while rendering to overcome the low performance device." into kitkat-cts-dev automerge: a6b1e10 -s ours automerge: 65fbe1f | |
| b889c64 am 59894b49: am e0bb06ca: am 0a887be5: am 147394e6: am 4d4737cb: am 3aee4ab5: am 9f56ec57: Merge "CTS: Add check for same sensor event timestamp" into lollipop-cts-dev automerge: a6cc0a8 | |
| 85de4cc am 55b2f8f8: am 246f1c65: am ef99cad7: am 9fb26c15: am 6025e68f: am 2a9b8389: am 40ce78e6: Merge "Added 5.0 to expected VERSION_RELEASE." into lollipop-cts-dev automerge: 38c0699 -s ours | |
| e5176e5 am 77558cb5: am f2c365e4: Merge "Add tests for C++ vector reflection in RenderScript." into mnc-dev | |
| 10f11ef am 9ab43486: am 740e52aa: Merge "RenderScript cts: Fix issues related to concurrency." into mnc-dev | |
| 309359a am 38489303: am 79782882: am c9127db6: am d3bb31e9: am 1a0ae5fa: am 6017872d: Merge "Adjust 480p ratio range in CameraVideoActivity.java." into kitkat-cts-dev automerge: c282df3 automerge: 6444b0f | |
| 21effa0 am ae084bc2: am 0612a389: am a20a516d: am 7a7a49db: am 1140944e: am ae2989a5: Merge "AbiTest: Include QDSP6 ELF binaries in validity check" into kitkat-cts-dev automerge: 639522d -s ours automerge: 44fed25 | |
| 91de645 am d3d94e66: am ed48991a: am 1cfca89c: am 94079893: am 00ce144e: am fb7eb117: Merge "Remove bad test cases from MemoryFileTest." into kitkat-cts-dev automerge: 36db51e automerge: e17becc | |
| 7e1545f am 856e2aba: am 94cbf337: am ecc799c6: am c0b670b7: am 4e0a94f5: am 0e909b04: Merge "Skip encoding tests for unsupported resolutions." into kitkat-cts-dev automerge: f34f376 -s ours automerge: c0cc7ed | |
| abab974 am de7a4802: am d909071d: am c9f86eaf: (-s ours) am c2f240e1: am 18d19445: am 51c10bac: Merge "Fix configure check regarding AdaptivePlayback ReconfigDrcTest." into kitkat-cts-dev automerge: 4d7e03f automerge: d62c086 | |
| 04f85a1 am 0e4441b8: am d5d4cfc0: am a59ccea5: am 326b5f3d: am d5fb0d60: am 0ca5bbe9: Merge "improve TestVirtualDisplayRecycles to reduce memory usage" into kitkat-cts-dev automerge: ba39064 automerge: 83ca91c | |
| 8934302 am b8dae867: am 82eeb6ab: am 32ca0c85: am a3ad2551: am e2050200: am 5ff6fde9: Merge "Fix bugs regarding Camera Video test" into kitkat-cts-dev automerge: 7951d40 automerge: 19b8f3b | |
| d619018 am c92c2780: am 551d670f: am c24eb6ba: am e2e09783: am 183662b8: am 58b7fa1a: Merge "resolve merge conflicts of 930a3b5 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75 automerge: c881940 | |
| 1a52279 am 68fd9576: am b177ff6a: am 71a2cc8a: am 8dda264a: am 627e9977: am 973c7367: Merge "Chage the timeout while rendering to overcome the low performance device." into kitkat-cts-dev automerge: a6b1e10 -s ours automerge: 65fbe1f | |
| 59894b4 am e0bb06ca: am 0a887be5: am 147394e6: am 4d4737cb: am 3aee4ab5: am 9f56ec57: Merge "CTS: Add check for same sensor event timestamp" into lollipop-cts-dev automerge: a6cc0a8 | |
| 55b2f8f am 246f1c65: am ef99cad7: am 9fb26c15: am 6025e68f: am 2a9b8389: am 40ce78e6: Merge "Added 5.0 to expected VERSION_RELEASE." into lollipop-cts-dev automerge: 38c0699 -s ours | |
| e1d6b96 am 1a1dc28d: am 598cef94: am 390ec050: Merge "Revert "media: deliver test report to host."" into mnc-dev | |
| 51abf08 am 00d7a25b: am 9cb87076: am 1930106a: Tests to verify relaxed DownloadManager behavior. | |
| 1a1dc28 am 598cef94: am 390ec050: Merge "Revert "media: deliver test report to host."" into mnc-dev | |
| 00d7a25 am 9cb87076: am 1930106a: Tests to verify relaxed DownloadManager behavior. | |
| 0d78b0c am d144f24c: am 69280fe2: am 355b56db: Merge "use locked orientation instead of "nosensor"" into mnc-dev | |
| d144f24 am 69280fe2: am 355b56db: Merge "use locked orientation instead of "nosensor"" into mnc-dev | |
| 3143d65 am a78b55e7: am 37256b7a: am d9b3118b: Merge "Add tests for several special Shader usages" into mnc-dev | |
| 66062fd am 5653fa39: am c096776b: am 96d11e53: Merge "CTS tests for Android Keystore KeyFactory and SecretKeyFactory." into mnc-dev | |
| bdb11fd am 5c2fe045: am cedd89c5: am d3c2ed8e: Merge "Make Telecom CTS coverage more accurate" into mnc-dev | |
| 2dd3cb0 am 6853b728: am 95b9f383: am 179b284d: Merge "Flesh out more data objects tests" into mnc-dev | |
| a78b55e am 37256b7a: am d9b3118b: Merge "Add tests for several special Shader usages" into mnc-dev | |
| 5653fa3 am c096776b: am 96d11e53: Merge "CTS tests for Android Keystore KeyFactory and SecretKeyFactory." into mnc-dev | |
| 5c2fe04 am cedd89c5: am d3c2ed8e: Merge "Make Telecom CTS coverage more accurate" into mnc-dev | |
| 6853b72 am 95b9f383: am 179b284d: Merge "Flesh out more data objects tests" into mnc-dev | |
| 4713a1b am b75f1bf2: am 7e9f3ac6: am 5dab5884: Merge "media: add more resource manager tests to cover secure codec cases." into mnc-dev | |
| b75f1bf am 7e9f3ac6: am 5dab5884: Merge "media: add more resource manager tests to cover secure codec cases." into mnc-dev | |
| 7abfde3 am 2141ba51: am a03f5d18: am a3ddf528: Merge "Fix a typo" into mnc-dev | |
| 2141ba5 am a03f5d18: am a3ddf528: Merge "Fix a typo" into mnc-dev | |
| 932fb29 am 9e2da669: am 624dbda9: am 60436f94: Merge "TIF: remove test for READ_EPG which is deprecated in M" into mnc-dev | |
| 53a5a17 am 3b17552a: am d2659446: am db81ef57: Merge "Revert "TIF: remove READ_EPG and WRITE_EPG permission related code from CTS"" into mnc-dev | |
| bcb468b am 0d10006b: am 649f07f0: am 253b8213: Merge "CTS tests for AlarmClock: SET_ALARM, DISMISS_ALARM, SNOOZE_ALARM" into mnc-dev | |
| 9e2da66 am 624dbda9: am 60436f94: Merge "TIF: remove test for READ_EPG which is deprecated in M" into mnc-dev | |
| 3b17552 am d2659446: am db81ef57: Merge "Revert "TIF: remove READ_EPG and WRITE_EPG permission related code from CTS"" into mnc-dev | |
| 0d10006 am 649f07f0: am 253b8213: Merge "CTS tests for AlarmClock: SET_ALARM, DISMISS_ALARM, SNOOZE_ALARM" into mnc-dev | |
| 9c71bc9 am 5001dc04: am 846b41ce: am 2580684c: am 92fa0aa4: am 31c42f68: am df43304d: am 4260d509: Merge "Fix CTS android.app package testSetDismissMessage seldom fail issue" into kitkat-cts-dev automerge: 5f7e625 automerge: 06d53ec | |
| 5001dc0 am 846b41ce: am 2580684c: am 92fa0aa4: am 31c42f68: am df43304d: am 4260d509: Merge "Fix CTS android.app package testSetDismissMessage seldom fail issue" into kitkat-cts-dev automerge: 5f7e625 automerge: 06d53ec | |
| 93f3de8 am b778935f: (-s ours) am f3eef9b2: (-s ours) am 0e972823: (-s ours) Merge "DO NOT MERGE ANYWHERE: mark known failure camera tests" into mnc-dev | |
| b778935 am f3eef9b2: (-s ours) am 0e972823: (-s ours) Merge "DO NOT MERGE ANYWHERE: mark known failure camera tests" into mnc-dev | |
| b8d9575 am 95d27bd3: am 84f15d2b: am 0badf11f: am d1442e1c: am 9f9c04f9: am f52749d3: am 28129e86: Merge "TIF: add query perf tests for a channel/program Uri in TvProviderPerfTest" into lollipop-mr1-cts-dev | |
| 95d27bd am 84f15d2b: am 0badf11f: am d1442e1c: am 9f9c04f9: am f52749d3: am 28129e86: Merge "TIF: add query perf tests for a channel/program Uri in TvProviderPerfTest" into lollipop-mr1-cts-dev | |
| 9e6ebc8 am db5e4584: am 16bd47b0: am 56e1864b: Merge "CTS tests for Android Keystore key generation." into mnc-dev | |
| c140039 am 45de3889: am 163ad8a0: am 7afb44a1: Merge "CameraITS: Test ZSL EE and NR modes" into mnc-dev | |
| 98dfe82 am 72014c6c: am e849ff69: am 329862dc: Merge "CTS tests for Android Keystore AES 192 and 256." into mnc-dev | |
| f686b3d am e107f712: am 9cb24652: am 280c423a: Merge "CTS tests for Android Keystore-backed Cipher." into mnc-dev | |
| 79461f4 am d27fcf9b: am a98ad3d0: am 95f20c5c: Merge "CTS: Adds conditions to bypass FileSystemPermissionTest.testDeviceTreeCpuCurrent" into mnc-dev | |
| 71e601d am c4d3aa9a: am 566b300d: am 590a39c9: Merge "MediaSyncTest: use float for playback rate tolerance to keep consistent with others." into mnc-dev | |
| 060e50f am 39f00efd: am 726a002a: am 60792eff: Merge "Additional CTS tests for Android Keystore AES GCM." into mnc-dev | |
| 8fccae0 am 9ead040e: am e9272ecb: am 44584495: Merge "Tests to verify runtime storage permissions." into mnc-dev | |
| 85e1641 am e6537e65: am 5892251a: am c1a9bfa5: Merge "media: deliver test report to host." into mnc-dev | |
| 82797e9 am 8a32619a: am 4b6e5122: am b0962c0a: Merge "CTS tests for Voice Settings: ZenMode, BatterSaverMode, Airplane Mode" into mnc-dev | |
| ce190db am b16ecc71: am 328c2c88: am 3be510e7: Merge "Set mSensorMightHaveMoreListeners flag to false." into mnc-dev | |
| df2eb76 am 3a5c9f76: am 029c53dd: am 28f2aa6d: Merge "Relax limits for EventGapVerification." into mnc-dev | |
| 002d755 am b4d01e24: am f005da18: am 2d9a9a54: Merge "AudioRecordTest: Release AudioRecord on failure" into mnc-dev | |
| db5e458 am 16bd47b0: am 56e1864b: Merge "CTS tests for Android Keystore key generation." into mnc-dev | |
| 45de388 am 163ad8a0: am 7afb44a1: Merge "CameraITS: Test ZSL EE and NR modes" into mnc-dev | |
| 72014c6 am e849ff69: am 329862dc: Merge "CTS tests for Android Keystore AES 192 and 256." into mnc-dev | |
| e107f71 am 9cb24652: am 280c423a: Merge "CTS tests for Android Keystore-backed Cipher." into mnc-dev | |
| d27fcf9 am a98ad3d0: am 95f20c5c: Merge "CTS: Adds conditions to bypass FileSystemPermissionTest.testDeviceTreeCpuCurrent" into mnc-dev | |
| c4d3aa9 am 566b300d: am 590a39c9: Merge "MediaSyncTest: use float for playback rate tolerance to keep consistent with others." into mnc-dev | |
| 39f00ef am 726a002a: am 60792eff: Merge "Additional CTS tests for Android Keystore AES GCM." into mnc-dev | |
| 9ead040 am e9272ecb: am 44584495: Merge "Tests to verify runtime storage permissions." into mnc-dev | |
| e6537e6 am 5892251a: am c1a9bfa5: Merge "media: deliver test report to host." into mnc-dev | |
| 8a32619 am 4b6e5122: am b0962c0a: Merge "CTS tests for Voice Settings: ZenMode, BatterSaverMode, Airplane Mode" into mnc-dev | |
| b16ecc7 am 328c2c88: am 3be510e7: Merge "Set mSensorMightHaveMoreListeners flag to false." into mnc-dev | |
| 3a5c9f7 am 029c53dd: am 28f2aa6d: Merge "Relax limits for EventGapVerification." into mnc-dev | |
| b4d01e2 am f005da18: am 2d9a9a54: Merge "AudioRecordTest: Release AudioRecord on failure" into mnc-dev | |
| e4bb43a am 7f4d79e3: am 6fd987be: am 64798934: Merge "AudioRecord tests: only with a microphone" into mnc-dev | |
| 7f4d79e am 6fd987be: am 64798934: Merge "AudioRecord tests: only with a microphone" into mnc-dev | |
| 67242a4 am 0c5b1ca7: am 606f566d: am 0d0b3442: am 69a910a2: am 1a264216: am 5ac00e11: am 6a11fe41: Merge "Improve CameraTest stability." into lollipop-mr1-cts-dev | |
| 92ad968 am e3bfab6c: am 3b83c33d: am e4a53578: Merge "CTS test for SearchEvent." into mnc-dev | |
| 0c5b1ca am 606f566d: am 0d0b3442: am 69a910a2: am 1a264216: am 5ac00e11: am 6a11fe41: Merge "Improve CameraTest stability." into lollipop-mr1-cts-dev | |
| e3bfab6 am 3b83c33d: am e4a53578: Merge "CTS test for SearchEvent." into mnc-dev | |
| a3bed43 am 2c9e5e39: am ba3d0a07: am fff9d5a3: am 448ebfff: am 13927d10: am e6e19944: am a18e1fce: Merge "Modify the testcase in 64-bit device & lower density field" into lollipop-mr1-cts-dev | |
| 87e7ec0 am c242ecb7: am 50a2e60a: am b9468cfa: am 6a12ca0e: am f53974f5: am 7ccedc6b: am 9f243fbe: Merge "Change assertcode of checkSignalStrength in DumpsysHostTest" into lollipop-mr1-cts-dev | |
| ffab7e7 am 7e2a8191: am 828478c7: am 7f2ecbd4: resolved conflicts for merge of e25c956d to mnc-dev | |
| 2c9e5e3 am ba3d0a07: am fff9d5a3: am 448ebfff: am 13927d10: am e6e19944: am a18e1fce: Merge "Modify the testcase in 64-bit device & lower density field" into lollipop-mr1-cts-dev | |
| c242ecb am 50a2e60a: am b9468cfa: am 6a12ca0e: am f53974f5: am 7ccedc6b: am 9f243fbe: Merge "Change assertcode of checkSignalStrength in DumpsysHostTest" into lollipop-mr1-cts-dev | |
| 7e2a819 am 828478c7: am 7f2ecbd4: resolved conflicts for merge of e25c956d to mnc-dev | |
| 9462bf2 am dcfed2ad: am a2712e3a: am d56e346b: Merge "Further extend cts tests for runtime permission policies" into mnc-dev | |
| dcfed2a am a2712e3a: am d56e346b: Merge "Further extend cts tests for runtime permission policies" into mnc-dev | |
| ea329b1 am 97b60c2c: am 32fbe746: am 1674b99d: Merge "CTS drawing pictures through HWUI for b/21945972" into mnc-dev | |
| 97b60c2 am 32fbe746: am 1674b99d: Merge "CTS drawing pictures through HWUI for b/21945972" into mnc-dev | |
| 09444bd am 21d4c01a: am 04428712: am e7faaf75: Camera2: Update high speed recording tests for API refactor | |
| 21d4c01 am 04428712: am e7faaf75: Camera2: Update high speed recording tests for API refactor | |
| 09e0151 am 25a8fc1d: am e03666d8: am 4f00a44c: Merge "media: VideoDecoderPerfTest test fixes" into mnc-dev | |
| 25a8fc1 am e03666d8: am 4f00a44c: Merge "media: VideoDecoderPerfTest test fixes" into mnc-dev | |
| d388664 am cd1ea6a1: am 5e25dc29: am 0e5ec83c: Merge "CameraITS: fix run_all_tests.py" into mnc-dev | |
| cd1ea6a am 5e25dc29: am 0e5ec83c: Merge "CameraITS: fix run_all_tests.py" into mnc-dev | |
| b8ff204 am de0d14d5: am c43ab9ae: am fd5ffee7: Merge "Fix a naming error in WifiEnterpriseConfigTest.java b/22349111" into mnc-dev | |
| c1880c4 am 7aa6bf94: am 1ef43cf8: am b6d350d0: Merge "Work around deqp log file creation issues." into mnc-dev | |
| de0d14d am c43ab9ae: am fd5ffee7: Merge "Fix a naming error in WifiEnterpriseConfigTest.java b/22349111" into mnc-dev | |
| 7aa6bf9 am 1ef43cf8: am b6d350d0: Merge "Work around deqp log file creation issues." into mnc-dev | |
| 2df9301 am 2bbfb9d2: am c82bc2cc: am 34818407: Merge "Clean up failing CTS tests after refactor" into mnc-dev | |
| 2bbfb9d am c82bc2cc: am 34818407: Merge "Clean up failing CTS tests after refactor" into mnc-dev | |
| 5c496c8 am 1dd09a43: am efd834bd: am 7a7b890e: Merge "lock device orientation for CTS monkey seed test" into mnc-dev | |
| df3fa7b am ea4a86a3: am 58852680: am 55772087: Merge "CTS - Add scale gesture detector tests for constructor and stylus APIs" into mnc-dev | |
| 1dd09a4 am efd834bd: am 7a7b890e: Merge "lock device orientation for CTS monkey seed test" into mnc-dev | |
| ea4a86a am 58852680: am 55772087: Merge "CTS - Add scale gesture detector tests for constructor and stylus APIs" into mnc-dev | |
| 72b7c9a am 6d925e87: am bfef2dfa: am eccb68d8: Merge "Grant runtime permissions for split tests." into mnc-dev | |
| 6d925e8 am bfef2dfa: am eccb68d8: Merge "Grant runtime permissions for split tests." into mnc-dev | |
| 749e1c8 am 60a12600: am 8bcedfea: am 84ed05f1: CTS - Ensure that onContextClick returns the correct view | |
| 60a1260 am 8bcedfea: am 84ed05f1: CTS - Ensure that onContextClick returns the correct view | |
| 3d0909e am 211ca0c6: am fecd23fa: am b3dc8db4: Merge "Lower key import test requiremenst: 2 minutes and min 1500 keys." into mnc-dev | |
| 211ca0c am fecd23fa: am b3dc8db4: Merge "Lower key import test requiremenst: 2 minutes and min 1500 keys." into mnc-dev | |
| 7b588ad am b45daaa3: am bb5498b3: am 6e149ddd: Merge "Camera: Test ZERO_SHUTTER_LAG modes" into mnc-dev | |
| b45daaa am bb5498b3: am 6e149ddd: Merge "Camera: Test ZERO_SHUTTER_LAG modes" into mnc-dev | |
| a0e8f71 am 77d2367b: am 2a143d30: am 2de7c5a7: Merge "CTS Tests for GestureDetector" into mnc-dev | |
| 77d2367 am 2a143d30: am 2de7c5a7: Merge "CTS Tests for GestureDetector" into mnc-dev | |
| 016f617 am 04df9413: am 70d26115: am a0619f44: Merge "Add CTS for b/22031904" into mnc-dev | |
| 04df941 am 70d26115: am a0619f44: Merge "Add CTS for b/22031904" into mnc-dev | |
| fb95cd1 am e17ad166: am 73244045: am e5bed3b3: Merge "Extend Managed Profile permissions tests" into mnc-dev | |
| e17ad16 am 73244045: am e5bed3b3: Merge "Extend Managed Profile permissions tests" into mnc-dev | |
| 93f1f5a am 631ef2c0: am 9be7512f: am f297b84a: Merge "Cover all methods on NetworkStats and Bucket API" into mnc-dev | |
| 631ef2c am 9be7512f: am f297b84a: Merge "Cover all methods on NetworkStats and Bucket API" into mnc-dev | |
| d68f5c4 am 919c425f: am 66fa5f66: am b0dbb2dc: am 1581fe72: am 4807e778: am d067bb84: am ca8e81d0: Merge "Remove duplicate CTS tests from libcore cts packages." into lollipop-cts-dev automerge: 653f0cd | |
| 919c425 am 66fa5f66: am b0dbb2dc: am 1581fe72: am 4807e778: am d067bb84: am ca8e81d0: Merge "Remove duplicate CTS tests from libcore cts packages." into lollipop-cts-dev automerge: 653f0cd | |
| cd9e3a4 am b417e6f3: am 8e2526dd: am 18d5c213: Merge "Increase timeout when removing active admin in CTS" into mnc-dev | |
| b417e6f am 8e2526dd: am 18d5c213: Merge "Increase timeout when removing active admin in CTS" into mnc-dev | |
| 05aeefd am a1b4e582: am 4e977728: am 1ac76204: am ec3e31b0: (-s ours) am 4dbd1b8e: am 819ca65f: am 5b42ec36: (-s ours) Merge "DO NOT MERGE: A better shadow value to cover more devices, handle TV theme override." into lollipop-mr1-cts-dev | |
| a1b4e58 am 4e977728: am 1ac76204: am ec3e31b0: (-s ours) am 4dbd1b8e: am 819ca65f: am 5b42ec36: (-s ours) Merge "DO NOT MERGE: A better shadow value to cover more devices, handle TV theme override." into lollipop-mr1-cts-dev | |
| 3651651 am 68983b52: am 68883ae0: am d853d380: Merge "Add CTS tests for call log backup." into mnc-dev | |
| 68983b5 am 68883ae0: am d853d380: Merge "Add CTS tests for call log backup." into mnc-dev | |
| 4659178 am 971c267e: am 138f1a69: am 5797bb15: Merge "media: add VideoDecoderPerfTest" into mnc-dev | |
| 971c267 am 138f1a69: am 5797bb15: Merge "media: add VideoDecoderPerfTest" into mnc-dev | |
| ca05e4c am d793857e: am d3ffd44e: am 26c7c08a: Merge "ImageWriter: Add abandoned surface exception test" into mnc-dev | |
| d793857 am d3ffd44e: am 26c7c08a: Merge "ImageWriter: Add abandoned surface exception test" into mnc-dev | |
| 4b6bb69 am 631f198e: am 5a8fc031: am 9be94956: Merge "Unbreak tests that assert that 10,000 keys can be imported." into mnc-dev | |
| 631f198 am 5a8fc031: am 9be94956: Merge "Unbreak tests that assert that 10,000 keys can be imported." into mnc-dev | |
| 2fe60f5 am 70017fed: am f9906ab6: am 6fd9d4a7: Merge "CTS tests for VoiceInteraction." into mnc-dev | |
| 70017fe am f9906ab6: am 6fd9d4a7: Merge "CTS tests for VoiceInteraction." into mnc-dev | |
| 768f66f am 6d7962a1: am f911a32d: am e102590c: CameraITS: Added tool for converting YUV420 NV21 and planar to JPEG | |
| 6d7962a am f911a32d: am e102590c: CameraITS: Added tool for converting YUV420 NV21 and planar to JPEG | |
| 8e94f6d am 65b1d516: am c1066f02: am c6895077: Merge "videoperf: avoid potential ArrayIndexOutOfBounds" into mnc-dev | |
| 65b1d51 am c1066f02: am c6895077: Merge "videoperf: avoid potential ArrayIndexOutOfBounds" into mnc-dev | |
| 561fc81 am 83dcf4d8: am 9d66de63: am e1dbdbd4: Merge "CTS: Activity Transition: onSharedElementsArrived tests." into mnc-dev | |
| e466c92 am c54c77ba: am 98c971d3: am 403e956e: Merge "Update gfxstats cts test" into mnc-dev | |
| 83dcf4d am 9d66de63: am e1dbdbd4: Merge "CTS: Activity Transition: onSharedElementsArrived tests." into mnc-dev | |
| c54c77b am 98c971d3: am 403e956e: Merge "Update gfxstats cts test" into mnc-dev | |
| 1aeb31a am d8a46973: am 1207b4a5: am 269a396a: Merge "Additional failure tests for KeyChain" into mnc-dev | |
| d8a4697 am 1207b4a5: am 269a396a: Merge "Additional failure tests for KeyChain" into mnc-dev | |
| 5a39756 am f441fad3: am b7bd9c9f: am b340608f: Merge "Build app and accessibility CTS suites against public APIs" into mnc-dev | |
| 1faf6d4 am 8c476e03: am b1ebd4e1: am 54f3fa36: Merge "Clean up usage of internal classes and utils in widget CTS tests" into mnc-dev | |
| f441fad am b7bd9c9f: am b340608f: Merge "Build app and accessibility CTS suites against public APIs" into mnc-dev | |
| 8c476e0 am b1ebd4e1: am 54f3fa36: Merge "Clean up usage of internal classes and utils in widget CTS tests" into mnc-dev | |
| 7335fa6 am a4ebccd7: am 4b578ecb: am 61a5e3cf: Merge "Add CTS tests for passpoint APIs in enterprise config. b/22001019" into mnc-dev | |
| 3ed986e am 4dfae6a5: am 1f2e99f3: am 6d74657b: Merge "CTS - View additions for onContextClickListener and related APIs" into mnc-dev | |
| a4ebccd am 4b578ecb: am 61a5e3cf: Merge "Add CTS tests for passpoint APIs in enterprise config. b/22001019" into mnc-dev | |
| 4dfae6a am 1f2e99f3: am 6d74657b: Merge "CTS - View additions for onContextClickListener and related APIs" into mnc-dev | |
| 002a45c am 36f7801f: am 427d6f92: am f1a525d9: Merge "Add tests to check that libvulkan.so is not present." into mnc-dev | |
| 36f7801 am 427d6f92: am f1a525d9: Merge "Add tests to check that libvulkan.so is not present." into mnc-dev | |
| d680470 am bbc86bd9: am 3c4a06ab: am 8c840592: Merge "Require Seccomp-BPF support on aarch64." into mnc-dev | |
| bbc86bd am 3c4a06ab: am 8c840592: Merge "Require Seccomp-BPF support on aarch64." into mnc-dev | |
| 59b40b3 am c55fba93: (-s ours) am 0db73ff1: (-s ours) am ecab77f1: (-s ours) am 15c96eb1: (-s ours) am 4f6fd6a5: (-s ours) am 1a0e0d03: (-s ours) am dbba00b8: (-s ours) Merge "DO NOT MERGE ANYWHERE: Bump CTS 5.1 to R2" into lollipop-mr1-cts-dev | |
| 2582f84 am 64284825: Merge "Replace more obvious private API usages in view CTS tests" into mnc-dev | |
| c55fba9 am 0db73ff1: (-s ours) am ecab77f1: (-s ours) am 15c96eb1: (-s ours) am 4f6fd6a5: (-s ours) am 1a0e0d03: (-s ours) am dbba00b8: (-s ours) Merge "DO NOT MERGE ANYWHERE: Bump CTS 5.1 to R2" into lollipop-mr1-cts-dev | |
| 3b2fb17 am 32a1526c: Merge "Update settings provider - insert in secure settings test" into mnc-dev | |
| d0c6eae am cb7962c0: Merge "media: increase the wait time for resource manager test." into mnc-dev | |
| 3d9c9e5 am ce2c7c4a: Merge " AP Suspend tests." into mnc-dev | |
| 122ba5d am 41213974: Merge "CameraITS: Add support for cropping activeArraySize" into mnc-dev | |
| 45e259d am 649a4a5d: am 9a1170e3: am 8b6309be: am d814d1e0: am 184c339d: am 2fe82585: am 76616484: Merge "Reset DateFormat.is24Hour after each test" into lollipop-mr1-cts-dev | |
| 512bced am 1eb730a7: Merge "Camera2: update the recording duration margin" into mnc-dev | |
| 8311bf9 am aecb9a2e: Change sensor cts test confirguration to accept a packageName. | |
| e02661f am f2812948: Merge "Add CtsVerifier tests for disabling status bar and keyguard" into mnc-dev | |
| ea27377 am 39935e5e: Update FormatterTest to track file size format change | |
| 97882d2 am d2825abd: Merge "Add simple cts tests for ActionMode." into mnc-dev | |
| eda451d am c2e8d52d: Merge "Added test for incorrect clamping behavior & exception handling in BNNM API." into mnc-dev | |
| ff1ab02 am ea2015c6: Merge "media: log expected codec limit for concurrent instances as xml" into mnc-dev | |
| 5a2fabd am e1ed8108: EglConfigGLSurfaceView: fix incorrect count passed to glDrawArrays | |
| 3d833e9 am 73356238: Merge "Camera: skip AE precaptrue trigger test on LEGACY" into mnc-dev | |
| 07635cf am 81904b8b: Merge "Fix yuv too strict bug: 21037163" into mnc-dev | |
| 055831a am fb52f2eb: Merge "Add CTS tests for Icon methods on RemoteViews, ImageView" into mnc-dev | |
| 858bcce am e1be19a2: Merge "Assert that IND-CPA enforced during asymmetric key gen." into mnc-dev | |
| e4d5ac3 am afc693f9: Merge "Add CTS tests to drawable.Icon." into mnc-dev | |
| 09942cc am 358fb5e3: Merge "Assert that Android Keystore can hold at least 10,000 keys." into mnc-dev | |
| 37e0282 am 84cffa1e: Merge "Basic CTS tests for Android Keystore\'s AES ciphers." into mnc-dev | |
| a4c83e1 am 81151918: am 56a75de4: am 16c14061: am 6d3c04d0: am 4da4c854: am 4a6eeca5: am c0d0c15d: Merge "Exception in TestAccessHistory tearDown" into lollipop-cts-dev automerge: d3bfe6e | |
| 5d898e7 am ff941c94: am 1a9b70ad: am aef0b557: am e339cfa8: am 5a37dcd3: am a9386fad: am 89b84ec0: Merge "Modify assertMinMemoryMb testcase" into lollipop-mr1-cts-dev | |
| ead756f am ba16a583: am 69bd0ddc: am 0309e16e: am c4f944c9: am 904f9801: am 43ba1e6b: am f33326d4: Merge "Cts fix: popup window laying out in the chin." into lollipop-mr1-cts-dev | |
| ad7bec3 am b4369518: am 70400611: am 21f277e2: am 6faa3f46: am fa6e8874: am 777db405: am 2dfec269: Merge "Fix reference neutral normalization in RawConverter." into lollipop-mr1-cts-dev | |
| 223bd5e am a308f25d: am b0f079c0: am b1c0dd86: am 485ce740: am 041a618b: am b3877999: am 8dab941b: Merge "Fix race condition in testSendOrderedBroadcast1" into lollipop-cts-dev automerge: 306cf94 | |
| 0130277 am 98c72beb: am e208fc72: (-s ours) am c13f5c6c: am 0f1dbc49: am cfab737e: am 92bfdb55: am 328048e8: Merge "Changed the value TEST_TIME_OUT from 5000 to 10000." into lollipop-cts-dev automerge: 1fa98e8 | |
| bf7ccba am ff8d4e84: Merge "CTS-test Android Keystore HMAC implementation." into mnc-dev | |
| b9e3a46 am 23760fd1: Fix wrong date format in StrictModeTest. | |
| 367e6d4 am 01ce454b: Add CTSVerifier tests for Wifi config lockdown | |
| 676c3b5 am 9a2b13ee: Make positive Device Owner CTSVerifier tests possible. | |
| 3945bd6 am b99428e1: Add CTS tests for WiFi config lockdown | |
| 5fc250f am fdaf6a05: Adding WifiConfigCreator to device side CTS common utils | |
| 7407d11 am a320480a: Merge "Add simple CTS tests for untested ViewConfiguration methods." into mnc-dev | |
| 8e113c5 am c56afa13: Camera2: Fix burst capture characteristics test for non-burst devices | |
| 39d2c5e am dd68739a: Revert non-activity KeyChain CTS tests | |
| cd964fa am 44657d4f: Merge "VideoEncoderDecoderTest: Do not clear buffer-offset when reading" into mnc-dev | |
| fec79ab am 9775fe03: Merge "videoperf: run test for more frames." into mnc-dev | |
| d033fc6 am 74fa1cbf: Merge "Move KeyChainTestActivity to CtsVerifier" into mnc-dev | |
| 15c0d47 am eac68c29: Merge "Camera2: Add 3A trigger interaction test" into mnc-dev | |
| 14de23b am 810530ac: am 07916436: am 4c1f5adc: am e5ff0440: am 710fc89f: am 6bf3c54c: am 995ada6d: Merge "Fix for failing test of testEOS because checksum takes too long" into jb-mr2-cts-dev automerge: a00f78c automerge: 37f4b54 -s ours automerge: 9576ae8 | |
| 377c5eb am a802e120: Remove dependence on com.android.internal.R from CTS tests | |
| 204a89e am e75a5004: Merge "Fix some of the more obvious usages of private APIs in CTS tests" into mnc-dev | |
| 60b2e4c am ac3cfa1c: Merge "Remove dependence on internal XmlUtils from CTS tests" into mnc-dev | |
| ab817c7 am c8177213: am 087cebfa: am de21125b: am 076aaa5f: am 0385a6dc: am 0f5cfd9f: am c9baf342: Merge "CTS: Add test for JNI class-loading" into lollipop-cts-dev automerge: d5716c8 | |
| df8e9ff am 72d34cce: am 08a1d97c: am 47019e62: am 713b772d: am 1c13dcf4: am ed2905ca: am b77ebc0f: Merge "Lookup private resources in run-time" into kitkat-cts-dev automerge: ac8f57e automerge: 633928f | |
| 7d39a03 am d60dca78: am c8c86258: am 251445e2: am 0956148a: am 20b90e8b: am 0b9bf311: am 9731b7e8: Merge "Fix bugs regarding ShortCodeTest that fails without "112" in ECC List." into kitkat-cts-dev automerge: 8fcd728 -s ours automerge: 6e8f6a7 | |
| fd9af62 am b3d61b6e: am de6253dc: am 90d4b10b: am d92845a3: am 2b04ad4f: am 7835cfd1: am 8653ffda: Merge "Sleep between write and read in EventLogTest" into lollipop-cts-dev automerge: c507bc6 | |
| a88a35b am 3d3abc6d: Merge "CameraITS: Reprocess edge enhancement test" into mnc-dev | |
| 06c5d43 am 673c67ec: Merge "Add CTS tests for fp16 arithmetic" into mnc-dev | |
| aa28aab am 1f30ae5a: Merge "CTS: check cpu currents are initialized in the device tree." into mnc-dev | |
| 657798a am 34fd1c6a: am 74584744: am b954a438: am 110404d3: am 6ed9a0ef: am c31ec712: am 42b4dd4d: Merge "set delay during testPerformFiltering" into kitkat-cts-dev automerge: 73965a8 automerge: 809b7f9 | |
| 03c26b9 am b51dfc17: am 2bb92dc7: am 6c285953: am 8613137e: am 9f934b31: am d5a71496: Fix bogus merge conflict resolution. | |
| 7fa8a8a am 4d9b7fd8: am c2c52831: am e9cf184d: am 902be9f0: am c7d8d6f4: am af7a6eb0: am 1c7c613a: Merge "Check for valid buffer size before proceeding with testCreateAudioRecord." into kitkat-cts-dev automerge: 16763e6 automerge: a6a5286 | |
| 98f8286 am d53a6e16: am dfa67524: am 7a904dd2: am 480492b8: am dc9eaaa4: am fc211609: am 7dac1d13: Merge "Fix TelephonyManagerTest#testGetDeviceId CTS fail for android cts 4.4" into kitkat-cts-dev automerge: 6731f85 -s ours automerge: 242a72e | |
| 9d8a971 am c058a0d9: am 494373b1: am aee6b9af: am 136d977c: am 353c4140: am 2819f47f: am 3e265823: Merge "Make non-clickable item not focusable" into lollipop-cts-dev automerge: a55bf06 | |
| 1ff859b am b7c9db08: am f16f1c51: am 229f3977: am 7c7453c0: am 4455ca26: am c53bf778: am 40bc3681: Merge "Change FRAMEDROP_TOLERANCE value when upper 15MP camera size." into lollipop-cts-dev automerge: ea2805d | |
| d549c16 am a3220ef8: am a89c051c: am 7447b850: am a2913b32: am a1887d4c: am 2adbbabf: am 9c3d03e6: Merge "resolve merge conflicts of f9ffa90 to lollipop-mr1-cts-dev." into lollipop-mr1-cts-dev | |
| ebfffc7 am 04ca3e51: am 68980dc0: am ce1ef5bc: am 7fbf2fdf: am 6c8eba84: am d703f54c: am 53791798: Merge "Add a CtsVerifier test to ensure the CAR_DOCK activity starts in car mode." into lollipop-mr1-cts-dev | |
| 91f725f am a2c1c137: Merge "Add ChangeScroll test" into mnc-dev | |
| 4b6dd99 am 8d6f8cb0: Merge "Assert that Android KeyStore\'s public keys work with crypto." into mnc-dev | |
| f12a3b0 am 7525071a: Merge "Test for isTransitionRequired." into mnc-dev | |
| ad42fcf am f827c465: Merge "Tests for add/remove targets on Transition." into mnc-dev | |
| 357a94d am 774ed2fa: Merge "TIF: remove READ_EPG and WRITE_EPG permission related code from CTS" into mnc-dev | |
| 8a5f768 am c90f606f: Fix broken test | |
| c0aeeb8 am 3453b11b: Merge "Add cts tests for maxLines=1 with ellipsis." into mnc-dev | |
| a630707 am eee5301c: am 914cf4a5: am 284c161b: am c9ba0735: am 90585d8a: am 55bc2132: am cb3ed032: Merge "Fix a bug regarding layout-unable to tap Button in ScreenPinningTestActivity" into lollipop-mr1-cts-dev | |
| 4baad3f am b926cce1: am 58fea670: am fc64a9e5: am 7da7d85c: am 181c19f0: am 2937d9a8: am a5ef3505: Merge "CTS verifier crashes while executing the "Notification Attention Management" test" into lollipop-mr1-cts-dev | |
| 10f97f5 am 8b45c458: am 3b5d148f: (-s ours) am caaca71e: am c4642c47: am ce3dd0c4: am fdd4d9a7: am de3337f6: (-s ours) Merge "[DO NOT MERGE] Fix ActivityManagerTest#testGetRunningAppProcesses" into lollipop-cts-dev automerge: de95b4b | |
| 0efc239 am c54b8184: Merge "resolved conflicts for merge of 6c8f8a52 to mnc-dev" into mnc-dev | |
| f94dbc1 am 06ca0972: Merge "[RenderScript] Add CTS correctness test for IntrinsicBLAS" into mnc-dev | |
| 23f6374 am 4ed3b6c0: Rewrite TextView onSaveInstanceState CTS tests | |
| 7444964 am 95ee4820: Merge "RVCVXCheck Passing Criterion Revision and Bug Fix" into mnc-dev | |
| c228a4a am ec377261: Merge "Upload missing patch set for DatePickerDialog CTS tests" into mnc-dev | |
| 390563d am 38dd7180: Merge "add more logging to monkey seed test" into mnc-dev | |
| ab90f53 am f3bfa2e9: Merge "media: Test flush before and after CSD for decoders" into mnc-dev | |
| d2fe8a7 am 403c5bae: Merge "Camera: several LEGACY camera fix" into mnc-dev | |
| 2326295 am 51e8fae1: Merge "Adding more fields to verify in CallDetails test." into mnc-dev | |
| 4b99b90 am bacd6e90: Merge "Add CTS tests for Switch." into mnc-dev | |
| ad63953 am e3c86f7d: Merge "Camera2: Test creating multiple sessions" into mnc-dev | |
| 802cd24 am 9c6ea9bb: Merge "Update FontRenderingTests to handle 90x90 test area" into mnc-dev | |
| 0a5036f am e7ecc297: Merge "media: Properly calculate percentage tolerance" into mnc-dev | |
| 7fd8194 am fcc5aea0: Merge "Initial transition CTS tests" into mnc-dev | |
| b63fc57 am 0687757c: Merge "CTS for setCameraDisabled" into mnc-dev | |
| 52b66e6 am 114694aa: Merge "expectations: fix default Result value." into mnc-dev | |
| aa91334 am 3e40f6e2: Merge "Fix bogus merge conflict resolution." into mnc-dev | |
| f924190 am a22962bb: Merge "Move LauncherAppsTests to AndroidJUnitRunner." into mnc-dev | |
| 9b2a8c2 am 1bd05ae0: Merge "Revert "Adding more fields to verify in CallDetails test."" into mnc-dev | |
| d90489c am 19815cb8: Add CTS Verifier for the time shifting API in TIF | |
| d363c25 am 95491c71: Merge "CTS tests for input truncation/padding of NONEwithECDSA." into mnc-dev | |
| f45f170 am 0ae40f4e: Merge "Call super implementation in Telecom callbacks" into mnc-dev | |
| 6ca9d5c am e2ed2a90: Merge "Camera2: mark testPreparePerformance as known failure" into mnc-dev | |
| 565ec99 am d7883b3a: Merge "[CTS update lastAuthenticatedTime] Update behavior of lastAuthenticatedTime." into mnc-dev | |
| 5c07000 am ac86639c: Merge "Adding more fields to verify in CallDetails test." into mnc-dev | |
| b03cb5c am dc741607: (-s ours) am b6056668: (-s ours) am 2654065b: (-s ours) am 1d5b72e9: (-s ours) am 41e4fe0c: (-s ours) am ee871fb2: (-s ours) am c10dfe8a: (-s ours) Merge "DO NOT MERGE ANYWHERE fixed all merge issue" into lollipop-mr1-cts-dev | |
| 9eded04 am bc8a2e45: am b218078a: am c1c2031a: am 893d2a06: am 596922e5: am 19854d65: am 9e219614: Merge "Camera: fix time measuring logic" into lollipop-cts-dev automerge: df8cb6d | |
| db33719 am b7417068: am 1d60f588: am ea64ec4f: am 587c88dc: am 38df34d9: am 6a82c323: am ac0d8f3a: Merge "CtsVerifier: Camera FOV: cap FOV test to 120 degree" into lollipop-cts-dev automerge: 3b077c2 | |
| 8dd6fff am 91431061: am 9f3cfc8b: am 6cad1d84: am f186bbc3: am ad5b9846: am f6e59e13: am c5854556: Merge "resolve merge conflicts of 3b15b5e to lollipop-mr1-cts-dev." into lollipop-mr1-cts-dev | |
| 1d5ece7 am 6d3001c8: am 500c43f2: (-s ours) am d1b2c6a6: am 127fd124: am 32bfb59f: am 5a5a8df9: am a2c2dab0: (-s ours) Merge "DO NOT MERGE: Disabling testConnectViaHttpProxyToHttpsUsingBadProxyAndHttpResponseCache test" into lollipop-cts-dev automerge: 55a3493 | |
| 5e397bd am 6ec3fcc8: Merge "Add an integration test for SeccompBpf." into mnc-dev | |
| 3cce70a am 2f8d24de: Merge "CTS test to verify consistent measureText() with context" into mnc-dev | |
| 4f5f0fe am 9af08527: Merge "Camera ITS: Update to use high resolution sizes" into mnc-dev | |
| f3907a7 am c9bbb070: Merge "Permission grant tests for legacy apps" into mnc-dev | |
| f96b7f5 am b30bb9e6: Merge "Camera2: Update remaining uses of getOutputSize for high resolutions" into mnc-dev | |
| 3fe7cd6 am 634b6ff0: Merge "CTS tests to verify the call details object." into mnc-dev | |
| 2712557 am e09404a6: Merge "Add tests for canvas clip return values, as well as quickrejection" into mnc-dev | |
| 567bba6 am 1122022c: Merge "multinetwork native API CTS test" into mnc-dev | |
| 33aebef am 78eb112c: Merge "Report errors from CtsTestServer for improved debugging" into mnc-dev | |
| 0055366 am b01a1330: Merge "Add cts tests for TextView\'s action mode callback methods." into mnc-dev | |
| fc06a35 am 072ad3f2: Merge "Add CTS for Paint#testGetRunAdvance()." into mnc-dev | |
| a00364b am 1bd444a2: Merge "Update CTS handling of RAW buffer dimens." into mnc-dev | |
| f0e4cd8 am 8188149e: Merge "CTS tests to test parcelable telecom objects." into mnc-dev | |
| 5108dd4 am d56768ba: CTS tests to test parcelable telecom objects. | |
| 796854c am 3ac56e62: Merge "Adding CTS tests for parcelable interface of telecom objects." into mnc-dev | |
| ad66ff7 am 35494522: Merge "Remove isDither()" into mnc-dev | |
| 51c9144 am 1d35f8e0: Merge "Modify telecom2 mk file to include telecom resources" into mnc-dev | |
| 6e14e9d am 33c29010: Merge "Validate deviceowner KeyManagementTest install" into mnc-dev | |
| a84b9dd am 005bb41f: Merge "Initial CTS tests for DatePickerDialog" into mnc-dev | |
| a673698 am fb6e9de3: Merge "Fix bug in key validity enforcement tests of SignatureTest." into mnc-dev | |
| d96284d am 0f9ee778: Merge "CTS-test key pair generation when key expired or not yet valid." into mnc-dev | |
| 8b3cb59 am 5c5fd73d: Merge "CameraITS: Added helper function to load standard image formats" into mnc-dev | |
| 1faae0f am babcda24: Fix build | |
| efa8b8f am 3ac0e841: Merge "Camera2: RobustnessTest: Do not use input sizes when unsupported" into mnc-dev | |
| c16cf37 am 1bc6c1d4: Merge "Add test for WebView stencil clipping" into mnc-dev | |
| cddd2c0 am 3ae426b3: Merge "Camera: add a flashlight test to CTS verifier" into mnc-dev | |
| e136bbb am b947c325: Merge "Add CTS tests for CaptionManager APIs" into mnc-dev | |
| 04c70f9 am d6d8699c: Merge "Add Gamepad HID tests." into mnc-dev | |
| e139730 am b6b0c08d: Merge "Add Hyphenation CTS tests." into mnc-dev | |
| 039c67e am 2077f191: Merge "Camera2: Update tests for high resolution slow outputs" into mnc-dev | |
| 11c81d9 am 8ecb0a6e: Merge "Remove CTS tests for removed APIs" into mnc-dev | |
| 7a7cc60 am d2e35616: Merge "Assert that DownloadManager supports HTTPS." into mnc-dev | |
| effec41 am 3e3e2412: am 781f5e25: (-s ours) am 8a54905c: am e25479fa: am a68b6c54: am 4da5b453: am 0e64deba: Merge "CtsDeviceVideoPerf: limit bitrate to main or baseline profiles" into lollipop-cts-dev automerge: 79d9760 | |
| 42f99ad am e6f7d99d: Merge "Add support for "large" tagged tests to have non-default timeout" into mnc-dev | |
| c7549f5 am 297d1d6b: Merge "Miscellaneous CTS tests for new APIs" into mnc-dev | |
| 12bc635 am b59528a1: Merge "Camera: fix legacy shim jpeg thumbnail size break" into mnc-dev | |
| fd456e2 am 97f10ca1: am edbe3812: am db4d9741: am a846c35d: am c7f01078: Merge commit \'09fd16c8\' into manualmerge | |
| e47a266 am b378f136: Merge "Change URI for the channel query" into mnc-dev | |
| 34f5d4d am 85e7ffbf: Merge "Revert "Adding CTS tests for parcelable interface of telecom objects."" into mnc-dev | |
| 48cb5d2 am e02b322b: Merge "Revert "CTS tests to test parcelable telecom objects."" into mnc-dev | |
| 36e4472 am f8773ee2: Merge "Add tests for layer paint" into mnc-dev | |
| 4f56724 am fcea478c: Merge "Remove testShaderSweeps" into mnc-dev | |
| 1b86fe3 am 92b09f76: Merge "CTS tests to test parcelable telecom objects." into mnc-dev | |
| 9068392 am 94f56061: Merge "Add cts tests for CarrierConfigManager." into mnc-dev | |
| 241692e am e980e234: Merge "Camera2: add precapture cancel test" into mnc-dev | |
| 3fda277 am f97ed0fa: Merge "Camera2: Test mandatory reprocess configs" into mnc-dev | |
| d99d357 am 9597b0d4: Merge "Add KAT CTS tests for Android Keystore Signature." into mnc-dev | |
| 6085365 am 7aceaab6: Merge "Add NIST CAVP KAT tests for AES ECB and CBC." into mnc-dev | |
| 59cb3b1 am ca08ce30: am 280d70fa: am 7219c478: am f2568a5d: am 43cf00fe: am 209eff27: am abd0f1de: Merge "Increase polling timeout" into lollipop-mr1-cts-dev | |
| bc7b888 am 68c25f45: Merge "Sensor CTS fix for 1 Hz and 5 Hz sampling rates." into mnc-dev | |
| b0d69b3 am 9ba84d6a: Merge "Adding CTS tests for parcelable interface of telecom objects." into mnc-dev | |
| 7376fa0 am 2def8d2e: Merge "Remove corrupt test file" into mnc-dev | |
| 85dba33 am 139f49fa: Fix ConfigTest#testVersions | |
| f7ae28e am adea7f0c: Merge "Avoid reusing script group names" into mnc-dev | |
| eeb7c5a7 am edb3eda0: Merge "Remove tests for generating keys requiring user auth." into mnc-dev | |
| 3d3617e am a66d53d1: Use example.com for strict mode cts test. | |
| e3bfd9d am a47d5d69: Merge "Remove cell / wifi manipulation from ApacheHttpClientTest" into mnc-dev | |
| df57c57 am a8f79c19: am 95696480: am 5fdaa5f3: am ab914a6c: am 6929b7d7: am dddec3a1: am 9e3aa781: Merge "CTS: Fix memory leak in RSBlendTest loop." into kitkat-cts-dev automerge: e062486 -s ours automerge: 81e14f4 | |
| 6e888cc am f0003921: am ab3ae9a0: am 66cbcdb9: am a37716a7: am 884c621c: am b629358f: resolved conflicts for merge of 54f21847 to lmp-mr1-dev | |
| 682e122 am 336bd6c2: am b5ac0871: am 758fb8d1: am 0fdb9a79: am 18a785c2: am c5fb159e: am 6ba0e96b: Merge "AppSecurityTests: Do not delete in WhiteLists." into kitkat-cts-dev automerge: ac79e25 automerge: 23c49fb | |
| 23574d3 am 05b60520: Merge "Add CTS tests for cleartext network traffic security policy." into mnc-dev | |
| 4b1efe2 am 3ec084ab: Merge "Add CTS tests for TextView\'s new methods." into mnc-dev | |
| d7ea667 am a18dafa7: Merge "Rename AndroidKeyPairGeneratorTest for simplicity." into mnc-dev | |
| 7f51640 am e9b8498c: Merge "CTS tests for ContactsContract.QuickContacts" into mnc-dev | |
| e639987 am d6da5779: Merge "Remove ConnectionServiceCallbacks from Telecom CTS tests" into mnc-dev | |
| 5328e27 am 338ef209: Merge "Add CTS tests for Spinner and adapters." into mnc-dev | |
| 561b924 am 809e34bd: Merge "Add CTS test for RippleDrawable." into mnc-dev | |
| a37b316 am 51e36fce: Merge "Add PhoneAccountRegistration related CTS tests." into mnc-dev | |
| 124ff7c am fa5fa145: Merge "CTS - Accessibility additions for onContextClick API within View" into mnc-dev | |
| 95f0d8e am c224f518: Merge "Add CTS tests for setUninstallBlocked" into mnc-dev | |
| ac381b7 am 9c2a475f: Merge "Fix for CTS LoudnessEnhancer test using Visualizer" into mnc-dev | |
| 3a3323b am 032503cf: Remove CTS tests for removed TextView apis | |
| 6079036 am 5742d8c6: Merge "FileSystemPermissionTest: fix bad cherrypick" into mnc-dev | |
| a6a32ac am e414c9db: Merge "Revert "Add CTS test for selected item synchronization in AdapterView"" into mnc-dev | |
| 099ada5 am 44ab27b8: Merge "Revert "[RenderScript] Add CTS correctness tests for L3 BLAS Intrinsic"" into mnc-dev | |
| b3ca9a3 am d53960b0: Merge "Revert "[RenderScript] correctness test for L2 BLAS"" into mnc-dev | |
| ec99432 am 3014542a: Merge "Expand AndroidKeyStore KeyPairGenerator tests." into mnc-dev | |
| d33eaf8 am 50febc54: Merge "Adds CTS test for Script.Closure.getGlobal()" into mnc-dev | |
| fb1f822 am 981382cd: Merge "Refactor Drawable.getDither() to isDither()" into mnc-dev | |
| b9b3f40 am 9a611996: Merge "[RenderScript] correctness test for L2 BLAS" into mnc-dev | |
| 8906ff0 am b7616d56: Merge "[RenderScript] Add CTS correctness tests for L3 BLAS Intrinsic" into mnc-dev | |
| b566261 am e7834380: Merge "Remove not relevant browser tests - APIs are gone" into mnc-dev | |
| abcd4bd am bde571b7: Merge "CTS for aggregation suggestions builder" into mnc-dev | |
| d605b3d am d20715e0: Merge "Add permission test for TelecomManager.isVoicemailNumber" into mnc-dev | |
| c575f5e am 8d699bff: Merge "Add CTS test to check failure to build AudioTrack" into mnc-dev | |
| fb906d7 am 0c5f32cb: Merge "Add CTS test to check failure to build AudioRecord" into mnc-dev | |
| b93cc29 am 5f3dfe8a: Merge "Add a CTS case to catch non-recycleable view types bug" into mnc-dev | |
| 59b9e4c am bc256ee5: Merge "CTS test for PingPongRoot vulnerability" into mnc-dev | |
| bbdc51c am e6861607: Merge "CTS test QuickContactBadge#setPrioritizedMimetype" into mnc-dev | |
| f980cba am 64cc7924: Merge "Remove android.security.cts.SeccompBpfTest." into mnc-dev | |
| a34dbc7 am d5256ffd: Merge "remove setLatestEventInfo from CTS" into mnc-dev | |
| f3a5c43 am 2ece19f5: Reland "Modify user agent CTS test to match new webview user agent string." | |
| d0bb74f am 70a1b6d8: Merge "Fix DocumentsTest#testTree." into mnc-dev | |
| eb86341 am 17d30358: Merge "Add cts test for SpannableStringBuilder#getTextWatcherDepth" into mnc-dev | |
| cd17198 am fe05bba4: Merge "Fix: PaintTest#testGetOffsetForAdvance_invalidArguments" into mnc-dev | |
| ae742a8 am 5733c43e: Merge "Expand keyset cts key rotation tests to include EC keys." into mnc-dev | |
| 16c523f am 999b2257: Merge "CTS tests for TelephonyManager and SignalStrength APIs." into mnc-dev | |
| f817d68 am 214c604c: am f3b0a7f6: am 4ee46d1e: am ba1d534f: am 4ab8da72: am ad94a470: am ffb39e26: Merge "Camera: fix video snapshot test" into lollipop-mr1-cts-dev | |
| 3242b0e am 407bb846: Add missing CTS test for KeyGenParameterSpec. | |
| d9a33e4 am 0ae5ee7e: Merge "Add CTS tests for KeyInfo." into mnc-dev | |
| 9a843c4 am 6247ff69: Merge "Add CTS tests for KeyProtection." into mnc-dev | |
| e28f50d am 2680ebe2: Merge "Add CTS tests for KeyGenParameterSpec." into mnc-dev | |
| 4fdd866 am a1cedf3a: Merge "Make default dialer tests less flaky" into mnc-dev | |
| f1daec6 am de0ec3cc: Merge "Add CTS tests for PopupMenus." into mnc-dev | |
| d8a7184 am b4312f04: Add LayerDrawable tests | |
| bc6eecb am 48c293a3: Merge "Make second set of illuminant calibration values optional." into mnc-dev | |
| fa9942e am cccc6dd8: Merge "MidiCTS: add bind service permission" into mnc-dev | |
| 72d3475 am cdf633d7: Merge "HifiUltrasound test update" into mnc-dev | |
| 4336120 am 2193fc9c: Merge "Deprecate WebView scrollbar overlay settings" into mnc-dev | |
| a2c2a12 am bbe66d1c: Merge "Add cts tests for getHour/setHour/getMinute/setMinute for TimePicker." into mnc-dev | |
| d0a92ac am ee16b691: Merge "Add CTS tests for new methods of PopupWindow." into mnc-dev | |
| 787f6c2 am edfc2895: Merge "CameraITS: fix ev compendation advance test" into mnc-dev | |
| 7e3ae04 am 139725d6: Merge "Camera2: add more stall duration static metadata checks" into mnc-dev | |
| 4ac77d0 am 605433b6: Merge "Camera: use READ_SENSOR_SETTINGS when applicable" into mnc-dev | |
| 91c26b8 am 8a846934: Merge "Flesh out InCallService CTS tests and add incoming call tests" into mnc-dev | |
| 46df00b am ded82440: Merge "Camera2: fix high speed recording test fps range issue" into mnc-dev | |
| 06202ce am 84815684: Merge "Add tests for new Drawable APIs" into mnc-dev | |
| fc10d05 am 2a371806: Merge "Added DrawableWrapperTest" into mnc-dev | |
| 4947d6b am a3363bf1: ParcelFileDescriptor: Test that surrogate pairs in filenames are handled correctly. | |
| 3823c86 am 82396dfe: Remove tests for removed APIs. | |
| 7ae0cb9 am 42d6f25d: Merge "Fix RenderScript warning." into mnc-dev | |
| c9a189a am 656a5268: Fix CTS for new deprecated warnings. | |
| d8aeada am 0d2a889c: Merge "media: skip thumbnail extractor tests if required codecs are missing" into mnc-dev | |
| 4c5bf9a am fc3e7167: Merge "MediaCodecTest: added testReleaseAfterFlush" into mnc-dev | |
| a765ff6 am b2a0c9e9: Merge "Add READ_PHONE_STATE permission CTS tests" into mnc-dev | |
| 9a549bd am 85174384: Merge "Verify that only package supporting DIAL intent can be set as default dialer" into mnc-dev | |
| e8d9a39 am d6b14e6f: Merge "Video API CTS tests." into mnc-dev | |
| 5fbddae am f62da837: Merge "Add CTS tests for Telecom.Call" into mnc-dev | |
| 6b7e7fb am 7ab1df2a: Merge "CTS tests for SystemUpdatePolicy APIs in DevicePoliyManager" into mnc-dev | |
| b4bfbb4 am bfb092d4: am 15072dc6: am 9f7d2aba: am 67262ee0: am 9a6d56be: am 2c6015d4: am 675d2683: Merge "Revert "Modify user agent CTS test to match new webview user agent string."" into lollipop-cts-dev automerge: eb4eb9e9 | |
| 76fd40c am d69c59da: am c1259f11: am 50a58d71: am 70df98e1: am 5097d08a: am 8dc79614: am 9830c42c: Merge "Revert "Cts test fix for shortcode 48000"" into lollipop-cts-dev automerge: c304eed | |
| 5ff6b91 am 7d1886f3: am a132032e: am b1f0334c: am d9f05542: am 98c23e66: am 6a744d24: am 2636644b: Merge "fix incorrection assumption due to DST" into lollipop-cts-dev automerge: 87a1328 | |
| a27392d am fbfbac3b: am bb39ce78: am 05a2511f: am a5c4941c: am d56eb860: am 69e0b456: am f48839c1: Merge "Fix com.android.cts.monkey.VerbosityTest#testVerbosity seldom fail" into lollipop-cts-dev automerge: df91c97 | |
| 6da3a79 am 49f5d85a: Merge "Fix DngCreatorTest memory usage and tonemapping." into mnc-dev | |
| 33aaad3 am c6d12fe9: Merge "Add test to verify the fix of Bug #21446448" into mnc-dev | |
| 584ce14 am e59f53af: Merge "A better shadow value to cover more devices, handle TV theme override." into mnc-dev | |
| b3f365a am 609fec3b: Merge "Make sure to teardown MockConnectionService if previously injected" into mnc-dev | |
| 5c5438d am 48b57545: Merge "Add basic CTS tests for Paint#DrawTextRun." into mnc-dev | |
| faeeb79 am be751406: Merge "Add CTS test for getDefaultDialerPackage" into mnc-dev | |
| 1735f0f am 83df7098: Merge "Add Context.getColor() and Context.getColorList() tests to cts." into mnc-dev | |
| f9d5f88 am 18adbe0c: Merge "Add more assertions for asymmetric Android Keystore keys." into mnc-dev | |
| 87cfc74 am ff7402c5: Merge "Fix build." into mnc-dev | |
| feee3b1 am 65b437ab: Merge "Test NDK tracing" into mnc-dev | |
| 5578306 am 70398a1b: Merge "MediaCodecTest: add test for decoding after flush." into mnc-dev | |
| a4034dc am 773e4507: Merge "Update lockTaskTest with changed behaviour" into mnc-dev | |
| 0b6778b am 3870203c: Merge "Add cts tests for new methods of Paint." into mnc-dev | |
| 132a38c am 4ad33c13: Merge "Add video thumbnail generation tests" into mnc-dev | |
| 5ea6dc3 am bd8edfa7: Merge "Add CTS tests for new MediaBrowser methods." into mnc-dev | |
| fce2f1e am 5ffbe0f7: Merge "Add tests for setExtras()." into mnc-dev | |
| 466755c am 4bf52685: Merge "Camera: allow more time for AF" into mnc-dev | |
| 7b6d3a7 am cb37201c: Merge "Camera2: Add reprocess request key test" into mnc-dev | |
| 0b830ab am a5ae3c1e: Merge "CameraITS: Add reprocess noise reduction test" into mnc-dev | |
| 1281268 am 19c5d828: Merge "Add CTS tests for MemoryInfo.getMemoryStats." into mnc-dev | |
| e940113 am e8aa59da: Merge "Add a CTS test to dial addresses ending in "#"" into mnc-dev | |
| d056a8f am 7455e9d7: Merge "Camera2: fix capability check" into mnc-dev | |
| 3e3018a am e1276bf2: am 9d6566a0: (-s ours) am 1d5a0889: am 7e58d2d0: am 9721ca42: am 1c888623: am 3770cadb: (-s ours) Merge "DO NOT MERGE - bump CTS version to CTS 5.0_r3" into lollipop-cts-dev automerge: 6c43c15 -s ours | |
| b3f0a43 am 9d796c06: Merge "CTS: Add tests for ActionMode#invalidateContentRect" into mnc-dev | |
| d7cf606 am eed45547: Merge "Fix testNoDebuggingFeaturesRestriction fails in eng/userdebug build" into mnc-dev | |
| 54e1720 am 57c50426: Merge "Cleanup atrace and dumpsys tests" into mnc-dev | |
| c19cacd am 201c20f5: Merge "Add TextView cts tests for copy/cut/paste/pasteAsPlainText." into mnc-dev | |
| 5644d5b am bb15f9d7: Merge "Add NetworkUsageStatsTest to CTS suite" into mnc-dev | |
| d8b4b82 am a4d5b334: Merge "Reset DateFormat.is24Hour after each test" into mnc-dev | |
| 8d98b37 am 6da66379: Merge "Update CTS tests for moved notifyCarrierNetworkChange() API" into mnc-dev | |
| 786e946 am e84e5eda: Merge "Respect hard restriction to minimum password length in CTS" into mnc-dev | |
| f8d638e am 38c5c12a: Merge "Add basic CTS tests for newly added TextView APIs." into mnc-dev | |
| 84d1a47 am eee9544d: Merge "Add CTS tests for textDirection." into mnc-dev | |
| 266c135 am ab6c4a93: media: Track rendered frames during AdaptivePlaybackTest | |
| f6a3b2d am 00dbc5a6: Merge "Fix CTS: ViewGroupTests failing" into mnc-dev | |
| e8e024a am e32803f5: Update TelecomManager.EXTRA_INCOMING_CALL_ADDRESS in Telecom CTS | |
| a787497 am 7df0f1a4: Add Telecom CTS tests for wired headset behavior. | |
| e4dd9d9 am 93ae8714: Merge "Refactor some code in Telecom CTS tests" into mnc-dev | |
| b0b9b43 am d2aee164: Merge "Add CTS tests for outgoing calls" into mnc-dev | |
| 5a4069c am 83aeb723: Merge "CameraTestUtils: Switch to public ExifInterface tags" into mnc-dev | |
| 0668bf5 am 7fe16ae9: Merge "Camera: update RAW Burst test" into mnc-dev | |
| 7c5b888 am 0be563a9: Merge branch \'mnc-dev\' of https://googleplex-android.googlesource.com/_direct/platform/cts into mnc-dev | |
| 855aa70 am 6697755a: am 7f874255: am ea162a9a: am 45f0aa46: am 8be15467: am cf059666: am a45836d3: Merge "Revert "As per the android documention 480p is defined as 720x480, 704x480 or 640x480. The test is hardcoding 480p to 720x480 and hence the test is failing other combina | |
| b378ae1 am 311f4322: am 80e664cc: (-s ours) am e8e6ed75: am c57c285f: am 24381288: am 96557b59: am ea59f60b: (-s ours) Merge "DO NOT MERGE: Cts test fix for shortcode 48000" into kitkat-cts-dev automerge: ffd250a -s ours automerge: 4e80dc1 | |
| 6691db5 am f45ce708: am f1d656ff: am e4aaeeb7: am 6868f07f: am d6ab69d4: am ea6ba650: am bbf39ae4: Merge "Fix for com.android.cts.verifier.camera.video.CameraVideoActivity" into kitkat-cts-dev automerge: 9d5a03f automerge: 076e7ea | |
| 2142bea am 30a95f8a: am 5b11221d: am 82de6306: am 0a9bdc72: am 3590705b: am 3d2ffad1: am 1cadcd41: Merge "As per the android documention 480p is defined as 720x480, 704x480 or 640x480. The test is hardcoding 480p to 720x480 and hence the test is failing other combinations." | |
| 3e4a461 am 9dc5870b: am 4ef08d4b: (-s ours) am e129ea6d: am bb051136: am 9bde9a51: am 5b82e359: am 53067ea3: (-s ours) Merge "DO NOT MERGE: Fix com.android.cts.monkey.VerbosityTest#testVerbosity seldom fail" into kitkat-cts-dev automerge: b3405de -s ours automerge: e711a36 | |
| 0abe139 am e0b99bed: am 861e46d0: am 3bd35f46: am 13c764ca: am e9fad85b: am 2d61d530: am 4f916a85: Merge "Add more CTS for MediaController" into lollipop-cts-dev automerge: ccde590 | |
| 523f23b am 2c5451fb: am a5de60e7: am d8f72887: am 796571df: am 6e017c1f: am fd342e0b: am 2ceb1c4c: Merge "Add CTS for MediaSession.setActive()" into lollipop-cts-dev automerge: 4aeb538 | |
| d72366c am 9c4be824: am 84632bc0: am e2e7be85: am 6e1af134: am c2aee8e1: am d4c00849: am e96febd3: Merge "Add CTS for MediaBrowserService" into lollipop-cts-dev automerge: b7703ec | |
| db7727a am 9a74b158: am d0251b8d: am a3ca176c: am 5f7c2715: am 9d3dd237: am b186f7fb: am 280b547a: Merge "TIF: Ensure the global search can query EPG data" into lollipop-cts-dev automerge: 4c8ddbd | |
| 0ef88cc am 2770c97a: Merge branch \'mnc-dev\' of https://googleplex-android.googlesource.com/_direct/platform/cts into mnc-dev | |
| 325e76a am 1a305139: am 99e93137: am a843e42b: am 615c38fb: am ad76eed3: am 6905b315: am 7ebd8453: Merge "fix UiAutomationTest.testWindowContentFrameStatsNoAnimation FAIL" into lollipop-cts-dev automerge: a5945ee | |
| eb86d6f am 1bd9a6e8: am e64fe36d: (-s ours) am 3f8fba87: am c2511be3: am ac576674: am e26aa3a2: am 319e4728: (-s ours) Merge "[DO NOT MERGE]Fix ION memory leak for camera2 testStillPreviewCombination" into lollipop-cts-dev automerge: c0edc3c | |
| 564c2f5 am ed6c1af8: am 689a7b82: am ccb6d5b7: am 62d511f2: am 8fbc4984: am 66c87eaf: am f0f4915c: Merge "Fix for testListen" into lollipop-cts-dev automerge: 715fe88 | |
| 1305913 am a1596ecd: am f0f71b1f: am df176cf9: am bf364b4a: am d3a8da73: am 9c1b472e: am cae134d2: Merge "5.0_r1 Verifier:Fix no-connectivity constraint job missing running issue" into lollipop-cts-dev automerge: 34ece2d | |
| f3f24ff am 8c50336d: am f7eab76f: am 72dfc98b: am dc53c309: am 37e22974: am 8314370e: am 65b23f92: Merge "Cts test fix for shortcode 48000" into lollipop-cts-dev automerge: 76b1710 | |
| project developers/build/ | |
| c7b3164 am a7d757c3: Removing NOTICE files as per b/20081220 am: 5c8cae0bb8 am: 8d66a957bc am: 2a420b5c61 | |
| 2a420b5 am a7d757c3: Removing NOTICE files as per b/20081220 am: 5c8cae0bb8 am: 8d66a957bc | |
| 8d66a95 am a7d757c3: Removing NOTICE files as per b/20081220 am: 5c8cae0bb8 | |
| 5c8cae0 am a7d757c3: Removing NOTICE files as per b/20081220 | |
| a7d757c Removing NOTICE files as per b/20081220 | |
| project development/ | |
| adce814 Update SDK Platform revision for API 23 to 2. [DO NOT MERGE] | |
| 372bb98 Update TabLayout demo to use new ViewPager functionality | |
| d775d3a SupportLeanbackDemos: guidedstep changes | |
| fffb247 Add "select tab" to the tab layout / view pager demo. | |
| 8d3349a Add sample activity for ViewPager in Support4Demos | |
| 0c356e4 GuidedStepFragment: Example of two columns actions | |
| d0b4919 Remove pre-Material drawer demo apps. | |
| 220a8ec Material-compliant sample app for drawer layout. | |
| caaf7b0 Dont use R.id.content to host GuidedStepFragment | |
| bea9cef Merge "GuidedStep example: Use standard action IDs and titles" into mnc-ub-dev | |
| d403538 Merge "Test app for ViewPager." into mnc-ub-dev | |
| 37836fd GuidedStep example: Use standard action IDs and titles | |
| 23ee659 Merge "SupportLeanbackDemo: add example finishGuidedStepFragments()" into mnc-ub-dev | |
| 5493040 Merge "Add a comment on drawer layout file." into mnc-ub-dev | |
| d80cfde SupportLeanbackDemo: add example finishGuidedStepFragments() | |
| 01b04c4 Merge "GuidedStep: More example of editing" into mnc-ub-dev | |
| 84d4654 Add a comment on drawer layout file. | |
| afeff42 Test app for ViewPager. | |
| 193f0c9 Update version to 23.1.1. DO NOT MERGE. | |
| 58ccc4a GuidedStep: More example of editing | |
| 4fb761b Change LOCAL_MODULE_TAGS from "eng" to "optional" in Dev Tools app. am: a4404b1a6f am: bde2559e58 | |
| bde2559 Change LOCAL_MODULE_TAGS from "eng" to "optional" in Dev Tools app. am: a4404b1a6f | |
| a4404b1 Change LOCAL_MODULE_TAGS from "eng" to "optional" in Dev Tools app. | |
| 0fc3f91 Add AppBar sample using SwipeRefreshLayout | |
| 7fdd9d1 Update the Connectivity debug app to the multinetwork API. am: 28bb8be0da am: bf91969961 | |
| bf91969 Update the Connectivity debug app to the multinetwork API. am: 28bb8be0da | |
| 88436bd Add demo for TextInputLayout's counter | |
| 3848c33 Merge "Add usage of BottomSheetBehavior" into mnc-ub-dev | |
| ce4224f am 2d7067cd: am a3496a09: am 19923db3: Update build tools rev to <API>.0.2. DO NOT MERGE. | |
| 2d7067c am a3496a09: am 19923db3: Update build tools rev to <API>.0.2. DO NOT MERGE. | |
| 3db22d4 am c0781cd7: am 10b385c0: am afe2d242: Fix llvm-rs-cc.exe crash for windows | |
| c0781cd am 10b385c0: am afe2d242: Fix llvm-rs-cc.exe crash for windows | |
| dcd18d5 Update version to 23.1.0. DO NOT MERGE. | |
| 00ada54 Update support library to 23.1.1. DO NOT MERGE | |
| 6327806 Remove route providers which use RouteGroup | |
| b6239ea am de02034f: am 944fb730: am 419fb50c: Merge "Update system images to revision 4" into mnc-dev | |
| de02034 am 944fb730: am 419fb50c: Merge "Update system images to revision 4" into mnc-dev | |
| 2157e7f SupportLeanbackShowcase: get rid of card view background overdraw | |
| 052b1d4 Merge "Support7Demos: Update the MediaRouter demo" into mnc-ub-dev | |
| 2bd1f62 Support7Demos: Update the MediaRouter demo | |
| 0750ff8 SupportLeanbackShowcase: performance fix of ImageCardView resource | |
| 7d12018 SupportLeanbackShowcase: dont expand side info | |
| c8ad1e5 Leanback Demo: demo of edit title | |
| 6fe262d Supportleanbackshowcase: Polishing 2 and transition performance fix | |
| ab2a8a7 Supportleanbackshowcase: Polishing | |
| 8ab0d48 Merge "Showcase: Update SDK to 23 and support lib to 23.0.1" into mnc-ub-dev | |
| 5bf3eba Showcase: Update SDK to 23 and support lib to 23.0.1 | |
| 2e3684e GuidedStepFragment Subclass need explcitly specify a container id for background | |
| 8894dc7 Merge "Generate test for PlaybackOverlaySupportFragment" into mnc-ub-dev | |
| fedab48 Merge "Generate support version of leanback fragment tests" into mnc-ub-dev | |
| c7e4f19 Generate test for PlaybackOverlaySupportFragment | |
| 48b4a13 Generate support version of leanback fragment tests | |
| d9b5ca8 Add usage of app:actionLayout in NavigationView | |
| e088638 Add usage of BottomSheetBehavior | |
| 91b0259 am 6e0718b2: am 28c3c333: am 82336df0: Pass in current android.jar to api-generator | |
| 6e0718b am 28c3c333: am 82336df0: Pass in current android.jar to api-generator | |
| 3d1224e RecyclerView in place animations | |
| 6b73c45 Merge "Generate example of GuidedStepSupportFragment" into mnc-ub-dev | |
| 9e5a6a8 Revert "Revert "Add example of vertical grid transition and GuidedStepFragment"" | |
| 56b56d0 Merge "Revert "Add example of vertical grid transition and GuidedStepFragment"" into mnc-ub-dev | |
| c1e0465 Revert "Add example of vertical grid transition and GuidedStepFragment" | |
| 1585785 Generate example of GuidedStepSupportFragment | |
| fc16978 Merge "Add example of vertical grid transition and GuidedStepFragment" into mnc-ub-dev | |
| 70e4954 am 0544c15c: (-s ours) am 991947ef: (-s ours) Import translations. DO NOT MERGE | |
| 0544c15 am 991947ef: (-s ours) Import translations. DO NOT MERGE | |
| 7b42f57 Add example of vertical grid transition and GuidedStepFragment | |
| 8402e53 Merge "Add snapping scroll example to SupportDesignDemos" into mnc-ub-dev | |
| 16d9874 Update platform-tools version to 23.0.1 | |
| 69bd278 Add proguard configuration to support design demos sample app | |
| 4e650fb Add snapping scroll example to SupportDesignDemos | |
| 063b68e Add DrawableCompat demo to Support4Demos | |
| 3dd5d84 Fix typo in SDK generation | |
| fab9a1f Add preference and recommendation libs to SDK build | |
| 7ec2082 Merge "MediaRouter: Remove uses of not-yet-public API" into mnc-ub-dev | |
| 106e334 MediaRouter: Remove uses of not-yet-public API | |
| 2b6ef49 am 14e48160: Merge "Bump support library version to 23.0.1 DO NOT MERGE" into mnc-dev | |
| ac16bad am e226a0f5: Add customtabs support lib to extras/android/support/ | |
| 1f2c59a Merge "Pass in current android.jar to api-generator" into mnc-ub-dev | |
| 1ecf7f4 am f25696b5: am 5163378d: (-s ours) am f3ddcb27: am 844574cb: Update LayoutLib revision number. [DO NOT MERGE] | |
| c3d6f68 am 04a6dcac: Revert "Add customtabs support lib to extras/android/support/" | |
| 1c6e138 am 53ad2de7: Add customtabs support lib to extras/android/support/ | |
| fbe6c81 Pass in current android.jar to api-generator | |
| 3fb1da7 MediaRouter: Remove an unused member in SampleMediaRouteProvider | |
| b26f52f MediaRouter: Add a sample for the custom route icon | |
| 327fee8 Merge "MediaRouter: Prevent activity from restarting" into mnc-ub-dev | |
| e6b7271 Added Transitions and minor code clean up | |
| 5d04bdb MediaRouter: Prevent activity from restarting | |
| 2faa311 am 9878bf64: Update build tools version to 23.0.1 -- DO NOT MERGE. | |
| 979a6c7 am 81556478: Sync sample prebuilts for mnc-dev | |
| 55dcdfb am c8e94bf5: Sync mnc-dev sample prebuilts | |
| 7eca3d4 am a56a6341: Update sample prebuilts to use latest deps | |
| 4717694 am 9a9c2ea5: Bump mnc-dev samples package to v3 (DO NOT MERGE) | |
| e00d9e6 am d95a687e: Sync sample prebuilts for mnc-dev | |
| 7f59e62 Merge "MediaRouter: Add route groups" into mnc-ub-dev | |
| a09fe02 Revert changes of adding guidedstep fragment in Browse | |
| cbfd7cd MediaRouter: Add route groups | |
| a6b10a9 Merge "WIP: Added transitions to MainFragment." into mnc-ub-dev | |
| a3df991 am 40bd1993: Update revision for layoutlib and docs. | |
| 34f0f0e am 3c274b20: Update SDK component versions for the official SDK 23.0.0 | |
| ec63848 Merge "Add editable actions to Guided Step test activity." into mnc-ub-dev | |
| 7ceca6f am 7cc14006: am c5a2819b: am d54746eb: am ee95843b: am b0abc5df: am 0f394210: am e855b6d9: (-s ours) am 55b696d1: am 6193ccb4: am 29699330: (-s ours) am 365f4ece: am c3eff933: am 70a395c4: (-s ours) am 35f73b6f: am 086adab4: am ed56df6f: am 91df3bc9: am a4bb0b7c: am d | |
| 27d49f7 am 88aa40df: am b4ef2aba: am f2a8aa34: am fdcade18: am ff246059: am 5fc6ca11: am d7138ba4: am 6ab0f7a9: am e8566ffb: am c0b3754c: am 98970843: am 4dec9d0d: am d2bd9baf: am 8d309635: am fdcb8bbb: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge - | |
| 2d9e0fd am f6cf3cdd: am 82dea6f6: am 33c7b977: am 44a06cae: am fe281e20: am d886ba21: am 2235ef28: (-s ours) am 19cf6f34: am a6f725d6: am 26d66e55: (-s ours) am c5825853: am c6b7ecd7: am 4e5b7ad5: (-s ours) am 27ac85b1: am ed56df6f: am 91df3bc9: am a4bb0b7c: am d5abe7ea: am c | |
| 7e9863d am 73f7cb3d: am 497bcc4d: am 5e5f2ab3: am 1ea2e463: am 6d181dc0: am 63c3068a: am 8314da1c: am 3728b128: am 97af61da: am 178f5eee: am e1baec5d: am 4393aeff: am 947e4e27: am 29b060fa: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours) | |
| b5dd18f am 756650ce: am 8484c46a: (-s ours) am 7f3cb054: am 20f4cf0b: am 4b70b572: am 2032317a: am 73e98d27: (-s ours) am 0878662f: am e8641a98: am 202648b0: (-s ours) am ae1dae19: am ffb1640e: am 4ef13a69: (-s ours) am 14dcd775: am 40d02c8f: am ca8720d5: DO NOT MERGE Increas | |
| 6221601 am 8cfb8f1f: am 7af114e3: (-s ours) am e8158a85: am cdb21d5f: am 6dac7dff: am 6c65c2f5: am 895ff7f3: (-s ours) am 9780219a: am 980be81e: am 2c414f76: (-s ours) am b2cff440: am 18c63f0a: am 87cd4d75: (-s ours) am 9ccb1028: am ca8720d5: DO NOT MERGE Increase the system- | |
| 2b5a3f7 am 7eebbae9: am 90fdef7e: (-s ours) am d15073bb: am 0d68aeab: am d49bca70: am a944d9a6: am 30461421: (-s ours) am 6285d756: am 043df767: am 474f468d: (-s ours) am 86317696: am c526381f: am 9cb9a14c: (-s ours) am bad193d9: am 91ac4618: am 0e94cee9: DO NOT MERGE opengl: | |
| 10531d1 am e8016665: am eb4cef2a: (-s ours) am 251bb36d: am ceef025b: am 5ce76991: am 860c3d7c: am 1bbfccc1: (-s ours) am 0c635c71: am 2d5d97ef: am bc013aa0: (-s ours) am 8de93852: am 6384e218: DO NOT MERGE Increase the system-image revision number after opengl bug fix | |
| 16c97e6 am b07478d7: am c1925e98: am dd48de4d: am 163341ca: am 89e5f5c1: am c5066d81: am bc7cb7d9: resolved conflicts for merge of 5e69741e to klp-modular-dev | |
| ebeba5b am 3ab6703b: am ea9fe7e5: (-s ours) am 0f528e4f: am 14c5da2f: resolved conflicts for merge of bbb03147 to lmp-mr1-dev | |
| e37e26a am 28aafa0d: am c631e5b2: (-s ours) am 6bf2b78e: am fc4964b9: DO NOT MERGE Increase the system-image revision number after opengl bug fix | |
| 742e268 WIP: Added transitions to MainFragment. | |
| d811b8e Merge "Polished Grid example and added a few missing details at Launcher fragment. Video- and Music examples now also use an Activity. BackgroundHandler in MainFragment removed." into mnc-ub-dev | |
| 3dfa612 am 6ad53c99: Merge "BrowseErrorFragment: fix NPE of not attached BackgroundManager" into mnc-dev | |
| 6a07105 Add editable actions to Guided Step test activity. | |
| 26b7df1 Polished Grid example and added a few missing details at Launcher fragment. Video- and Music examples now also use an Activity. BackgroundHandler in MainFragment removed. | |
| aeedeb7 Cleaned up strings.xml | |
| 63e8181 Removed Browsing example from Showcase app | |
| 80116aa Polished Wizard example for Showcase app | |
| 9f8ccdc Rearranged classes and removed unused resources. | |
| 8dd090f Cleanup and usage of new ImageCardView | |
| 226bc51 am 424fb606: Change MNC codename to just M. | |
| 24b0687 Merge "Implemented Card-, DetailView-, GridView-, Music- & Video, Wizard-, Dialog examples" into mnc-ub-dev | |
| 37ef210 am 9146cbdb: Merge "Fix CRCs in file so it passes the new CRC check" into mnc-dev | |
| b5102aa am 04a194c0: For RenderScript support lib use libblasV8.so instead of libblas.so | |
| 7fa5452 am a58a751c: Update revision for next SDK Preview. | |
| e2c38e9 am 5c05f4ef: Merge "Update LayoutLib revision number for Preview 3" into mnc-dev | |
| 062a470 am 1bdf0eee: Merge "DO NOT MERGE Increase the system-image revision number after opengl bug fix" into mnc-dev | |
| fd1172e am 4518f725: Update platform tools 23.0.0 rc4 -> rc5 | |
| 3e61150 am 9d78bc10: Support new systrace file structure | |
| 63dcb5b Implemented Card-, DetailView-, GridView-, Music- & Video, Wizard-, Dialog examples | |
| 97942f2 am d574af02: Track reason for screen turning on. | |
| 7633026 am f8c219e0: am 73190f3f: (-s ours) Update version of non-maven support package. | |
| ab6939c am 6637c564: Merge "Add carrier config test to test_defs." into mnc-dev | |
| b310a9f am 09e17487: am 1461b8e9: Merge "Fixing a crash introduced by my previous CL." into lmp-mr1-ub-dev | |
| f5bfa21 am 0aafaa70: Add calllog CTS tests. | |
| 179db98 am f3b07d46: am c84455c1: Introduce sample for RoundedBitmapDrawable | |
| 0da1d61 am 4fabcc75: am 0d21ec5c: (-s ours) am 4fe2d033: (-s ours) Sync sample prebuilts for mnc-preview-docs (DO NOT MERGE) | |
| f711d9c am e31d4f49: Use Android Studio project, also call TelephonyManager.getLine1Number(). | |
| cacd9af am 3823d992: am 43774e87: Eliminating AnimatedRecyclerView demo crashes. | |
| b3b6187 am 5c797733: am b0d646c8: SupportLenabackDemo: Make StepFragment public | |
| 84c84b3 am 973ecb61: fix slotting of permission category | |
| a6a4c70 am 403be115: teach monkey to flip permissions on apps | |
| f4264c1 am 5050956d: Merge "Add telecom CTS shortcut." into mnc-dev | |
| d921b5c am 2306687c: Merge "[RenderScript] update sdk.atree to include libblas.so" into mnc-dev | |
| f083599 am 749995dc: Update SDK Preview versions. | |
| 2a1b42d am 18cdb045: Update platform tools to 23 rc3 | |
| 9265a12 am 5d969b3f: Merge "remove setLatestEventInfo from API samples" into mnc-dev | |
| 5e96921 am d32f6aef: Merge "Add tracing header" into mnc-dev | |
| b1562f8 am 28701d10: Revert "Tinted icons sample" | |
| 4a78c15 am d18f135a: am d57a9edb: Adding AsyncListUtilActivity to Support7Demo | |
| db47db1 am bb08b33a: Merge "Expand Presentation demo to test 4K mode switches." into mnc-dev | |
| f897e62 am 7a4b2fb1: Merge "Update LayoutLib Api level to 15." into mnc-dev | |
| e476bcc am 052cdd1e: am 16283511: Remove unnecessary code | |
| c0e099c am 3a7f2659: Merge "Add more text samples to ApiDemos, move to Views/Text" into mnc-dev | |
| b8a422b am b5c9450d: Merge "Fix size and sha1sum for some sdk targets" into mnc-dev | |
| c768793 am ebd2d345: Merge "Update structure for the build-tools/plat-tools." into mnc-dev | |
| d8bb801 am bb348e0e: am 3cd44d43: NavigationViewUsage saves its state on rotation | |
| 8a28f0e am 24d9df6a: Merge "Add mips64 to stack tool" into mnc-dev | |
| edba1dc am 75f0029e: More seek bars in ApiDemos | |
| 86fb9fa am 7d7be207: Merge "Add flag to grant permissions when running tests." into mnc-dev | |
| a37ea8a am 4f12ae9e: am 8e207d0c: (-s ours) Merge "Increment LMP MR1 Samples package to v6 (DO NOT MERGE)" into lmp-mr1-ub-dev | |
| 3166dce am 47ff25a9: am ab968198: (-s ours) am a40b0ba4: (-s ours) am 2a78abbf: (-s ours) Increment LMP MR1 Samples package to v6 (DO NOT MERGE) | |
| 3a62538 am b10ea77a: am 4f9dfbb7: (-s ours) am 92ae8929: (-s ours) am 576cc365: (-s ours) Update sample prebuilts for lmp-mr1-ub-docs (DO NOT MERGE) | |
| 47177e5 am cdc99dd7: am 5eb6402f: (-s ours) am 1e75a5e7: (-s ours) Update sample prebuilts for lmp-mr1-ub-docs (DO NOT MERGE) | |
| aed8c1d am 68932e39: Increment MNC SDK Samples to v2 (DO NOT MERGE) | |
| 1739452 am c5bbbe3c: Add MNC samples to sdk.atree | |
| 9678532 am 296083e2: Sync sample prebuilts for mnc-dev | |
| a4b1323 am c75eb5ee: Merge "Rename the appengine server app ID" into mnc-dev | |
| a65d425 am 66ca00a6: am eda065a4: Merge "Add StaggeredGridLayoutManagerActivity to Support7Demos" into lmp-mr1-ub-dev | |
| c2970ec am 27d82715: Merge "Fix service samples, especially remote services." into mnc-dev | |
| 8a0551f am 7282625e: am f188f7e1: Add default application theme to SupportDesignDemo. | |
| 8539020 am ad6fba5d: am 70e3ba7e: am 3b5ca695: am 48b7225a: Sync sample prebuilts | |
| 5f7faa7 am 83529e3a: Setup flags to make SDK images provisioned. | |
| 0f747bb am 574922ca: Add a conditional removal of \r\n from adb output. | |
| 8f2cdfb am a0de8904: Fix build breakage again. | |
| 1bccaa1 am 19b0ecb1: Fix build breakage. | |
| 00808af am 5fb89112: Merge "Fix build tools packaging." into mnc-dev | |
| fad8795 am 9a01c4c5: Merge "Install SDK annotations as platform-tools/api/annotations.zip" into mnc-dev | |
| 256cf59 am 42f63429: Merge "Switch Android Keystore sample code to new API." into mnc-dev | |
| 92d624c am 61250167: Merge "multinetwork API: NDK header" into mnc-dev | |
| b97f04a am 8027fa76: Merge "Fix the description text for the Text Processing sample" into mnc-dev | |
| 5e523e1 am 1a4bfdfc: am a8daca6d: AppBar demo using SwipeRefreshLayout | |
| 46d2e9a am 522c7f5a: Merge "Added no transiton animation option to animation demos." into mnc-dev | |
| 3af7f82 am e149ffe2: Add network callback logging to the Connectivity app in dev tools. | |
| e7f4d45 am 22e1a9ab: Merge "Remove ICU from LayoutLib." into mnc-dev | |
| d28026f am af72dc5b: (-s ours) Import translations. DO NOT MERGE | |
| project external/boringssl/ | |
| 23df918 keep history after reset to mnc-dr-dev | |
| b58f8d1 DO NOT MERGE ANYWHERE Revert "Whitelist windows modules" | |
| fe73053 Merge mnc-dr-dev-plus-aosp into mnc-ub-dev | |
| b452bce am 3df15298: am 184bc934: BoringSSL: always build with symbol visibility flags. | |
| 3df1529 am 184bc934: BoringSSL: always build with symbol visibility flags. | |
| 184bc93 BoringSSL: always build with symbol visibility flags. | |
| 217603a am d947d006: am b8494591: Revert "Revert "external/boringssl: sync with upstream."" | |
| d947d00 am b8494591: Revert "Revert "external/boringssl: sync with upstream."" | |
| b849459 Revert "Revert "external/boringssl: sync with upstream."" | |
| e246de8 am 00bc53f6: am a04d78d3: Revert "external/boringssl: sync with upstream." | |
| 00bc53f am a04d78d3: Revert "external/boringssl: sync with upstream." | |
| a04d78d Revert "external/boringssl: sync with upstream." | |
| c737bc2 am 3781a606: am 1e4884f6: external/boringssl: sync with upstream. | |
| 3781a60 am 1e4884f6: external/boringssl: sync with upstream. | |
| 1e4884f external/boringssl: sync with upstream. | |
| 0267d64 am 4ca36931: am 08656b61: Whitelist windows modules | |
| 4ca3693 am 08656b61: Whitelist windows modules | |
| 08656b6 Whitelist windows modules | |
| b1a3816 am 929d45bb: (-s ours) am e25abed5: Fix and re-enable clang build. | |
| f7b6215 am 5100c0f3: (-s ours) am 13204c36: Disable clang build temporarily to fix build. | |
| c9c129c am 3b2c6065: (-s ours) am 07f4f423: Merge changes Icdc56a50,I63d5dc28,Ia7d0c5d8,I47406533 | |
| 49f90ca am e25abed5: Fix and re-enable clang build. | |
| 929d45b am e25abed5: Fix and re-enable clang build. | |
| 6fdd065 am 13204c36: Disable clang build temporarily to fix build. | |
| 5100c0f am 13204c36: Disable clang build temporarily to fix build. | |
| e25abed Fix and re-enable clang build. | |
| 13204c3 Disable clang build temporarily to fix build. | |
| dc35386 am 07f4f423: Merge changes Icdc56a50,I63d5dc28,Ia7d0c5d8,I47406533 | |
| 3b2c606 am 07f4f423: Merge changes Icdc56a50,I63d5dc28,Ia7d0c5d8,I47406533 | |
| 07f4f42 Merge changes Icdc56a50,I63d5dc28,Ia7d0c5d8,I47406533 | |
| ffd8e0a am 71a0705e: Add a build target to build bssl for host. | |
| 8daf81f am 691ef9d0: am f7063c1e: Add rules.mk for building Trusty. | |
| 691ef9d am f7063c1e: Add rules.mk for building Trusty. | |
| 71a0705 Add a build target to build bssl for host. | |
| bd9957e Handle RDRAND failures. | |
| e0846be dsa_pub_encode: Write out DSA parameters (p, q, g) in addition to key. | |
| 98856d4 Fix for CVE-2015-1789. | |
| 56d2503 Fixes for CVE-2015-1791. | |
| a5cfe4d am f7fe69bb: am dfb3ba68: Add ECDHE-PSK-AES{128,256}-SHA cipher suites. | |
| f1f0a40 resolved conflicts for merge of 6d66cf82 to mnc-dev-plus-aosp | |
| b658cb4 am 0e6bb1c7: Add ECDHE-PSK-AES{128,256}-SHA cipher suites. | |
| 7697f23 am a4be71ce: Drop ECDHE-PSK-AES-128-GCM. | |
| f7fe69b am dfb3ba68: Add ECDHE-PSK-AES{128,256}-SHA cipher suites. | |
| 6d66cf8 am 4bae3aba: Drop ECDHE-PSK-AES-128-GCM. | |
| 0e6bb1c Add ECDHE-PSK-AES{128,256}-SHA cipher suites. | |
| a4be71c Drop ECDHE-PSK-AES-128-GCM. | |
| 267a5ed am 1f76c138: am dbfa1800: s/-Wno-unused-parameters/-Wno-unused-parameter/ | |
| 1f76c13 am dbfa1800: s/-Wno-unused-parameters/-Wno-unused-parameter/ | |
| de0daf9 am 9701a2fb: am 53b272a2: Bump revision of BoringSSL. | |
| 9701a2f am 53b272a2: Bump revision of BoringSSL. | |
| 107c2b8 am cfb958c9: Fix Windows SDK build again | |
| cfb958c Fix Windows SDK build again | |
| 9d4bc05 am f4e42720: Bump revision of BoringSSL. | |
| f4e4272 Bump revision of BoringSSL. | |
| 9073626 am 82ea5181: am 8bba6292: Disable 0xcafe cipher suite (PSK with AES-GCM). | |
| 312dd00 am 0d4deb2b: Disable 0xcafe cipher suite (PSK with AES-GCM). | |
| 82ea518 am 8bba6292: Disable 0xcafe cipher suite (PSK with AES-GCM). | |
| 0d4deb2 Disable 0xcafe cipher suite (PSK with AES-GCM). | |
| ee9c8ea am 15bef6ea: am 4f05b238: Add |BIO_read_asn1| to read a single ASN.1 object. | |
| 15bef6e am 4f05b238: Add |BIO_read_asn1| to read a single ASN.1 object. | |
| 01e02a1 am 86426f7c: s/-Wno-unused-parameters/-Wno-unused-parameter/ | |
| 6518f96 am e1e9d3f1: am 3f3c43ff: external/boringssl: add -Wno-unused-parameters. | |
| 24f39cf am 16eeb4c7: am 58dc65d0: external/boringssl: fix |SSLeay|. | |
| 86426f7 s/-Wno-unused-parameters/-Wno-unused-parameter/ | |
| e1e9d3f am 3f3c43ff: external/boringssl: add -Wno-unused-parameters. | |
| 16eeb4c am 58dc65d0: external/boringssl: fix |SSLeay|. | |
| 771d6ac am 12addf8c: external/boringssl: fix |SSLeay|. | |
| 3059836 am 71cbcbed: external/boringssl: add -Wno-unused-parameters. | |
| 93c9b73 am 190eb169: external/boringssl: fix use after free in X509. | |
| 3be1d66 am 3ca955ad: Copy ecdsa_meth in EC_KEY_copy. | |
| 12addf8 external/boringssl: fix |SSLeay|. | |
| 71cbcbe external/boringssl: add -Wno-unused-parameters. | |
| 190eb16 external/boringssl: fix use after free in X509. | |
| 3ca955a Copy ecdsa_meth in EC_KEY_copy. | |
| 6fa5abf am f5cea4e0: Add |BIO_read_asn1| to read a single ASN.1 object. | |
| f5cea4e Add |BIO_read_asn1| to read a single ASN.1 object. | |
| 70c8e7d am fa32bda8: am 21c70997: Copy ecdsa_meth in EC_KEY_copy. | |
| fa32bda am 21c70997: Copy ecdsa_meth in EC_KEY_copy. | |
| 5a0d510 Copy ecdsa_meth in EC_KEY_copy. | |
| e673846 am d4c52f48: am fc104df4: external/boringssl: disable ChaCha20-Poly1305 cipher suites. | |
| 5987d1f am dfce004c: Add rules.mk for building Trusty. | |
| dfce004 Add rules.mk for building Trusty. | |
| 69f08ba am a070e050: external/boringssl: disable ChaCha20-Poly1305 cipher suites. | |
| d4c52f4 am fc104df4: external/boringssl: disable ChaCha20-Poly1305 cipher suites. | |
| a070e05 external/boringssl: disable ChaCha20-Poly1305 cipher suites. | |
| 5047781 am e39b1236: am 22b306fd: external/boringssl: update #define guards for x86_64-gcc.c. | |
| e39b123 am 22b306fd: external/boringssl: update #define guards for x86_64-gcc.c. | |
| 0bef1b0 am 9eb412c4: external/boringssl: update #define guards for x86_64-gcc.c. | |
| 9eb412c external/boringssl: update #define guards for x86_64-gcc.c. | |
| 8149f60 am 1c89d66d: am 57e5591b: MinGW on Linux uses lowercase include files, part 2 | |
| edf0987 am fe88dc0c: am ac86f526: Update to latest BoringSSL | |
| bf65729 am 674931ae: am 1db36bfd: am 12956e17: Merge "external/boringssl: support arbitrary elliptic curve groups." | |
| 108f181 am 20c0e128: am db3f2575: am aae4cd28: external/boringssl: work around Clang\'s lack of adrl. | |
| 7124dc6 am 8a27a4f0: am 256aa0e4: am 62d05888: external/boringssl: add P-521 back into the ClientHello. | |
| 0c3b42e am 838711c5: am 02d138cf: am e9ada863: external/boringssl: bump revision. | |
| d5ab213 am f48ecc4b: am fb1d49c2: am b3106a0c: Fix doc reference to EVP_AEAD_max_overhead | |
| 0dc21ce am d7727faf: am 9861ddca: am b9b62a03: Rename ECDHE-PSK-WITH-AES-128-GCM-SHA256 to follow the naming conventions. | |
| da538a6 am 43db33b0: am a524abe3: am cbe62cb9: Rename ECDHE-PSK-WITH-AES-128-GCM-SHA256 to follow the naming conventions. | |
| 1c89d66 am 57e5591b: MinGW on Linux uses lowercase include files, part 2 | |
| fe88dc0 am ac86f526: Update to latest BoringSSL | |
| 674931a am 1db36bfd: am 12956e17: Merge "external/boringssl: support arbitrary elliptic curve groups." | |
| 20c0e12 am db3f2575: am aae4cd28: external/boringssl: work around Clang\'s lack of adrl. | |
| 8a27a4f am 256aa0e4: am 62d05888: external/boringssl: add P-521 back into the ClientHello. | |
| 838711c am 02d138cf: am e9ada863: external/boringssl: bump revision. | |
| f48ecc4 am fb1d49c2: am b3106a0c: Fix doc reference to EVP_AEAD_max_overhead | |
| d7727fa am 9861ddca: am b9b62a03: Rename ECDHE-PSK-WITH-AES-128-GCM-SHA256 to follow the naming conventions. | |
| 43db33b am a524abe3: am cbe62cb9: Rename ECDHE-PSK-WITH-AES-128-GCM-SHA256 to follow the naming conventions. | |
| 391dd16 am 9385cb18: MinGW on Linux uses lowercase include files, part 2 | |
| 9385cb1 MinGW on Linux uses lowercase include files, part 2 | |
| project external/bouncycastle/ | |
| a657c1d DO NOT MERGE bouncycastle: limit input length as specified by the NIST spec | |
| project external/conscrypt/ | |
| 87b44e3 keep history after reset to mnc-dr-dev | |
| b84145b Prevent duplicate certificates in TrustedCertificateIndex am: 4c9f9c2201 am: 1a86d30919 am: 825390d548 am: 360cc57672 am: 95de98f053 | |
| e03c349 Cache intermediate CA separately am: c4ab1b9592 am: 2138a380d7 am: edac131420 am: 7e3bc71b68 am: b65bd71126 | |
| 95de98f Prevent duplicate certificates in TrustedCertificateIndex am: 4c9f9c2201 am: 1a86d30919 am: 825390d548 am: 360cc57672 | |
| b65bd71 Cache intermediate CA separately am: c4ab1b9592 am: 2138a380d7 am: edac131420 am: 7e3bc71b68 | |
| 360cc57 Prevent duplicate certificates in TrustedCertificateIndex am: 4c9f9c2201 am: 1a86d30919 am: 825390d548 | |
| 7e3bc71 Cache intermediate CA separately am: c4ab1b9592 am: 2138a380d7 am: edac131420 | |
| 825390d Prevent duplicate certificates in TrustedCertificateIndex am: 4c9f9c2201 am: 1a86d30919 | |
| edac131 Cache intermediate CA separately am: c4ab1b9592 am: 2138a380d7 | |
| 1a86d30 Prevent duplicate certificates in TrustedCertificateIndex am: 4c9f9c2201 | |
| 2138a38 Cache intermediate CA separately am: c4ab1b9592 | |
| 4c9f9c2 Prevent duplicate certificates in TrustedCertificateIndex | |
| c4ab1b9 Cache intermediate CA separately | |
| 85fe54b Merge AOSP version of Conscrypt into mnc-ub-dev | |
| cc54d13 am c061be0f: Remove OpenSSLEngine.getSecretKeyById. | |
| 7a5149f am 59c13044: Remove references to OpenSSL\'s |wbuf|. | |
| 5274159 am ec8f7ef3: Switch OpenSSLMac from EVP_PKEY_HMAC to HMAC_CTX. | |
| be38ad8 resolved conflicts for 08fdfb45 to mnc-dr-dev-plus-aosp | |
| c061be0 Remove OpenSSLEngine.getSecretKeyById. | |
| 59c1304 Remove references to OpenSSL's |wbuf|. | |
| ec8f7ef Switch OpenSSLMac from EVP_PKEY_HMAC to HMAC_CTX. | |
| 08fdfb4 Prepare for BoringSSL update. | |
| 96b1236 resolved conflicts for f95bf503 to mnc-dr-dev-plus-aosp | |
| 1999952 am fc62838b: am 126ec77a: Move BlockGuard and CloseGuard to Platform | |
| fc62838 am 126ec77a: Move BlockGuard and CloseGuard to Platform | |
| f95bf50 Move BlockGuard and CloseGuard to Platform | |
| 126ec77 Move BlockGuard and CloseGuard to Platform | |
| aaa8eda am a6c6deb1: am 9a648e90: ct: Add code to verify timestamps for certificates. | |
| a6c6deb am 9a648e90: ct: Add code to verify timestamps for certificates. | |
| 9a648e9 ct: Add code to verify timestamps for certificates. | |
| d47e038 am 7fd087f5: am 05f3b16a: ct: Add basic data structures and serialization routines. | |
| af14778 am 68b4b9f5: am a5e36192: Merge "NativeCrypto: Add TLS SCT extension support." | |
| 7fd087f am 05f3b16a: ct: Add basic data structures and serialization routines. | |
| 68b4b9f am a5e36192: Merge "NativeCrypto: Add TLS SCT extension support." | |
| 1a8c946 am ea436918: am 95067e1c: Merge "NativeCrypto: support OCSP stapling" | |
| 705cf29 am c25fff23: resolved conflicts for 9c5c5900 to stage-aosp-master | |
| 05f3b16 ct: Add basic data structures and serialization routines. | |
| a5e3619 Merge "NativeCrypto: Add TLS SCT extension support." | |
| ea43691 am 95067e1c: Merge "NativeCrypto: support OCSP stapling" | |
| c25fff2 resolved conflicts for 9c5c5900 to stage-aosp-master | |
| 95067e1 Merge "NativeCrypto: support OCSP stapling" | |
| 9c5c590 Merge "NativeCrypto: add method to extract extensions from an OCSP response." | |
| 7e33d67 am 4be69d1b: am 7b3add1c: Prepare the GmsCore target for BoringSSL | |
| 4be69d1 am 7b3add1c: Prepare the GmsCore target for BoringSSL | |
| 7b3add1 Prepare the GmsCore target for BoringSSL | |
| 2edb18a am 13e50a17: Move CloseGuard and BlockGuard to stubs | |
| db8955a am 752593b8: am 2e939432: Move CloseGuard and BlockGuard to stubs | |
| 752593b am 2e939432: Move CloseGuard and BlockGuard to stubs | |
| 13e50a1 Move CloseGuard and BlockGuard to stubs | |
| 2e93943 Move CloseGuard and BlockGuard to stubs | |
| 5e3abd2 NativeCrypto: Add TLS SCT extension support. | |
| 32f3453 NativeCrypto: support OCSP stapling | |
| f45afe9 NativeCrypto: add method to extract extensions from an OCSP response. | |
| d593e6c am 79309ee8: am 8acb72c0: Fix typo in previous checkin | |
| 79309ee am 8acb72c0: Fix typo in previous checkin | |
| 8acb72c Fix typo in previous checkin | |
| 79c511e am e66c4e61: am 9c2fa52c: Allow compilation with other build systems | |
| e66c4e6 am 9c2fa52c: Allow compilation with other build systems | |
| 9c2fa52 Allow compilation with other build systems | |
| 9751701 am feeaf84d: am da473044: Do not waste entropy when using BoringSSL | |
| feeaf84 am da473044: Do not waste entropy when using BoringSSL | |
| 160fb3a am ddd2e4e8: am e5b2ed01: Restore compatibility with OpenSSL | |
| da47304 Do not waste entropy when using BoringSSL | |
| ddd2e4e am e5b2ed01: Restore compatibility with OpenSSL | |
| e5b2ed0 Restore compatibility with OpenSSL | |
| 94d3cc3 am e0fb5c39: resolved conflicts for 64c85650 to stage-aosp-master | |
| e0fb5c3 resolved conflicts for 64c85650 to stage-aosp-master | |
| 85af42f am df6db062: am eced839c: Remove references to OpenSSL\'s |wbuf|. | |
| df6db06 am eced839c: Remove references to OpenSSL\'s |wbuf|. | |
| 64c8565 Add method to delete extension from a certificate | |
| eced839 Remove references to OpenSSL's |wbuf|. | |
| 126a0ef am 6aea514e: am bb70f6a0: Add methods to parse keys from PEM input. | |
| 6aea514 am bb70f6a0: Add methods to parse keys from PEM input. | |
| bb70f6a Add methods to parse keys from PEM input. | |
| 6bbc4bf am 2ee9ef86: am f417aca8: Prepare for BoringSSL update. | |
| 2ee9ef8 am f417aca8: Prepare for BoringSSL update. | |
| f417aca Prepare for BoringSSL update. | |
| a84abc3 am a45b3777: (-s ours) am 44ecbe6c: Merge "external/conscrypt: allow server-initiated renegotiations." | |
| 53f48c5 am 55e0422c: (-s ours) am 295b30e7: external/conscrypt: allow server-initiated renegotiations. | |
| b970876 am 6321e464: (-s ours) am dbdd1433: GCM: set default tag size to 12 bytes | |
| 00c13cc am f87a8bb6: (-s ours) am 363ec650: GCM: return the correct AlgorithmParameters | |
| 74e9ff0 am 1f7f9361: (-s ours) am 6e2618d6: OpenSSLX509Certificate: use OID if alg name unavailable | |
| 6b65677 am 34a0e1c7: (-s ours) am 134dc92d: external/conscrypt: control binary-field EC with OPENSSL_NO_EC2M. | |
| a45b377 am 44ecbe6c: Merge "external/conscrypt: allow server-initiated renegotiations." | |
| cfb5faf am 57a06d67: am 295b30e7: external/conscrypt: allow server-initiated renegotiations. | |
| 57a06d6 am 295b30e7: external/conscrypt: allow server-initiated renegotiations. | |
| 55e0422 am 295b30e7: external/conscrypt: allow server-initiated renegotiations. | |
| fb3c34b am 44ecbe6c: Merge "external/conscrypt: allow server-initiated renegotiations." | |
| 44ecbe6 Merge "external/conscrypt: allow server-initiated renegotiations." | |
| ffc54d0 am dbdd1433: GCM: set default tag size to 12 bytes | |
| 7d29637 am 363ec650: GCM: return the correct AlgorithmParameters | |
| 6321e46 am dbdd1433: GCM: set default tag size to 12 bytes | |
| f87a8bb am 363ec650: GCM: return the correct AlgorithmParameters | |
| dbdd143 GCM: set default tag size to 12 bytes | |
| 363ec65 GCM: return the correct AlgorithmParameters | |
| ed628f9 external/conscrypt: allow server-initiated renegotiations. | |
| 1f7f936 am 6e2618d6: OpenSSLX509Certificate: use OID if alg name unavailable | |
| 10aee5e am 6e2618d6: OpenSSLX509Certificate: use OID if alg name unavailable | |
| 6e2618d OpenSSLX509Certificate: use OID if alg name unavailable | |
| 34a0e1c am 134dc92d: external/conscrypt: control binary-field EC with OPENSSL_NO_EC2M. | |
| abc0a6e am 134dc92d: external/conscrypt: control binary-field EC with OPENSSL_NO_EC2M. | |
| 6a55782 am a958f457: Update conscrypt build.gradle for the native generator | |
| a958f45 Update conscrypt build.gradle for the native generator | |
| 134dc92 external/conscrypt: control binary-field EC with OPENSSL_NO_EC2M. | |
| 1913a9e am d66d91af: am efe5c666: Update NativeCryptoTest | |
| d66d91a am efe5c666: Update NativeCryptoTest | |
| 4a3c219 am 5429f72d: Update NativeCryptoTest | |
| 85d0c70 am e2bab5ff: am 32a2648d: Merge "Adjust Signature interface for BoringSSL" into mnc-dev | |
| 5429f72 Update NativeCryptoTest | |
| bb5715a am 089b4018: Adjust Signature interface for BoringSSL | |
| e2bab5f am 32a2648d: Merge "Adjust Signature interface for BoringSSL" into mnc-dev | |
| 089b401 Adjust Signature interface for BoringSSL | |
| 41947de am 23e5ab20: am f7ab43f5: Merge "external/conscrypt: remove assertion SSL_OP_NO_SSLv2 is set" into mnc-dev | |
| 23e5ab2 am f7ab43f5: Merge "external/conscrypt: remove assertion SSL_OP_NO_SSLv2 is set" into mnc-dev | |
| 2eb5279 am 97e54bdd: external/conscrypt: remove assertion SSL_OP_NO_SSLv2 is set | |
| 97e54bd external/conscrypt: remove assertion SSL_OP_NO_SSLv2 is set | |
| 6fd6f86 am 05b39385: Merge changes I960960c3,Ifc556ba6,I34b9d839 | |
| 05b3938 Merge changes I960960c3,Ifc556ba6,I34b9d839 | |
| 086dd64 Update CryptoUpcalls documentation | |
| c63e8fa Documentation fixes | |
| d47aa92 OpenSSLCipher: remove unused variable | |
| 1df76a8 am c0010ca5: conscrypt: change test of SSL_set_cipher_lists | |
| 5359171 am ee6371fb: am 1d7e7b3c: conscrypt: change test of SSL_set_cipher_lists | |
| ee6371f am 1d7e7b3c: conscrypt: change test of SSL_set_cipher_lists | |
| c0010ca conscrypt: change test of SSL_set_cipher_lists | |
| 63f3b96 am e981ca93: Use the *_up_ref functions always | |
| e981ca9 Use the *_up_ref functions always | |
| cd08ed9 am a0014219: Switch OpenSSLMac from EVP_PKEY_HMAC to HMAC_CTX. | |
| 4806b99 am 922aa71c: Remove OpenSSLEngine.getSecretKeyById. | |
| a001421 Switch OpenSSLMac from EVP_PKEY_HMAC to HMAC_CTX. | |
| 8439c8f am c05697c2: Use SSL_CTX_set_tmp_ecdh instead of SSL_CTX_set_tmp_ecdh_callback. | |
| 2a6e7f9 am 3b510c7c: Consistently use ARRAY_OFFSET_*INVALID macros. | |
| 922aa71 Remove OpenSSLEngine.getSecretKeyById. | |
| c05697c Use SSL_CTX_set_tmp_ecdh instead of SSL_CTX_set_tmp_ecdh_callback. | |
| 3b510c7 Consistently use ARRAY_OFFSET_*INVALID macros. | |
| f3893fc am d1462fa5: am 199a1346: Fix compilation with OpenSSL | |
| d1462fa am 199a1346: Fix compilation with OpenSSL | |
| d7f7dd2 am d9a48aa4: Fix compilation with OpenSSL | |
| d34e36a am c432f1ac: am ccb8225a: Fix error conditions in certificate/PKCS#7 reading | |
| f071d98 am 79f05f46: Fix error conditions in certificate/PKCS#7 reading | |
| d9a48aa Fix compilation with OpenSSL | |
| c432f1a am ccb8225a: Fix error conditions in certificate/PKCS#7 reading | |
| 79f05f4 Fix error conditions in certificate/PKCS#7 reading | |
| d70040f am df8b432e: am d6828c47: Merge "Fix up JNI_TRACE for AEAD" into mnc-dev | |
| df8b432 am d6828c47: Merge "Fix up JNI_TRACE for AEAD" into mnc-dev | |
| d50db57 am 8edf3d59: am 05a87ee0: Merge "external/conscrypt: tweaks for next BoringSSL import." into mnc-dev | |
| 8edf3d5 am 05a87ee0: Merge "external/conscrypt: tweaks for next BoringSSL import." into mnc-dev | |
| 0a9f221 am 02f3a42e: am 1127c196: OpenSSLCipher: adjust expected length with padding in decrypt mode | |
| 02f3a42 am 1127c196: OpenSSLCipher: adjust expected length with padding in decrypt mode | |
| e13ea39 am c590a930: Try to get preferred external provider | |
| 7e63460 am edc4f273: Fix up JNI_TRACE for AEAD | |
| ad05255 am 51cb4081: am dc51d744: Merge "Try to get preferred external provider" into mnc-dev | |
| 21498f9 am d2f396ff: am e90640d7: Merge "Fix RSA upcalls from TLS/SSL into JCA." into mnc-dev | |
| 8d51eaa am f9473fd7: am 9bca53ce: Fix ECDSA upcalls from TLS/SSL into JCA. | |
| 51cb408 am dc51d744: Merge "Try to get preferred external provider" into mnc-dev | |
| d2f396f am e90640d7: Merge "Fix RSA upcalls from TLS/SSL into JCA." into mnc-dev | |
| f9473fd am 9bca53ce: Fix ECDSA upcalls from TLS/SSL into JCA. | |
| c590a93 Try to get preferred external provider | |
| edc4f27 Fix up JNI_TRACE for AEAD | |
| 1be74e2 am cad51a15: am d65ea6de: NativeCrypto: special case for empty cipher list | |
| 79a9e89 am 279e9845: Fix RSA upcalls from TLS/SSL into JCA. | |
| ffae81d am 61c66eb9: Fix ECDSA upcalls from TLS/SSL into JCA. | |
| 279e984 Fix RSA upcalls from TLS/SSL into JCA. | |
| 61c66eb Fix ECDSA upcalls from TLS/SSL into JCA. | |
| 0f67f0d am 873ce6b5: Merge "Add clang-format file to approximate existing style" | |
| 1224c88 am 5b6a5ecc: NativeCrypto: special case for empty cipher list | |
| fe45113 am 8fa4acdc: OpenSSLCipher: adjust expected length with padding in decrypt mode | |
| cad51a1 am d65ea6de: NativeCrypto: special case for empty cipher list | |
| 873ce6b Merge "Add clang-format file to approximate existing style" | |
| 5b6a5ec NativeCrypto: special case for empty cipher list | |
| a8a4643 Add clang-format file to approximate existing style | |
| 8fa4acd OpenSSLCipher: adjust expected length with padding in decrypt mode | |
| 3b3a79f am c818cef3: Merge "external/conscrypt: tweaks for next BoringSSL import." | |
| c818cef Merge "external/conscrypt: tweaks for next BoringSSL import." | |
| e13d25d am 629b1a5f: Merge "Revert "OpenSSLCipher: adjust expected length with padding in decrypt mode"" | |
| 629b1a5 Merge "Revert "OpenSSLCipher: adjust expected length with padding in decrypt mode"" | |
| d7dbb00 Revert "OpenSSLCipher: adjust expected length with padding in decrypt mode" | |
| 279f7f3 am 6fc7f129: Merge "OpenSSLCipher: adjust expected length with padding in decrypt mode" | |
| 6fc7f12 Merge "OpenSSLCipher: adjust expected length with padding in decrypt mode" | |
| ba3f063 external/conscrypt: tweaks for next BoringSSL import. | |
| 7333692 am 347ed082: am ec5fc041: am 6d395955: am 3898f6c9: am f6822ebc: am fae34604: am de55e62f: OpenSSLX509Certificate: mark mContext as transient | |
| 347ed08 am ec5fc041: am 6d395955: am 3898f6c9: am f6822ebc: am fae34604: am de55e62f: OpenSSLX509Certificate: mark mContext as transient | |
| eb3a7e3 OpenSSLCipher: adjust expected length with padding in decrypt mode | |
| cbd840f am a5e841ae: am 497e87d4: Merge "NativeCrypto: return of 0 is error for EVP_Sign/VerifyFinal" into mnc-dev | |
| 71a56e7 am 4ecb28ce: am 53629cfd: OpenSSLKey: unsupported algorithm is an InvalidKeyException | |
| a5e841a am 497e87d4: Merge "NativeCrypto: return of 0 is error for EVP_Sign/VerifyFinal" into mnc-dev | |
| 4ecb28c am 53629cfd: OpenSSLKey: unsupported algorithm is an InvalidKeyException | |
| bbc1d9c am aa029a4d: Merge "OpenSSLKey: unsupported algorithm is an InvalidKeyException" | |
| c8d7574 am 49854878: NativeCrypto: return of 0 is error for EVP_Sign/VerifyFinal | |
| aa029a4 Merge "OpenSSLKey: unsupported algorithm is an InvalidKeyException" | |
| fbe93ee am b50c1961: am d5d7063d: NativeCrypto: throw exception on RSA op failure | |
| 8436227 am 58b697b1: am 8d57b9db: OpenSSLX509Certificate: mark mContext as transient | |
| 4985487 NativeCrypto: return of 0 is error for EVP_Sign/VerifyFinal | |
| ed396e9 OpenSSLKey: unsupported algorithm is an InvalidKeyException | |
| b50c196 am d5d7063d: NativeCrypto: throw exception on RSA op failure | |
| 58b697b am 8d57b9db: OpenSSLX509Certificate: mark mContext as transient | |
| a6aaa7d am 6a1e7070: NativeCrypto: throw exception on RSA op failure | |
| 85b6328 am 6e70a402: am 42b8c5e4: Revert "OpenSSLX509Certificate: mark mContext as transient" | |
| 6a1e707 NativeCrypto: throw exception on RSA op failure | |
| 6e70a40 am 42b8c5e4: Revert "OpenSSLX509Certificate: mark mContext as transient" | |
| ea937dd am 5256f9fc: am 998fbfcd: OpenSSLX509Certificate: mark mContext as transient | |
| 5256f9f am 998fbfcd: OpenSSLX509Certificate: mark mContext as transient | |
| e0c4470 am c83f99c0: am 86733983: Use |BIO_read_asn1| when parsing PKCS#7. | |
| a324f06 am f762c265: am d82dc06f: Add isFinite flag to OpenSSLBIOInputStream. | |
| c83f99c am 86733983: Use |BIO_read_asn1| when parsing PKCS#7. | |
| f762c26 am d82dc06f: Add isFinite flag to OpenSSLBIOInputStream. | |
| 080b950 am 0f84dc61: Use |BIO_read_asn1| when parsing PKCS#7. | |
| 917f4b5 am 66537ee0: Add isFinite flag to OpenSSLBIOInputStream. | |
| 0f84dc6 Use |BIO_read_asn1| when parsing PKCS#7. | |
| 66537ee Add isFinite flag to OpenSSLBIOInputStream. | |
| d4ae600 am 51b568dc: am 959e25c3: SSL: select the right key type for kx | |
| f0747bf am d8606d56: SSL: select the right key type for kx | |
| 51b568d am 959e25c3: SSL: select the right key type for kx | |
| d8606d5 SSL: select the right key type for kx | |
| 78bc77f am 0c68902d: Merge "EVP_AEAD: change constant to work with non-BoringSSL" | |
| 14a85a1 am bcb2285a: Merge "Throw InvalidKeyException from ECDH_compute_key" | |
| 720e937 am 1a86c544: Stop printing out private key parameters, part 2 | |
| 0c68902 Merge "EVP_AEAD: change constant to work with non-BoringSSL" | |
| bcb2285 Merge "Throw InvalidKeyException from ECDH_compute_key" | |
| 3e1a686 EVP_AEAD: change constant to work with non-BoringSSL | |
| 1a86c54 Stop printing out private key parameters, part 2 | |
| 2b3a4bd Throw InvalidKeyException from ECDH_compute_key | |
| 1eec616 am 7c5b76c9: Stop printing out private key parameters | |
| 7c5b76c Stop printing out private key parameters | |
| 1ebb4bb am 1bdeafac: am 732e4009: Move BoringSSL indication to NativeConstants | |
| 5ea43ce am f5b4518e: Move BoringSSL indication to NativeConstants | |
| 1bdeafa am 732e4009: Move BoringSSL indication to NativeConstants | |
| e15fba5 am 96b561d7: Merge "Fix fast path for OpenSSLECPublicKey" | |
| f5b4518 Move BoringSSL indication to NativeConstants | |
| 96b561d Merge "Fix fast path for OpenSSLECPublicKey" | |
| 2082018 am a5cf81aa: external/conscrypt: don\'t define equals for OpenSSLECGroupContext and OpenSSLECPointContext. | |
| a5cf81a external/conscrypt: don't define equals for OpenSSLECGroupContext and OpenSSLECPointContext. | |
| cac9de8 Fix fast path for OpenSSLECPublicKey | |
| ed1c422 am 2ab019b7: am 7096c9f1: Update to latest Conscrypt | |
| f4592df am a205ed44: am ba37a5ed: am 57ad13fd: Silence unused result warnings in conscrypt. | |
| 0c89eba am 85beec82: am 066b2017: am 8d18c8a7: external/conscrypt: fix WITH_JNI_TRACE in light of BoringSSL update. | |
| a917ba1 am 0a697948: am c1967b3c: am 7c0a4c86: Fix OpenSSL build for new AEAD changes | |
| 6bec2f2 am fe56e2c8: am cef195b0: am f6f6620c: OpenSSLCipher: add AEAD cipher | |
| 2d234d4 am e0d5fa3c: am f88004ae: am 110054e9: OpenSSLCipher: refactor in preparation for AEAD | |
| e6836ca am 51a77b61: am cc88292e: am 9b343fce: Rename Arrays to ArrayUtils | |
| 6fbd580 am 5b043fe0: am 148c349f: am 6e1d9d24: Add style info for the C++ files | |
| 8a73f15 am a1aca4fb: am 9d84edba: am 09b021a5: conscrypt: guard some error values that will be removed in BoringSSL. | |
| c04c8b5 am 8fcabe15: am 5eb887ac: am 7b0e91bc: Disable RSA blinding for BoringSSL with no public exponent | |
| 805597e am f7bcbab9: am b4040bb3: am c52b2306: Merge mnc-dev-plus-aosp into mnc-dev | |
| 693c44b am c8c0e036: am f6fbfb90: am fbb754fc: Disable RSA blinding for BoringSSL with no public exponent | |
| 2ab019b am 7096c9f1: Update to latest Conscrypt | |
| a205ed4 am ba37a5ed: am 57ad13fd: Silence unused result warnings in conscrypt. | |
| 85beec8 am 066b2017: am 8d18c8a7: external/conscrypt: fix WITH_JNI_TRACE in light of BoringSSL update. | |
| 0a69794 am c1967b3c: am 7c0a4c86: Fix OpenSSL build for new AEAD changes | |
| fe56e2c am cef195b0: am f6f6620c: OpenSSLCipher: add AEAD cipher | |
| e0d5fa3 am f88004ae: am 110054e9: OpenSSLCipher: refactor in preparation for AEAD | |
| 51a77b6 am cc88292e: am 9b343fce: Rename Arrays to ArrayUtils | |
| 5b043fe am 148c349f: am 6e1d9d24: Add style info for the C++ files | |
| a1aca4f am 9d84edba: am 09b021a5: conscrypt: guard some error values that will be removed in BoringSSL. | |
| 8fcabe1 am 5eb887ac: am 7b0e91bc: Disable RSA blinding for BoringSSL with no public exponent | |
| f7bcbab am b4040bb3: am c52b2306: Merge mnc-dev-plus-aosp into mnc-dev | |
| c8c0e03 am f6fbfb90: am fbb754fc: Disable RSA blinding for BoringSSL with no public exponent | |
| 8b82eac am 05b8e50d: external/conscrypt: support arbitrary ECC groups. | |
| project external/deqp/ | |
| c509a7f Increase GLES2 fbo comparison threshold to 0.03 am: 3f450ecc23 | |
| 3f450ec Increase GLES2 fbo comparison threshold to 0.03 | |
| 58213c3 Remove few tests affected by a HW limitation am: 3f71117a2f | |
| 3f71117 Remove few tests affected by a HW limitation | |
| 46e148f DO NOT MERGE: Restore accidentally reverted mustpass .txt changes am: 6b37e7d055 -s ours am: 9db7fe6a6b -s ours | |
| 9db7fe6 DO NOT MERGE: Restore accidentally reverted mustpass .txt changes am: 6b37e7d055 -s ours | |
| 6b37e7d DO NOT MERGE: Restore accidentally reverted mustpass .txt changes | |
| 34df1a2 DO NOT MERGE Refresh GLES 3.1 must-pass XML am: d8e85a9be9 -s ours am: ba3d0b4eb3 -s ours | |
| d7770da DO NOT MERGE Remove MSAA wide line derivate tests am: 0fb14e82f6 -s ours am: ba10fd03cf -s ours | |
| 01e0351 Merge "DO NOT MERGE: Add cube gather tests that avoid corners; remove D32F from mustpass" into lollipop-mr1-cts-dev am: 06627c74b4 -s ours am: 8d3eeada70 -s ours | |
| 79196e0 Merge "Remove broken record_variable_selection test from MR1 must-pass." into lollipop-mr1-cts-dev am: 67685b11a4 am: a9172fd9d6 | |
| 1c3966a DO NOT MERGE: Apply fix for tessellation fractional even test verification. am: a77161bb85 -s ours am: f3ee969416 -s ours | |
| 5a672a9 DO NOT MERGE Do not require signed zero support in ldexp tests() am: 5b076d99a8 -s ours am: 769e70972b -s ours | |
| 4a09925 DO NOT MERGE: Ignore denormals in floatUlpThresholdCompare. am: 5c7feb8db2 -s ours am: be2f5437ea -s ours | |
| ba3d0b4 DO NOT MERGE Refresh GLES 3.1 must-pass XML am: d8e85a9be9 -s ours | |
| ba10fd0 DO NOT MERGE Remove MSAA wide line derivate tests am: 0fb14e82f6 -s ours | |
| 8d3eead Merge "DO NOT MERGE: Add cube gather tests that avoid corners; remove D32F from mustpass" into lollipop-mr1-cts-dev am: 06627c74b4 -s ours | |
| a9172fd Merge "Remove broken record_variable_selection test from MR1 must-pass." into lollipop-mr1-cts-dev am: 67685b11a4 | |
| f3ee969 DO NOT MERGE: Apply fix for tessellation fractional even test verification. am: a77161bb85 -s ours | |
| 769e709 DO NOT MERGE Do not require signed zero support in ldexp tests() am: 5b076d99a8 -s ours | |
| be2f543 DO NOT MERGE: Ignore denormals in floatUlpThresholdCompare. am: 5c7feb8db2 -s ours | |
| d8e85a9 DO NOT MERGE Refresh GLES 3.1 must-pass XML | |
| 0fb14e8 DO NOT MERGE Remove MSAA wide line derivate tests | |
| project external/dnsmasq/ | |
| b955ca6 am 96590334: am 0e86c5a1: am 7a12cb36: am 4e0ada97: Properly initialize struct irec pointers after malloc() | |
| 9659033 am 0e86c5a1: am 7a12cb36: am 4e0ada97: Properly initialize struct irec pointers after malloc() | |
| 0e86c5a am 7a12cb36: am 4e0ada97: Properly initialize struct irec pointers after malloc() | |
| 7a12cb3 am 4e0ada97: Properly initialize struct irec pointers after malloc() | |
| 4e0ada9 Properly initialize struct irec pointers after malloc() | |
| project external/doclava/ | |
| 77cd5e5 Properly expose methods that override a non-hidden method in a hidden superclass in the API files. | |
| 7d88743 Add a flag to control the annotated field visibility exception | |
| 7252230 DO NOT MERGE Revert "D.N.M. Revert "Display annotations and annotation values when they are requested"" | |
| 846e468 DO NOT MERGE Revert "Display annotations and annotation values when they are requested" | |
| project external/flac/ | |
| e685ca5 am f9d095a5: am 2470e51d: Add macro definitions for clang/llvm. | |
| f9d095a am 2470e51d: Add macro definitions for clang/llvm. | |
| 2470e51 Add macro definitions for clang/llvm. | |
| 58dd0a9 am 85df1e3a: am 63541e6d: am 9617601b: am cf87d19d: Revert "libFLAC/stream_decoder.c : Fail safely to avoid a heap overflow." | |
| 85df1e3 am 63541e6d: am 9617601b: am cf87d19d: Revert "libFLAC/stream_decoder.c : Fail safely to avoid a heap overflow." | |
| 63541e6 am 9617601b: am cf87d19d: Revert "libFLAC/stream_decoder.c : Fail safely to avoid a heap overflow." | |
| 9617601 am cf87d19d: Revert "libFLAC/stream_decoder.c : Fail safely to avoid a heap overflow." | |
| cf87d19 Revert "libFLAC/stream_decoder.c : Fail safely to avoid a heap overflow." | |
| cb84173 am 4e2a8e33: am 649952f9: am 1e5f0b6c: am 1d948ef7: libFLAC/stream_decoder.c : Fail safely to avoid a heap overflow. | |
| 4e2a8e3 am 649952f9: am 1e5f0b6c: am 1d948ef7: libFLAC/stream_decoder.c : Fail safely to avoid a heap overflow. | |
| 649952f am 1e5f0b6c: am 1d948ef7: libFLAC/stream_decoder.c : Fail safely to avoid a heap overflow. | |
| 1e5f0b6 am 1d948ef7: libFLAC/stream_decoder.c : Fail safely to avoid a heap overflow. | |
| 1d948ef libFLAC/stream_decoder.c : Fail safely to avoid a heap overflow. | |
| project external/glide/ | |
| ce1d390 keep history after reset to ub-camera-haleakala | |
| b4b82b7 am ac008b79: keep history after reset to ub-camera-haleakala | |
| d9f89c5 Merge branch 'mnc-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/external/glide into mnc-ub-dev | |
| project external/hamcrest/ | |
| 3e8fd45 Revert "Add a configuration to hamcrest-library build.gradle" | |
| 87e430c Add a configuration to hamcrest-library build.gradle | |
| project external/icu/ | |
| 8dee406 am e1bffda5: Update timezone data to 2015g | |
| 925024d am 45d8f49c: Update timezone data to 2015f | |
| 00d2d93 am df0d7637: (-s ours) Cherrypick http://bugs.icu-project.org/trac/changeset/37162. DO NOT MERGE | |
| df0d763 Cherrypick http://bugs.icu-project.org/trac/changeset/37162. DO NOT MERGE | |
| project external/jetty/ | |
| 7bed928 Add files necessary for building with gradle to external/jetty. | |
| project external/libavc/ | |
| 64112d2 Return error when there are more mmco params than allocated size am: 943323f1d9 | |
| 943323f Return error when there are more mmco params than allocated size | |
| 608fc7f Decoder Update mb count after mb map is set. am: 4a524d3a8a | |
| 4a524d3 Decoder Update mb count after mb map is set. | |
| project external/libmpeg2/ | |
| 70d01da Merge "Return error for wrong mb_type" into mnc-dev am: e1ac7e3c6c | |
| f1b3987 Fix for handling streams which resulted in negative num_mbs_left am: ba604d336b | |
| e1ac7e3 Merge "Return error for wrong mb_type" into mnc-dev | |
| 58a6822 Return error for wrong mb_type | |
| ba604d3 Fix for handling streams which resulted in negative num_mbs_left | |
| 9412172 Fixed stack buffer overflow am: 8b4ed5a231 | |
| 8b4ed5a Fixed stack buffer overflow | |
| 3997a42 Fixed bit stream access to make sure that it is not read beyond the allocated size. am: ffab15eb80 | |
| ffab15e Fixed bit stream access to make sure that it is not read beyond the allocated size. | |
| project external/libnfc-nci/ | |
| 53b8f70 Don\'t free memory that shouldn\'t be freed. am: 633b73f890 | |
| a6ee33c Fix 256-bit Thinfilm NFC barcode. am: 920423e954 | |
| 0b0bc17 am f85bfd06: Use global all-cpp-files-under | |
| bc2e8f4 Set power level to 0 when stack shuts down | |
| project external/libpng/ | |
| bbe98b4 Update libpng to 1.6.20 | |
| 5d53c06 am 21499444: am 00376b4d: Avoid a harmless potential integer overflow in png_XYZ_from_xy(). | |
| 2149944 am 00376b4d: Avoid a harmless potential integer overflow in png_XYZ_from_xy(). | |
| 00376b4 Avoid a harmless potential integer overflow in png_XYZ_from_xy(). | |
| project external/libvpx/ | |
| 41607d2 Fix ParseElementHeader to support 0 payload elements | |
| project external/lzma/ | |
| e0f90d7 Set xz-java library to compile using current sdk for use by unbundled apps | |
| 4372c8b Import org.tukaani am: ad6cd04413 | |
| 1e977d7 Import org.tukaani | |
| ad6cd04 Import org.tukaani | |
| c23ef9b Merge "Update the Android makefile to include most C files." | |
| ea63289 Update the Android makefile to include most C files. | |
| 4c8384f Merge "Updated LZMA SDK to 9.38 beta." | |
| cd66d54 Updated LZMA SDK to 9.38 beta. | |
| project external/okhttp/ | |
| 8857d6f Merge "DO NOT MERGE: Fix URLConnectionTest.writeTimeouts with large receive buffers" into marshmallow-cts-dev am: c4b12fab81 -s ours am: 6247b330f4 | |
| 6247b33 Merge "DO NOT MERGE: Fix URLConnectionTest.writeTimeouts with large receive buffers" into marshmallow-cts-dev am: c4b12fab81 -s ours | |
| c4b12fa Merge "DO NOT MERGE: Fix URLConnectionTest.writeTimeouts with large receive buffers" into marshmallow-cts-dev | |
| 62dc0a1 DO NOT MERGE: Fix URLConnectionTest.writeTimeouts with large receive buffers | |
| project external/parameter-framework/ | |
| 771d851 resolved conflicts for merge of 531c26be to cw-e-dev | |
| 531c26b stlport library is needed for versions of Android before M | |
| project external/protobuf/ | |
| 6180b68 am d7f9473d: am 1817ed30: Merge "Update CodedOutputByteBufferNano to properly handle a malformed surrogate pair with a buffer too small to output a potentially well formed surrogate pair. This behavior mimics that of the ByteBuffer based methods." | |
| d7f9473 am 1817ed30: Merge "Update CodedOutputByteBufferNano to properly handle a malformed surrogate pair with a buffer too small to output a potentially well formed surrogate pair. This behavior mimics that of the ByteBuffer based methods." | |
| 1817ed3 Merge "Update CodedOutputByteBufferNano to properly handle a malformed surrogate pair with a buffer too small to output a potentially well formed surrogate pair. This behavior mimics that of the ByteBuffer based methods." | |
| d2195e1 Update CodedOutputByteBufferNano to properly handle a malformed surrogate pair with a buffer too small to output a potentially well formed surrogate pair. This behavior mimics that of the ByteBuffer based methods. | |
| 9eb445d am d85b156e: am 89fa3126: Merge "Update thei Protocol Buffer descriptor.proto with the new javanano_use_deprecated_package FileOption. Regenerated the descriptor.pb.{c,h} based on the new proto file." | |
| d85b156 am 89fa3126: Merge "Update thei Protocol Buffer descriptor.proto with the new javanano_use_deprecated_package FileOption. Regenerated the descriptor.pb.{c,h} based on the new proto file." | |
| 89fa312 Merge "Update thei Protocol Buffer descriptor.proto with the new javanano_use_deprecated_package FileOption. Regenerated the descriptor.pb.{c,h} based on the new proto file." | |
| 6d7e42a Update thei Protocol Buffer descriptor.proto with the new javanano_use_deprecated_package FileOption. Regenerated the descriptor.pb.{c,h} based on the new proto file. | |
| b077fae am 738a73ad: am 999188d0: Add MODULE_LICENSE and NOTICE | |
| 738a73a am 999188d0: Add MODULE_LICENSE and NOTICE | |
| 999188d Add MODULE_LICENSE and NOTICE | |
| 7875d5d am a491cabf: am 2f4d8a1b: Fixed Unused Parameter warning in headers. | |
| a491cab am 2f4d8a1b: Fixed Unused Parameter warning in headers. | |
| 8b51c00 am 9ef21495: am 343ef18b: Merge "Fixed Unused Parameter warning in headers." | |
| 9ef2149 am 343ef18b: Merge "Fixed Unused Parameter warning in headers." | |
| 343ef18 Merge "Fixed Unused Parameter warning in headers." | |
| 4a00786 Fixed Unused Parameter warning in headers. | |
| b51b194 am 9b4557e1: resolved conflicts for merge of dc5bca2a to mnc-dev-plus-aosp | |
| 9b4557e resolved conflicts for merge of dc5bca2a to mnc-dev-plus-aosp | |
| dc5bca2 Merge "Add a flag to use offset/length with byte arrays." | |
| 4f87f0d Add a flag to use offset/length with byte arrays. | |
| 0fc6d62 am 72ae3583: am 210d15c8: Merge "Speed up little endian int/long writes." | |
| 72ae358 am 210d15c8: Merge "Speed up little endian int/long writes." | |
| 210d15c Merge "Speed up little endian int/long writes." | |
| b6872c8 Speed up little endian int/long writes. | |
| 17282c2 am ff12ec27: am 6a6ad15b: Merge "Handle 0-length byte buffers in micro and nano protobufs" | |
| ff12ec2 am 6a6ad15b: Merge "Handle 0-length byte buffers in micro and nano protobufs" | |
| 2c5770a am 4d8b123b: Handle 0-length byte buffers in micro and nano protobufs | |
| 6a6ad15 Merge "Handle 0-length byte buffers in micro and nano protobufs" | |
| 5843810 Handle 0-length byte buffers in micro and nano protobufs | |
| 5d74b1f am 90ca7bfb: (-s ours) am 4a967333: (-s ours) am 2a22b4d8: DO NOT MERGE | |
| project external/robolectric/ | |
| f522a20 Upgrade Robolectric v3 | |
| 111f436 Backport robolectric 3.1 from master to mnc-ub-dev | |
| a9e2f60 Update Robolectric v3. | |
| 5525767 Update Robolectric v3. | |
| 61cd34b am 169ccb86: am 6d201a1b: Add MODULE_LICENSE and NOTICE | |
| 169ccb8 am 6d201a1b: Add MODULE_LICENSE and NOTICE | |
| 6d201a1 Add MODULE_LICENSE and NOTICE | |
| 9c7c403 am 99fafb79: Add Robov3 to external/robolectric | |
| 99fafb7 Add Robov3 to external/robolectric | |
| e5966b3 Add Robov3 to external/robolectric | |
| project external/sepolicy/ | |
| d76ccad DO NOT MERGE: Further restrict access to socket ioctl commands am: 57531cacb4 am: c0ce53cc8d am: f290a2ddd0 | |
| f290a2d DO NOT MERGE: Further restrict access to socket ioctl commands am: 57531cacb4 am: c0ce53cc8d | |
| c0ce53c DO NOT MERGE: Further restrict access to socket ioctl commands am: 57531cacb4 | |
| 57531ca DO NOT MERGE: Further restrict access to socket ioctl commands | |
| 4fc1397 Add policies for system_server to delete fpdata folder | |
| 1c749e0 Enable permission checking by binderservicedomain. am: 32d207e042 | |
| 753148a Merge "Revert "Update sepolicy to allow ThermalObserver system service"" into cw-e-dev | |
| 2d8c2d9 Revert "Update sepolicy to allow ThermalObserver system service" | |
| 4bb2bdc Merge remote-tracking branch \'goog/mnc-cts-release\' into HEAD am: 7d20f40879 am: a8bbe96d8b am: 5eac92174c | |
| 40367ad Merge "untrusted_apps: Allow untrusted apps to find healthd_service." into mnc-dr-dev am: 6ab438dc8b | |
| 4cf4ce3 am 9fcc949f: am 63af426a: bluetooth.te: Relax bluetooth neverallow rule. am: 33a779fecb | |
| cda36e3 Update sepolicy to allow ThermalObserver system service | |
| f5d828d am 48dae29f: Merge "Allow system_server to bind ping sockets." into mnc-dr-dev | |
| 887fd5d am 0b764ae9: Allow untrusted_app to list services. | |
| bea8a99 DO NOT MERGE Grant Bluetooth the ability to acquire wake locks. | |
| project external/sonivox/ | |
| 6292554 Sonivox: add SafetyNet log. am: 24d7c408c5 am: f3f1da3028 am: 95a4f1d4af | |
| 95a4f1d Sonivox: add SafetyNet log. am: 24d7c408c5 am: f3f1da3028 | |
| f3f1da3 Sonivox: add SafetyNet log. am: 24d7c408c5 | |
| 24d7c40 Sonivox: add SafetyNet log. | |
| fdfca54 Sonivox: sanity check numSamples. am: 3ac044334c am: 7ddf08ce3b am: 68ea08e38a | |
| 68ea08e Sonivox: sanity check numSamples. am: 3ac044334c am: 7ddf08ce3b | |
| 7ddf08c Sonivox: sanity check numSamples. am: 3ac044334c | |
| 3ac0443 Sonivox: sanity check numSamples. | |
| c9e27ee am 23eb37d0: am 515e28dd: am a12313fe: Fix S_SMF_DATA.numStreams being non-zero while streams is uninitialized | |
| 23eb37d am 515e28dd: am a12313fe: Fix S_SMF_DATA.numStreams being non-zero while streams is uninitialized | |
| 515e28d am a12313fe: Fix S_SMF_DATA.numStreams being non-zero while streams is uninitialized | |
| a12313f Fix S_SMF_DATA.numStreams being non-zero while streams is uninitialized | |
| project external/sqlite/ | |
| df5881e Fix world-readable permissions due to sqlite race condition - DO NOT MERGE am: cccf840917 -s ours am: fe453fb752 -s ours am: 07b874ecae am: 8e2817f3bc -s ours | |
| 8e2817f Fix world-readable permissions due to sqlite race condition - DO NOT MERGE am: cccf840917 -s ours am: fe453fb752 -s ours am: 07b874ecae | |
| 07b874e Fix world-readable permissions due to sqlite race condition - DO NOT MERGE am: cccf840917 -s ours am: fe453fb752 -s ours | |
| fe453fb Fix world-readable permissions due to sqlite race condition - DO NOT MERGE am: cccf840917 -s ours | |
| cccf840 Fix world-readable permissions due to sqlite race condition - DO NOT MERGE | |
| 303825f sqlite: upgrade to patched SQLite 3.7.11 - DO NOT MERGE am: 12dfd6176d -s ours am: df6c040b1f -s ours am: e12cde1e17 am: 0aeee1f9e4 -s ours | |
| 0aeee1f sqlite: upgrade to patched SQLite 3.7.11 - DO NOT MERGE am: 12dfd6176d -s ours am: df6c040b1f -s ours am: e12cde1e17 | |
| e12cde1 sqlite: upgrade to patched SQLite 3.7.11 - DO NOT MERGE am: 12dfd6176d -s ours am: df6c040b1f -s ours | |
| df6c040 sqlite: upgrade to patched SQLite 3.7.11 - DO NOT MERGE am: 12dfd6176d -s ours | |
| 040b55c am 31123c6f: Merge commit \'85484a42\' into manualmerge | |
| 31123c6 Merge commit '85484a42' into manualmerge | |
| 85484a4 am 58a0c486: sqlite: upgrade to SQLite 3.8.6.1 - DO NOT MERGE | |
| 12dfd61 sqlite: upgrade to patched SQLite 3.7.11 - DO NOT MERGE | |
| 58a0c48 sqlite: upgrade to SQLite 3.8.6.1 - DO NOT MERGE | |
| project external/zlib/ | |
| 4423567 Always use the NDK for unbundled branches. | |
| project frameworks/av/ | |
| 9dacf27 resolve merge conflicts of 88b736a198 to lmp-dev. am: 899823966e am: 0fefc974ff am: 295a488e49 am: 1ab7985b88 am: 6313e262f9 -s ours am: 2da2f1b383 am: eab078d0b1 am: 240c2126e4 | |
| 240c212 resolve merge conflicts of 88b736a198 to lmp-dev. am: 899823966e am: 0fefc974ff am: 295a488e49 am: 1ab7985b88 am: 6313e262f9 -s ours am: 2da2f1b383 am: eab078d0b1 | |
| eab078d resolve merge conflicts of 88b736a198 to lmp-dev. am: 899823966e am: 0fefc974ff am: 295a488e49 am: 1ab7985b88 am: 6313e262f9 -s ours am: 2da2f1b383 | |
| 2da2f1b resolve merge conflicts of 88b736a198 to lmp-dev. am: 899823966e am: 0fefc974ff am: 295a488e49 am: 1ab7985b88 am: 6313e262f9 -s ours | |
| 6313e26 resolve merge conflicts of 88b736a198 to lmp-dev. am: 899823966e am: 0fefc974ff am: 295a488e49 am: 1ab7985b88 | |
| 1ab7985 resolve merge conflicts of 88b736a198 to lmp-dev. am: 899823966e am: 0fefc974ff am: 295a488e49 | |
| 295a488 resolve merge conflicts of 88b736a198 to lmp-dev. am: 899823966e am: 0fefc974ff | |
| 0fefc97 resolve merge conflicts of 88b736a198 to lmp-dev. am: 899823966e | |
| 8998239 resolve merge conflicts of 88b736a198 to lmp-dev. | |
| 3a0d1df Camera: Disallow dumping clients directly am: c400396525 am: 795243686f am: fb5043a703 | |
| fb5043a Camera: Disallow dumping clients directly am: c400396525 am: 795243686f | |
| 88b736a Camera: Disallow dumping clients directly am: c9ab2b0bb0 | |
| 7952436 Camera: Disallow dumping clients directly am: c400396525 | |
| c400396 Camera: Disallow dumping clients directly | |
| c9ab2b0 Camera: Disallow dumping clients directly | |
| 72bc40d Camera: set mNumberOfNormalCameras correctly am: 6dd6c54651 | |
| 6dd6c54 Camera: set mNumberOfNormalCameras correctly | |
| eb65c5f Merge "audioflinger: fix standby delay on A2DP output" into mnc-dr1.5-dev | |
| 827e120 Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac8f617b am: e2e46f5fa1 am: 2304c606eb am: 0945199000 am: a39f981875 am: e463301aa4 am: 0dd00d9b19 | |
| 0dd00d9 Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac8f617b am: e2e46f5fa1 am: 2304c606eb am: 0945199000 am: a39f981875 am: e463301aa4 | |
| e463301 Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac8f617b am: e2e46f5fa1 am: 2304c606eb am: 0945199000 am: a39f981875 | |
| a39f981 Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac8f617b am: e2e46f5fa1 am: 2304c606eb am: 0945199000 | |
| 0945199 Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac8f617b am: e2e46f5fa1 am: 2304c606eb | |
| 2304c60 Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac8f617b am: e2e46f5fa1 | |
| e2e46f5 Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac8f617b | |
| a8ac8f6 Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e | |
| e6bd186 Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 | |
| fb2eb86 Fix out-of-bounds write am: 5403587a74 | |
| 5403587 Fix out-of-bounds write | |
| 113efbb audioflinger: fix standby delay on A2DP output | |
| f27fc04 DO NOT MERGE ANYWHERE Revert "fix possible overflow in effect wrappers." am: 9cebd7cfba -s ours am: cf2f811d75 -s ours am: a1cba19136 -s ours am: 62e7493876 -s ours | |
| 62e7493 DO NOT MERGE ANYWHERE Revert "fix possible overflow in effect wrappers." am: 9cebd7cfba -s ours am: cf2f811d75 -s ours am: a1cba19136 -s ours | |
| a1cba19 DO NOT MERGE ANYWHERE Revert "fix possible overflow in effect wrappers." am: 9cebd7cfba -s ours am: cf2f811d75 -s ours | |
| cf2f811 DO NOT MERGE ANYWHERE Revert "fix possible overflow in effect wrappers." am: 9cebd7cfba -s ours | |
| 9cebd7c DO NOT MERGE ANYWHERE Revert "fix possible overflow in effect wrappers." | |
| 0837e00 fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: 3a9d4f4a83 am: 5b7c20dd1e am: df81fc3f3c am: 68e43cf141 am: b1338d3cfc am: 440c9e9b72 am: 9950df2504 am: de98d9b7c1 | |
| de98d9b fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: 3a9d4f4a83 am: 5b7c20dd1e am: df81fc3f3c am: 68e43cf141 am: b1338d3cfc am: 440c9e9b72 am: 9950df2504 | |
| 9950df2 fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: 3a9d4f4a83 am: 5b7c20dd1e am: df81fc3f3c am: 68e43cf141 am: b1338d3cfc am: 440c9e9b72 | |
| 440c9e9 fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: 3a9d4f4a83 am: 5b7c20dd1e am: df81fc3f3c am: 68e43cf141 am: b1338d3cfc | |
| b1338d3 fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: 3a9d4f4a83 am: 5b7c20dd1e am: df81fc3f3c am: 68e43cf141 | |
| 68e43cf fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: 3a9d4f4a83 am: 5b7c20dd1e am: df81fc3f3c | |
| df81fc3 fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: 3a9d4f4a83 am: 5b7c20dd1e | |
| 5b7c20d fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: 3a9d4f4a83 | |
| 3a9d4f4 fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 | |
| baebc73 fix possible overflow in effect wrappers. am: 9e29523b95 | |
| 9e29523 fix possible overflow in effect wrappers. | |
| 54e0e39 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 50270d98e2 am: 1856f1fe34 am: 2c59cc083d -s ours am: c653d2f19e am: 62646f8c4b am: 2b8d26ba65 | |
| 2b8d26b DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 50270d98e2 am: 1856f1fe34 am: 2c59cc083d -s ours am: c653d2f19e am: 62646f8c4b | |
| 007064a Merge "Fix security vulnerability in ICrypto DO NOT MERGE" into mnc-dev am: 89bec04cf8 am: f797a48b4c am: 3f05f30117 | |
| 3f05f30 Merge "Fix security vulnerability in ICrypto DO NOT MERGE" into mnc-dev am: 89bec04cf8 am: f797a48b4c | |
| eb030dc DO NOT MERGE nuplayer: do not use cached source for wvm content am: 91a23ed95c am: 83487187ab am: fe2d80d385 -s ours am: e6185af491 am: 3cb2e6732f am: 0e7c8849a9 | |
| 0e7c884 DO NOT MERGE nuplayer: do not use cached source for wvm content am: 91a23ed95c am: 83487187ab am: fe2d80d385 -s ours am: e6185af491 am: 3cb2e6732f | |
| 83066d1 DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 am: 208bc477d9 -s ours am: c56555962b am: f4dfde92ea -s ours am: 92edb173a7 am: 9161b6adc9 am: 8f283a894d -s ours am: 6d3f50d9c3 am: 0357d3503f am: 6cd7a9f811 | |
| 6cd7a9f DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 am: 208bc477d9 -s ours am: c56555962b am: f4dfde92ea -s ours am: 92edb173a7 am: 9161b6adc9 am: 8f283a894d -s ours am: 6d3f50d9c3 am: 0357d3503f | |
| 3abe346 Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev am: 0c4d693722 am: ba49fda63a -s ours am: bb1809ace7 am: adfda28b42 am: 569d39f94a -s ours am: 975bb62996 am: b51610971c am: 047cfaf95a | |
| 047cfaf Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread" into lmp-dev am: 0c4d693722 am: ba49fda63a -s ours am: bb1809ace7 am: adfda28b42 am: 569d39f94a -s ours am: 975bb62996 am: b51610971c | |
| 946388c DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1 -s ours am: 4c0d243626 am: 862b693ba3 -s ours am: db76a879ea am: e0c9d8afd0 am: 2048dd5483 -s ours am: 7a2dbcd38b am: f766fdb625 am: 29ff7f2ac7 | |
| 29ff7f2 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1 -s ours am: 4c0d243626 am: 862b693ba3 -s ours am: db76a879ea am: e0c9d8afd0 am: 2048dd5483 -s ours am: 7a2dbcd38b am: f766fdb625 | |
| 062ea72 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 am: 3e8e134597 -s ours am: e4223a8d32 am: bed81d6594 am: dd4576b017 -s ours am: e3bbe235f6 am: b7e63bfadb am: 2c7411483b | |
| 2c74114 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 am: 3e8e134597 -s ours am: e4223a8d32 am: bed81d6594 am: dd4576b017 -s ours am: e3bbe235f6 am: b7e63bfadb | |
| ff0c114 libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 69bd1cf225 am: bee48d7956 am: d1bcd1a80f | |
| d1bcd1a libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 69bd1cf225 am: bee48d7956 | |
| 27affe9 libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 87f8cbb223 am: a022f6e7b7 | |
| a022f6e libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 87f8cbb223 | |
| 3599745 DO NOT MERGE Revert "AwesomePlayer: Separate cache buffer watermarks for offload audio" | |
| 92e4151 DO NOT MERGE Revert "AwesomePlayer: Stop posting buffering events once at EOS" | |
| ddbebb9 AwesomePlayer: Separate cache buffer watermarks for offload audio | |
| 701cac1 AwesomePlayer: Stop posting buffering events once at EOS | |
| 6c2af00 Merge "DO NOT MERGE - IAudioFlinger: add checks on binder calls" into cw-d-mr1-dev am: 2b587abb1b -s ours | |
| f2df0d9 DO NOT MERGE - audio flinger: fix fuzz test crash am: e4b4cf1b6d -s ours | |
| 2b587ab Merge "DO NOT MERGE - IAudioFlinger: add checks on binder calls" into cw-d-mr1-dev | |
| 5c52a55 Merge "Reduce lock time for dump to make sure not locked when calling back to IResourceManagerClient." into mnc-dr-dev am: 83a22c5c81 | |
| 7845a1f fix deadlock in MediaPlayerService BUG: 25263909 | |
| 0619506 Merge "ALooper::awaitResponse gets reply and returns immediately if the looper is stopped." into mnc-dr-dev am: 1d29e126cf | |
| 5f2a15a Merge "Revert "Revert "audio policy: bind setMode() and setPhoneState() operations""" into mnc-dev am: 681bc45d25 am: f6224dece5 | |
| 2fb5951 Merge "Revert "Revert "AudioPolicyService: fix race in AudioCommandThread""" into mnc-dev am: 6919fbe40d am: 8c5b71ce47 | |
| dee38ac Merge "Revert "AudioPolicyService: fix race in AudioCommandThread"" into mnc-dev am: cda4871486 am: 1fcbd9b0e9 | |
| d53f955 Merge "Revert "audio policy: bind setMode() and setPhoneState() operations"" into mnc-dev am: be6f10c049 am: fd16414d34 | |
| 7824716 GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c838 am: 313358c747 am: 92b6cd8da9 am: 7b5564e251 am: 000321c7ee am: fd72a5b9e1 am: 28323c3d9a | |
| 6a92190 Merge "Workaround for busy wait bug" into mnc-dr-dev am: d34cf6d95c | |
| 7292064 Merge "Allow ALooper::awaitResponse to return immediately if the looper is stopped." into mnc-dr-dev am: 0983d691b7 | |
| 87494c6 Merge "GenericSource: reset mDecryptHandle when mDataSource is cleared." into mnc-dr-dev am: f8dc643316 | |
| 0935e8d Merge "Fix offset adjustment when skipping off-spec meta chunk" into mnc-dr-dev am: 78c164c238 | |
| 80ad494 Merge "DO NOT MERGE: libcameraservice: Fix nullptr crash when no client." into mnc-dr-dev am: c0d8c35a2d | |
| 8a7f184 GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 224858e719 am: 69c8e36da7 am: 3fcddfd23a am: e01ba47052 am: adadada4f0 am: ddb3d77dad am: 301a55c115 | |
| 0238155 Merge "GenericSource: reset mDrmManagerClient when mDataSource is cleared." into mnc-dr-dev am: 7bfd9afefa | |
| 7e2daac Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into klp-dev am: b1a13d01dc am: 781cd4f37d am: 8565726f57 am: b44e95da77 am: 699e9b0749 am: 8e4f53159c am: 8fbf202f7b am: e20b0eb88c am: bbe22fe075 | |
| 61e8590 Merge "audio policy: bind setMode() and setPhoneState() operations" into mnc-dev am: 4f16d20070 am: e710ae5300 | |
| c0661e0 Merge "AudioPolicyService: fix race in AudioCommandThread" into mnc-dev am: 81fe612e61 am: d3783a4b2a | |
| 1f50604 am 32ba6ec7: am 0378676b: am 92990810: am b1231923: am e550d213: am f70b69a8: Merge "stagefright: check bounds for MediaCodecList.getCodecInfo" into lmp-dev am: 00a1dcafd9 | |
| a04159a libcameraservice: Fix ALOG prints in FlashLight. am: 32ab9fdab5 | |
| b4a3c6d Camera: frameworks: Add NULL check for callback am: 3e60089468 | |
| c275e2d am b3d9f563: Reconcile with master after mass cherrypicks | |
| 04e6b8c am d538baad: Merge "SoftAVCDec: Exit gracefully when memory allocation fails in the decoder" into mnc-dr-dev | |
| c4e7c57 am e5d82cba: Merge "SoftAVCDec: Added a check for unsupported resolutions" into mnc-dr-dev | |
| 1d3d4bc am ec62e137: SoftHEVCDec: Reduced memory requirements | |
| 4252e76 am a3f29527: SoftMPEG2Dec: Added support for deinterlacer | |
| fba6794 am 0eb5a270: Merge "audio policy: fix transition from VoIP to voice call on USB" into mnc-dr-dev | |
| abe9044 am ceb10ea7: Merge "Camera: setup vendor tags before get_camera_info" into mnc-dr-dev | |
| e4b4cf1 DO NOT MERGE - audio flinger: fix fuzz test crash | |
| 2be5af3 DO NOT MERGE - IAudioFlinger: add checks on binder calls | |
| 2663989 am 0926aab4: Merge "audio policy: fix USB mic selection for VoIP" into mnc-dr-dev | |
| 1fcfefd am 66a581fe: Merge "SoundTrigger: fix binder call status reporting." into mnc-dr-dev | |
| 50652c7 am 5f54de48: Merge "Camera: Add video recording stop sound" into mnc-dr-dev | |
| e975454 am 6e2ea5ab: am 7b806481: am f30d7e0a: (-s ours) am ce8029c0: am f5bff8c9: am 7d8bb7a7: am 56d193ac: am 5a018d15: (-s ours) am 0f21a688: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into klp-dev | |
| 35c138b am 642868f2: am 5d805eca: am 77ab176a: (-s ours) am 149fc59e: am 1f42a6cc: am c57ad1ed: am 55d1ea47: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into lmp-dev | |
| c5fa7c2 am c7a46eb1: Merge "DO NOT MERGE: Fix setTorchMode support for the old HAL version" into mnc-dr-dev | |
| 295f754 am ea6a3dc0: Merge "audioflinger: increase shared memory heap size" into mnc-dr-dev | |
| c47396e am 2894d702: Merge "NuPlayerDecoder: report error in case of audio sink open error." into mnc-dr-dev | |
| 0aa9146 am 8fa0848c: Merge "For static obtainBuffer(), do not set mUnreleased if acknowledging flush." into mnc-dr-dev | |
| 3bf88c1 am ce805c2a: Merge "NuPlayerRenderer: do not send rendering started message when paused" into mnc-dr-dev | |
| 5116feb am cfda8c43: Merge "AudioTrack: Skip callback EVENT_STREAM_END on DEAD_OBJECT." into mnc-dr-dev | |
| 74e87ca am 95c3a43a: Merge "Don\'t send OnCompletion events when looping" into mnc-dr-dev | |
| 9fd6106 am 106ceacb: NuPlayer: reset mAudioEOS and mVideoEOS when renderer is flushed. | |
| 984142e am 780b766d: Merge "NuPlayerDriver: acquire mLock when needed." into mnc-dr-dev | |
| 041cf1b am b3c48309: Merge "NuPlayerRenderer: always update MediaClock with max media duration." into mnc-dr-dev | |
| 5e20fad am e5200ea7: Merge "libstagefright: don\'t reclaim codec when there\'s buffer owned by client. Notify the client and try to reclaim again in 0.5s." into mnc-dr-dev | |
| 1a825df Merge "NuPlayerRenderer: always update MediaClock with max media duration." into cw-e-dev | |
| b02bce5 am c4c68f63: am 136ea31a: am 602343bb: am 480f0ca9: am 9d1bc9f2: resolved conflicts for 4beea277 to lmp-mr1-dev | |
| 69dc00c am 403bff76: am 4c6e77ff: AudioFlinger: Clear record buffers when starting RecordThread | |
| d005c5d NuPlayerRenderer: always update MediaClock with max media duration. | |
| 0b3a585 am 036b6593: am 5076a51e: am ae827fb4: (-s ours) am 1231bdbe: am 6f235327: am d4ee847f: am d1c9037a: Merge "DO NOT MERGE - audio policy: validate stream type received from binder calls." into lmp-dev | |
| 87b93c0 am d805214c: am a0f49d69: am 867f877f: (-s ours) am 7ea1ed87: am 1b6bb62c: am 07d70319: am 0b1936be: am dd184a48: (-s ours) am 3b4a72ac: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer." into klp-dev | |
| 58976be am cac83d87: am d77dc131: am 91aa4a0a: (-s ours) am f106f9e4: am 15e991bd: resolved conflicts for 0b09da7a to lmp-mr1-dev | |
| 9ea0680 am b177e8a7: Merge "AudioTrack: Prevent stop() from reissuing last marker event" into mnc-dr-dev | |
| 25bba20 am 6ef05efa: am 5dcef419: am a6b9d752: am d4df7559: am 39f64a1e: am 8b713f11: am b75a78db: am fc0e2a87: am 7ed8d1ef: ID3: check possible integer overflow for extendedHeaderSize and paddingSize. | |
| b39b25a am d9a22c51: am 39d91e7b: Merge "ID3: check possible integer overflow for extendedHeaderSize and paddingSize." into mnc-dev | |
| 21f633e am bf42e44c: am 6f14568b: am f1790258: am 5e92fded: am 64cdd5f2: am f2cf2bd7: am 07395f4c: am 00f5fa82: am 74d1927e: Merge "Check NAL size before use" into klp-dev | |
| ff3f92c am 6b42757e: am 9c15f734: am b8f5d50c: am 3674abc0: am fb0d63df: am 62d89908: am df68d9d5: am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData." into klp-dev | |
| e7f020f am cb71c4f2: am 711e9dfc: am 8b3aa04a: am a0c94bc6: am 567ad5c6: am 7ce82583: am 13b6b51e: am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal frame | |
| 8656914 am b90b8291: am cb70fdbe: Merge "OMX: allow only secure codec to remotely call allocateBuffer." into mnc-dev | |
| 0721bec am ee481c9b: am 47abfa32: Merge "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData." into mnc-dev | |
| 3982452 am 4802c0c5: AudioSystem: Fix race condition in accessing ioDescriptors | |
| fc07d1e am 4a8f4a3f: Camera3Device: Change HFR request thread priority to 1 | |
| d270804 am a24a1a63: Merge "Camera3Device: Bookkeeping reprocess shutters separately" into mnc-dr-dev | |
| 02d6028 am 4bd8f46c: am 73b61dd2: am 12a68607: (-s ours) am 4189eb41: am 0e86f9f1: am f888d47c: am 91f5dc8f: am bdaee5ea: (-s ours) am 3737a3fa: DO NOT MERGE stagefright: fix AMessage::FromParcel | |
| 176d878 am ad596bad: am a749e0c4: am 0f8f3bd0: am 99214848: am 5226d6b7: am e64d4870: am 2b8cd9cb: stagefright: fix AMessage::FromParcel | |
| b9fd361 am e7cd6e51: am ddd346c7: stagefright: fix AMessage::FromParcel | |
| ffce26c am f99498ee: CameraService: Use SCHED_FIFO for request queue thread in HFR | |
| fe9a3c1 am 8595eaab: Merge "SoftAVCDec: Reduced memory requirements" into mnc-dr-dev | |
| 8c8d977 am 45fd99a3: Merge "audio policy: fix preemtible capture race" into mnc-dr-dev | |
| 3d25b02 am 047d97b2: AudioPolicyService: fix race in AudioCommandThread | |
| 5faeb8b am 3916845d: am 71a9b324: am e22f5f49: (-s ours) DO NOT MERGE - Fix build for commit 69ae6a87 | |
| 62021ba am 2460f11e: am 24d8eb71: am 44875142: am 9b9612fb: am 92504274: am 7e1d645f: am a8f90d57: Merge "IAudioFlinger: fix the missing initialization of variable to ensure no info leak when writing them to Parcel." into lmp-dev | |
| 66fd358 am a3add504: am 694ec7bc: am 0c84fa7f: (-s ours) am 3d6ba305: am ce388779: am d3601b1d: am fb5104ec: am 4554ffd7: (-s ours) am 6272fa1b: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into klp-dev | |
| 2f4851d am 3f7f8284: am 81446b86: am 8a877f09: (-s ours) am b566a55e: am da9c517a: am 93e3abfc: am 48904845: am 52b829cb: (-s ours) am f43125ed: Merge "Fix for security vulnerability in media server DO NOT MERGE" into klp-dev | |
| 4941378 am 074e08fc: am cb729b96: am c4f7e92b: (-s ours) am 69c8327b: am 9dcb4c63: am 4ae700d2: am 160ed868: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into lmp-dev | |
| f50fb47 am 17e4eca8: am ebbf395f: am faced8cd: (-s ours) am 813c5022: am 1ac11129: am d83f2255: am 99e63e75: Merge "Fix for security vulnerability in media server DO NOT MERGE" into lmp-dev | |
| e39c19f am bcd02111: am 1e6e00c9: am 618e6f61: (-s ours) am 582e1d6d: am 3248baeb: am ae683e22: am 13a8c5dd: am 190786d3: (-s ours) am ae922517: Merge "DO NOT MERGE - IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel." into klp-dev | |
| a65ef48 am bc9ab577: am f80457e7: am 81851d19: (-s ours) am fe096002: am dae1d8dd: am 5d76aca5: am 21fda3ed: Merge "DO NOT MERGE - IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel." into lmp-dev | |
| 9a302c6 am 963522f9: am 2151d8f9: am 78f7932d: am 7b642b08: am 0af50080: am 8ba28c84: am d61dbb36: am 38281f1c: am d386c5be: Merge "Fix heap data leak vulnerability" into klp-dev | |
| 7a0c194 am cc1a4208: am 3662ca10: Merge "StagefrightMetadataRetriever: handle error returned from convertMetaDataToMessage()." into mnc-dev | |
| 8433b0c am 6ffa5b94: am 6a3a55ef: am d1cd2591: (-s ours) am a323e9c2: am 24328843: am 9b547a24: am cc0942d0: am 9860dcdf: (-s ours) am b21a6420: Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous early free" into klp-dev | |
| 8fb242d am 7b7476d1: am 70bc02c0: am ed2f82a5: (-s ours) am e2cc5db8: am 6961db7e: am 04bbef0b: am 5c09132b: Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous early free" into lmp-dev | |
| 6642034 am cba6e50d: am a9a899d3: am 3371ce02: (-s ours) am 93c38623: am c3708121: am 2d945b6a: am 4855cc3d: Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into lmp-dev | |
| d65fac6 am bb516b84: am 35cdb5c8: am af321dc1: (-s ours) am 3b3cbeb3: am 2701ab04: am f077abb0: am 4022477b: am 8cfd0ac4: (-s ours) am 741a3351: Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel." into klp-dev | |
| 5e394f2 am d514081a: am c391d887: am 943f1c0c: (-s ours) am 7334b956: am 96c55282: am d8b9218c: am 9d0497bd: am 44da08ed: (-s ours) am b659b4c7: Merge "DO NOT MERGE fix build" into klp-dev | |
| 563f111 am ccf405f4: am c7b2c9c8: am 358c610c: (-s ours) am 3f7ecd9b: am 976fbb0c: am cc4aff99: am 644f4076: am 1507bbb0: (-s ours) am 1784a8db: Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into klp-dev | |
| 02d4775 am 787ef9bb: am 3f057571: am b9930418: am eed3955c: am 5e46ca5a: am 3b130dbd: am c5121002: am c256004a: am 69ae6a87: libstagefright: fix A_Refl to return immediately when there is an error. | |
| 005eda6 am 6f7fb401: Fix Build | |
| 90d6b27 am c83d228e: Merge "stagefright: Move google mpeg2 codec into media_codecs_google_tv.xml" into mnc-dr-dev | |
| 5259aaa am c4706396: Merge "stagefright: only pass valid framerates in msg and meta" into mnc-dr-dev | |
| 49d1087 am 6fe78a87: am 12d4a6a2: DO NOT MERGE Avoid size_t overflow in base64 decoding once again | |
| 18bc51f am 75f0b792: am dffe5cdb: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into mnc-dev | |
| da132d8 am 4296d7df: Merge "audio policy: bind setMode() and setPhoneState() operations" into mnc-dr-dev | |
| 345a74e am e10a198a: am 190eca5a: Merge "IAudioFlinger: fix the missing initialization of variable to ensure no info leak when writing them to Parcel." into mnc-dev | |
| cf7a59d am f284e01c: am 489c534b: am 095641df: (-s ours) am 0518125e: am e1289226: am dc81adaa: am c191482e: Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel." into lmp-dev | |
| 4617a7a am 35c94832: am 866a12a7: am 3c4216e5: am 2fa6a5ad: am 4d27a468: am 92efd0c5: am b5611b84: Merge "Revert "Avoid size_t overflow in base64 decoding once again"" into lmp-dev | |
| 35c2452 am e6dad2bd: am 9ce18e4e: am fd92e4d3: am c259acce: am f7c40163: am 5f5fc26c: am 322e2dc5: Merge "Avoid size_t overflow in base64 decoding once again" into lmp-dev | |
| d3fa3c1 am 20baac2a: Merge "AudioPolicy: don\'t always change ACCESSIBILITY volume" into mnc-dr-dev | |
| 69c19ab am da56cd3d: am bc0daa97: Merge "IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel." into mnc-dev | |
| 5b8d6ba am ed1f8205: am 076d7ecf: Merge "Add DUMP permission check to ResourceManagerService." into mnc-dev | |
| 08f5987 am 82b34505: Merge "NuPlayerRenderer: Do not drain audio during teardown" into mnc-dr-dev | |
| 9d6d6cf am 6d0473ee: am b26249b7: resolved conflicts for 421977ae to mnc-dev | |
| 0887905 am 3818c696: Merge "Camera: API1 shim: select better default FPS range" into mnc-dr-dev | |
| e01a0af am d7b1b9ad: (-s ours) Merge "DO NOT MERGE audioflinger: dont release wakelock during offload drain sequence" into cw-d-mr1-dev | |
| d7b1b9a Merge "DO NOT MERGE audioflinger: dont release wakelock during offload drain sequence" into cw-d-mr1-dev | |
| c0bdf75 am f00b70e0: Merge "Force fixed volume for TTS stream" into mnc-dr-dev | |
| 1e207a5 am f5eb7c6f: Merge "NuPlayerRenderer: Do not deliver audio too soon after stop" into mnc-dr-dev | |
| eab8c00 am 2cea090c: am 4374b187: Merge "NuCachedSource2: fix possible erroneous early free" into mnc-dev | |
| 8f74220 am 99c90657: Merge "Camera3Device: Signal buffer returned after it failed" into mnc-dr-dev | |
| 24a9cb4 am 5c0adc3e: Merge "Workaround static fast track start-after-stop issue" into mnc-dr-dev | |
| 56cb7c4 am 014e91e4: Add DUMP permission check to ResourceManagerService. | |
| c6b1a54 am fefa614f: Reduce DUMP permission denial output to one line. | |
| 60351ee am a89ee9ef: am 393eb647: Merge "Avoid size_t overflow in base64 decoding once again" into mnc-dev | |
| 885dedb am ad26bbdd: Merge "libstagefright: Do not add audio codecs to resource manager. They are too small anyhow." into mnc-dr-dev | |
| 48e879d am a2ab4505: audio flinger: force audio path start from normal mixer | |
| 776f0a2 am 0f050315: am 7a2ffb90: Merge "IAudioFlinger: clear config before reading it from parcel." into mnc-dev | |
| 0a4b92d am ee1c50d7: (-s ours) Merge "DO NOT MERGE AwesomePlayer: Separate cache buffer watermarks for offload audio" into cw-d-mr1-dev | |
| 847d19d am ad0c79ec: (-s ours) DO NOT MERGE AwesomePlayer: Stop posting buffering events once at EOS | |
| ee1c50d Merge "DO NOT MERGE AwesomePlayer: Separate cache buffer watermarks for offload audio" into cw-d-mr1-dev | |
| b0063fe DO NOT MERGE audioflinger: dont release wakelock during offload drain sequence | |
| e90bf75 DO NOT MERGE AwesomePlayer: Separate cache buffer watermarks for offload audio | |
| ad0c79e DO NOT MERGE AwesomePlayer: Stop posting buffering events once at EOS | |
| project frameworks/base/ | |
| e342181 Import translations. DO NOT MERGE | |
| 577f6b8 Import translations. DO NOT MERGE | |
| 42dccd4 Hack to get devices booting again. | |
| b8bd302 Don't change screen on time on time changes | |
| 78ba120 Check apps idle states on time changes | |
| 914fc2a Don't assume kernel tick is 100Hz | |
| ef9c8be Debug logging for when getActiveNetworkInfo returns BLOCKED. | |
| 4276d40 Fix SystemUI animator leak | |
| fd0b32d Revert "Get animation update timing for AVD" | |
| 1823768 merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| 6168c07 Import translations. DO NOT MERGE | |
| a7957bf merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev | |
| fc7e682 Merge "Supply content description for QS disconnect buttons" into mnc-dr1.5-dev | |
| 76f28bb Merge "Stop leaking Notifications when they change groupKeys." into mnc-dr1.5-dev | |
| 24813b0 Stop leaking Notifications when they change groupKeys. | |
| c3ebdcc Don't verify the scrollbar drawable | |
| 3300194 Merge "DO NOT MERGE Fix for syncs being dropped when appIdle is on" into mnc-dr1.5-dev | |
| a53c3b2 Don't verify the scrollbar drawable | |
| b3f1109 Supply content description for QS disconnect buttons | |
| 7aa4671 DO NOT MERGE Fix for syncs being dropped when appIdle is on | |
| e41a6c8 Merge "Fix race condition when setting default ringtones" into mnc-dr1.5-dev | |
| c6c9b2a Merge "Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]" into mnc-dr1.5-dev | |
| 658fdf8 Merge "DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE" into mnc-dr1.5-dev | |
| 1bbc082 Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE] | |
| d5cea64 Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev am: 4a577bff96 | |
| 4a577bf Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev | |
| 7e8b8f1 DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE | |
| bad498f Add STEM_1, STEM_2 and STEM_3 key as wakeup keys | |
| d2e2159 Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev | |
| f474056 Pulling in https://android-review.googlesource.com/#/c/186482/1 am: 74dfcf90f1 | |
| 74dfcf9 Pulling in https://android-review.googlesource.com/#/c/186482/1 | |
| d23f1eb Merge "Fixed a crash with the heads up manager" into mnc-dr1.5-dev | |
| 624d43b Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev | |
| 156bd49 Revert "Avoid drawable invalidation during draw()" | |
| ba9e858 Fixed a crash with the heads up manager | |
| f0ef3c1 UsageStats: Use new settings key idle_duration2 for app idle | |
| 9ae30e6 Merge "Add WiFi Calling overlays for T-Mobile's MCCMNCs" into mnc-dr1.5-dev | |
| b6baaf3 Add WiFi Calling overlays for T-Mobile's MCCMNCs | |
| a5c5329 Tests for getPrimaryHorizontal with grapheme boundaries | |
| f2cc98b Merge "UsageStats: Fix issue where initializing data for first time would cause crash" into mnc-dr1.5-dev | |
| 76e9d76 UsageStats: Fix issue where initializing data for first time would cause crash | |
| e0845e8 Merge "In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments." into cw-e-dev am: eebf168e43 | |
| eebf168 Merge "In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments." into cw-e-dev | |
| 7f667e7 In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments. | |
| cf6885b Merge "Avoid drawable invalidation during draw()" into mnc-dr1.5-dev | |
| d943469 Merge "Handle null result from getVirtualChildAt()" into mnc-dr1.5-dev | |
| 7d9fab6 Fix race condition when setting default ringtones | |
| 67b2c16 Get data type from service state as well | |
| e5e59c6 Avoid drawable invalidation during draw() | |
| ec2891b Handle null result from getVirtualChildAt() | |
| a73abea Merge "Get animation update timing for AVD" into mnc-dr1.5-dev | |
| 9f2c939 Merge changes from topic 'grapheme-dr1.5' into mnc-dr1.5-dev | |
| 36c5ab3 Merge "Fix measurement to respect grapheme and span boundaries" into mnc-dr1.5-dev | |
| 15df80f Merge "UsageStatsService: Fix app idle issue at rollover time" into mnc-dr1.5-dev | |
| fc8e3cb Get animation update timing for AVD | |
| 5bff01d Respect grapheme clusters in Layout#getOffsetForHorizontal. | |
| 720edf9 Fix: Cursor can be at an invalid offset in EditText. | |
| 909c7bc Fix measurement to respect grapheme and span boundaries | |
| d3b2826 Add carrier config variable to support editable wfc mode | |
| 4c042b0 Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev am: 66841a62f1 -s ours am: 73992aee94 -s ours am: 0663959eb7 -s ours am: 8635657b17 -s ours | |
| 8635657 Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev am: 66841a62f1 -s ours am: 73992aee94 -s ours am: 0663959eb7 -s ours | |
| 0663959 Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev am: 66841a62f1 -s ours am: 73992aee94 -s ours | |
| 73992ae Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev am: 66841a62f1 -s ours | |
| 66841a6 Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev | |
| 376082a Revert "Import translations. DO NOT MERGE" | |
| ddee7d9 Merge branch 'mnc-dr1.5-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr1.5-dev | |
| 38aaa99 Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours am: 4df8f4abe0 -s ours am: 009fb756ec -s ours am: b409a99ccc -s ours am: 14c37a57ea -s ours am: 0b8de39728 -s ours am: 9f094ac04d -s ours | |
| 7053b89 Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours am: 4df8f4abe0 -s ours am: 009fb756ec -s ours am: b409a99ccc -s ours am: 14c37a57ea -s ours am: 0b8de39728 -s ours am: 9f094ac04d -s ours | |
| 67ba224 Import translations. DO NOT MERGE am: 9f9e736e0d -s ours am: b441c6926b -s ours am: 83bf32ebe5 -s ours am: 42692affe2 -s ours am: 8ea585955c -s ours am: 4ae777097e -s ours am: 23c92d99cf -s ours | |
| 9f094ac Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours am: 4df8f4abe0 -s ours am: 009fb756ec -s ours am: b409a99ccc -s ours am: 14c37a57ea -s ours am: 0b8de39728 -s ours | |
| 23c92d9 Import translations. DO NOT MERGE am: 9f9e736e0d -s ours am: b441c6926b -s ours am: 83bf32ebe5 -s ours am: 42692affe2 -s ours am: 8ea585955c -s ours am: 4ae777097e -s ours | |
| 0b8de39 Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours am: 4df8f4abe0 -s ours am: 009fb756ec -s ours am: b409a99ccc -s ours am: 14c37a57ea -s ours | |
| 14c37a5 Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours am: 4df8f4abe0 -s ours am: 009fb756ec -s ours am: b409a99ccc -s ours | |
| b409a99 Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours am: 4df8f4abe0 -s ours am: 009fb756ec -s ours | |
| 009fb75 Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours am: 4df8f4abe0 -s ours | |
| 4df8f4a Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours | |
| d344dc2 Revert "Import translations. DO NOT MERGE" am: 9e5fe1a7da -s ours am: 1c51eb41ee -s ours am: eab7785333 -s ours am: 2ed7b6d82a -s ours | |
| 8874f97 Revert "Import translations. DO NOT MERGE" | |
| 2ed7b6d Revert "Import translations. DO NOT MERGE" am: 9e5fe1a7da -s ours am: 1c51eb41ee -s ours am: eab7785333 -s ours | |
| 4ae7770 Import translations. DO NOT MERGE am: 9f9e736e0d -s ours am: b441c6926b -s ours am: 83bf32ebe5 -s ours am: 42692affe2 -s ours am: 8ea585955c -s ours | |
| eab7785 Revert "Import translations. DO NOT MERGE" am: 9e5fe1a7da -s ours am: 1c51eb41ee -s ours | |
| 8ea5859 Import translations. DO NOT MERGE am: 9f9e736e0d -s ours am: b441c6926b -s ours am: 83bf32ebe5 -s ours am: 42692affe2 -s ours | |
| 1c51eb4 Revert "Import translations. DO NOT MERGE" am: 9e5fe1a7da -s ours | |
| 42692af Import translations. DO NOT MERGE am: 9f9e736e0d -s ours am: b441c6926b -s ours am: 83bf32ebe5 -s ours | |
| 9e5fe1a Revert "Import translations. DO NOT MERGE" | |
| 83bf32e Import translations. DO NOT MERGE am: 9f9e736e0d -s ours am: b441c6926b -s ours | |
| 82666a9 Import translations. DO NOT MERGE am: a4505e9264 -s ours am: bc3b9e2a83 -s ours am: a6a761d9fd -s ours am: a8ae80950e -s ours | |
| 62e77bd Import translations. DO NOT MERGE am: f7e5202668 -s ours am: 0b1a880876 -s ours am: f272b0a87e -s ours am: 0c6bf20b04 -s ours | |
| b441c69 Import translations. DO NOT MERGE am: 9f9e736e0d -s ours | |
| a8ae809 Import translations. DO NOT MERGE am: a4505e9264 -s ours am: bc3b9e2a83 -s ours am: a6a761d9fd -s ours | |
| 0c6bf20 Import translations. DO NOT MERGE am: f7e5202668 -s ours am: 0b1a880876 -s ours am: f272b0a87e -s ours | |
| a6a761d Import translations. DO NOT MERGE am: a4505e9264 -s ours am: bc3b9e2a83 -s ours | |
| 9f9e736 Import translations. DO NOT MERGE | |
| f272b0a Import translations. DO NOT MERGE am: f7e5202668 -s ours am: 0b1a880876 -s ours | |
| bc3b9e2 Import translations. DO NOT MERGE am: a4505e9264 -s ours | |
| 0b1a880 Import translations. DO NOT MERGE am: f7e5202668 -s ours | |
| a4505e9 Import translations. DO NOT MERGE | |
| f7e5202 Import translations. DO NOT MERGE | |
| da4a377 UsageStatsService: Fix app idle issue at rollover time | |
| c2ec3f1 Merge "DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm." into mnc-dr1.5-dev | |
| 8d9aea8 DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm. | |
| 9530b07 Fix plurals variable to unblock Translations Pipeline. am: 61f9f31468 am: 4340e0677b am: aa2210c5c1 am: 78f672ef05 am: 8d85292827 am: 212fe88251 am: ee895112b3 | |
| ee89511 Fix plurals variable to unblock Translations Pipeline. am: 61f9f31468 am: 4340e0677b am: aa2210c5c1 am: 78f672ef05 am: 8d85292827 am: 212fe88251 | |
| 212fe88 Fix plurals variable to unblock Translations Pipeline. am: 61f9f31468 am: 4340e0677b am: aa2210c5c1 am: 78f672ef05 am: 8d85292827 | |
| 8d85292 Fix plurals variable to unblock Translations Pipeline. am: 61f9f31468 am: 4340e0677b am: aa2210c5c1 am: 78f672ef05 | |
| 9c43094 Fix plurals variable to unblock Translations Pipeline. am: 71921cb23c am: 6980f76931 am: a9850abb82 | |
| 78f672e Fix plurals variable to unblock Translations Pipeline. am: 61f9f31468 am: 4340e0677b am: aa2210c5c1 | |
| a9850ab Fix plurals variable to unblock Translations Pipeline. am: 71921cb23c am: 6980f76931 | |
| aa2210c Fix plurals variable to unblock Translations Pipeline. am: 61f9f31468 am: 4340e0677b | |
| 4340e06 Fix plurals variable to unblock Translations Pipeline. am: 61f9f31468 | |
| 6980f76 Fix plurals variable to unblock Translations Pipeline. am: 71921cb23c | |
| 71921cb Fix plurals variable to unblock Translations Pipeline. | |
| 61f9f31 Fix plurals variable to unblock Translations Pipeline. | |
| 5b294b4 Exit getAllValidScorers early if not the primary. | |
| b805bb8 Merge "Defines task to front/back animations in styles_micro." into cw-e-dev am: 1d3bac82b3 | |
| 1d3bac8 Merge "Defines task to front/back animations in styles_micro." into cw-e-dev | |
| fcc57db Defines task to front/back animations in styles_micro. | |
| 4bbd3c4 Merge "Clear calling identify b4 Beam callback." into mnc-dr1.5-dev | |
| fd87e92 Import translations. DO NOT MERGE | |
| 24584f0 Clear calling identify b4 Beam callback. | |
| d980b8c Merge "Remove duplicate Bluetooth profiles." into cw-e-dev am: 9c27969385 | |
| 9c27969 Merge "Remove duplicate Bluetooth profiles." into cw-e-dev | |
| 898e330 Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev am: cbef517d02 | |
| cbef517 Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev | |
| fba515f resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3 am: 81674b1ff5 am: 1e04dfb926 am: 3927089cce am: f1530bf3d7 | |
| 15309a3 Remove duplicate Bluetooth profiles. | |
| f1530bf resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3 am: 81674b1ff5 am: 1e04dfb926 am: 3927089cce | |
| 3927089 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3 am: 81674b1ff5 am: 1e04dfb926 | |
| 1e04dfb resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3 am: 81674b1ff5 | |
| 81674b1 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3 | |
| 2ecc918 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 | |
| 5946a9b resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 | |
| 087ae47 Making ViewRootImpl drop input events when the Activity is in ambient mode. | |
| 5a77651 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. | |
| 8877120 Fix system watchdog timeout when reading too many usage events. | |
| c99c417 Merge "Check permissions on getDeviceId." into mnc-dev am: 4557ef32fe am: 628b8f1f5f am: a652b7161d | |
| 5d7bb38 Merge "Check permissions on getDeviceId." into mnc-dr-dev am: ef58df63d6 am: 064eb2a7cc | |
| a652b71 Merge "Check permissions on getDeviceId." into mnc-dev am: 4557ef32fe am: 628b8f1f5f | |
| 064eb2a Merge "Check permissions on getDeviceId." into mnc-dr-dev am: ef58df63d6 | |
| 628b8f1 Merge "Check permissions on getDeviceId." into mnc-dev am: 4557ef32fe | |
| ef58df6 Merge "Check permissions on getDeviceId." into mnc-dr-dev | |
| 4557ef3 Merge "Check permissions on getDeviceId." into mnc-dev | |
| 9eaa59a Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev am: cf91b45c05 | |
| cf91b45 Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev | |
| fc3762a Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev am: cae2f2415b | |
| cae2f24 Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev | |
| e457fa4 Add UUID to BluetoothHeadsetClientCall | |
| 7f5ad22 DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am: b2c5155638 am: 40d1ab91d2 am: 8c9209183f | |
| 8c92091 DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am: b2c5155638 am: 40d1ab91d2 | |
| 40d1ab9 DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am: b2c5155638 | |
| b2c5155 DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 | |
| ec85f34 Add setting for declaring disabled bluetooth profiles. | |
| 4893042 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: d0dd157ade -s ours | |
| 82ce2a6 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 8b4b230174 -s ours | |
| d0dd157 Merge "Import translations. DO NOT MERGE" into cw-e-dev | |
| 8f316d2 Import translations. DO NOT MERGE | |
| 8b4b230 Merge "Import translations. DO NOT MERGE" into cw-e-dev | |
| 1144462f Import translations. DO NOT MERGE | |
| c8ddc96 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 10bc1c7000 -s ours | |
| 10bc1c7 Merge "Import translations. DO NOT MERGE" into cw-e-dev | |
| e0b7426 Import translations. DO NOT MERGE | |
| a32b362 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: df5dd062a0 -s ours | |
| 57a89670 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 531eb5b484 -s ours | |
| df5dd06 Merge "Import translations. DO NOT MERGE" into cw-e-dev | |
| 7babe8d Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 327d917865 -s ours | |
| 648fa53 Import translations. DO NOT MERGE | |
| 531eb5b Merge "Import translations. DO NOT MERGE" into cw-e-dev | |
| d8004c0 Import translations. DO NOT MERGE am: 22dea4e16f -s ours | |
| d2615bd Import translations. DO NOT MERGE | |
| 327d917 Merge "Import translations. DO NOT MERGE" into cw-e-dev | |
| 695cf96 Import translations. DO NOT MERGE | |
| 22dea4e Import translations. DO NOT MERGE | |
| 1d6d4c5 Merge "DO NOT MERGE: Fix batterystats battery level int packing" into mnc-dr1.5-dev | |
| 5f8c818 DO NOT MERGE: Fix batterystats battery level int packing | |
| 9289560 Use wakeup reason when FingerPrint sensor wakes up the device | |
| 36393a5 Allow access to deprecated LOCK_PATTERN_ENABLED flag. am: 4614596a39 | |
| 4614596 Allow access to deprecated LOCK_PATTERN_ENABLED flag. | |
| cf07154 Merge "DO NOT MERGE Remove more extras during notification lightening." into mnc-dr1.5-dev | |
| ddb52fb DO NOT MERGE Remove more extras during notification lightening. | |
| a89f9d9 Don't back up / restore EAP network definitions | |
| 022c748 Work on issue #25467052: System lagged out | |
| ba88e68 Prevent DivideByZero error in BatteryStatsImpl | |
| 180dd72 Improve logging in BluetoothHeadsetClientCall. am: 3c67873f0a | |
| 3c67873 Improve logging in BluetoothHeadsetClientCall. | |
| 6344cb8 Merge "Add rotary encoder input source" into cw-e-dev am: 487f0d3d15 | |
| 487f0d3 Merge "Add rotary encoder input source" into cw-e-dev | |
| bef0525 Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-dev am: e56f7b0d1d | |
| e56f7b0 Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-dev | |
| d8231b9 Check permissions on getDeviceId. | |
| 0b63802 Check permissions on getDeviceId. | |
| cd2cc9a Merge "Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()" into mnc-dr1.5-dev | |
| dde5a6e Merge "Fix radio button flash on hour change." into mnc-dr1.5-dev | |
| 3e57340 Fix radio button flash on hour change. | |
| e2d516f Merge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d am: add4b91d41 am: 7417f70ac6 | |
| 7417f70 Merge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d am: add4b91d41 | |
| 9887f2f Protect some new broadcasts. | |
| 90bc39d Check NPE beforehand instead of catching it at runtime | |
| 9eacc97 Merge "Set Tether APN protocol type to IPv4 for Telus" into mnc-dr1.5-dev | |
| 47268e9 Set Tether APN protocol type to IPv4 for Telus | |
| 67d068b Merge "Log API calls to createBond(), cancelBondProcess(), removeBond()" into cw-e-dev am: 7fb263c472 | |
| 7fb263c Merge "Log API calls to createBond(), cancelBondProcess(), removeBond()" into cw-e-dev | |
| a30685e DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 0a887bcd5c am: 7c798c13a7 am: 94cefd6adb | |
| 94cefd6 DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 0a887bcd5c am: 7c798c13a7 | |
| 044b8f3 Log API calls to createBond(), cancelBondProcess(), removeBond() | |
| 8e79dae3 DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property." | |
| 8780f07 Merge "Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"" into cw-e-dev am: 4d70e6a3c0 -s ours | |
| 4d70e6a Merge "Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"" into cw-e-dev | |
| e9970bc Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" | |
| b983832 Merge "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" into cw-e-dev am: ec7180f733 -s ours | |
| ec7180f Merge "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" into cw-e-dev | |
| c54aa0c Merge "MediaPlayer: Disable acquiring wakelocks based on property." into cw-e-dev am: 50276adde2 | |
| 50276ad Merge "MediaPlayer: Disable acquiring wakelocks based on property." into cw-e-dev | |
| 4ecf963 Merge "DO NOT MERGE ANYWHERE" into cw-e-dev am: 085796bdf5 -s ours | |
| 085796b Merge "DO NOT MERGE ANYWHERE" into cw-e-dev | |
| ad75169 DO NOT MERGE ANYWHERE Add new interface for sensor physical data | |
| b241487 Merge "Add callback for connections to be notified when the ringer is silenced." into cw-e-dev am: 52bdf11583 | |
| 52bdf11 Merge "Add callback for connections to be notified when the ringer is silenced." into cw-e-dev | |
| 1dbb035 fix data race condition BUG: 25819358 am: 2242b4d2bd | |
| 2242b4d fix data race condition BUG: 25819358 | |
| b6ae321 Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev am: 4dbb586585 | |
| 4dbb586 Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev | |
| f604911 MediaPlayer: Disable acquiring wakelocks based on property. | |
| ae7c51a Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev | |
| 2542f81 Import translations. DO NOT MERGE | |
| b96f640 Import translations. DO NOT MERGE am: b21b778567 -s ours | |
| b21b778 Import translations. DO NOT MERGE | |
| 888916f DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing am: 6902052c77 -s ours | |
| 6902052 DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing | |
| fd773d1 Import translations. DO NOT MERGE am: bddde9b83d -s ours am: d0709c3a32 -s ours am: 1bd58bfd5b -s ours | |
| 1bd58bf Import translations. DO NOT MERGE am: bddde9b83d -s ours am: d0709c3a32 -s ours | |
| d0709c3 Import translations. DO NOT MERGE am: bddde9b83d -s ours | |
| 2d88755 Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev am: 35f7562495 | |
| 867c370 Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev am: 8c971ae5a0 | |
| 35f7562 Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev | |
| 6609896 Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" | |
| 8c971ae Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev | |
| 65a8349 Revert "Update StaticLayout_Delegate to use new nLoadHyphenator" | |
| c1552f0 Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790 am: 33c1718205 am: b776891801 am: 974f805500 am: 6d983179a0 am: 5d41bd8d1a | |
| 5d41bd8 Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790 am: 33c1718205 am: b776891801 am: 974f805500 am: 6d983179a0 | |
| 6d98317 Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790 am: 33c1718205 am: b776891801 am: 974f805500 | |
| 013c7da Merge "Fix MVNO hotspot bug for Europe" into mnc-dr1.5-dev | |
| 8ed715e Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages() | |
| 877c6c7 add lost RAM info to compact meminfo dump | |
| cac5077 Add callback for connections to be notified when the ringer is silenced. | |
| 14a8263 Merge "Fix delegation of methods within inner static classes" into mnc-ub-dev am: 603544d4c4 | |
| 2900dc2 Revert "Don\'t dispatch when non-interactive and the display is off." am: f2b9b2d85a am: f7aceb60e3 | |
| 603544d Merge "Fix delegation of methods within inner static classes" into mnc-ub-dev | |
| f7aceb6 Revert "Don\'t dispatch when non-interactive and the display is off." am: f2b9b2d85a | |
| f2b9b2d Revert "Don't dispatch when non-interactive and the display is off." | |
| 78f974a DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea46405 am: bd23716585 -s ours am: 18a2ac0506 am: 08ed2bc083 am: 41ef58be3e am: 8aa7e6a21a | |
| 8aa7e6a DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea46405 am: bd23716585 -s ours am: 18a2ac0506 am: 08ed2bc083 am: 41ef58be3e | |
| 41ef58b DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea46405 am: bd23716585 -s ours am: 18a2ac0506 am: 08ed2bc083 | |
| d67897e Revert "LayoutLib: Fix true transparency in status bar." am: 4ea74d2960 | |
| ef40501 Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev am: 42a893b50b | |
| dd976b1 DO NOT MERGE ANYWHERE | |
| 4ea74d2 Revert "LayoutLib: Fix true transparency in status bar." | |
| 42a893b Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev | |
| 6684095 LayoutLib: IntelliJ changed project files. am: 22931224d9 | |
| 2293122 LayoutLib: IntelliJ changed project files. | |
| 99b54b3 AppCompatActionBar: use findClass to test presence | |
| e2af036 Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71 am: 313c7b2ee0 am: c73255d8ab am: 053f241cc7 | |
| 053f241 Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71 am: 313c7b2ee0 am: c73255d8ab | |
| c73255d Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71 am: 313c7b2ee0 | |
| e286147 Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am: cb8749c903 am: 0fa22022a3 | |
| 0fa2202 Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am: cb8749c903 | |
| cb8749c Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev | |
| dbe1804 Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev am: d083b37917 -s ours am: 7f0a1556ec -s ours | |
| 7f0a155 Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev am: d083b37917 -s ours | |
| d083b37 Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev | |
| f6ca46d Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE" | |
| 7bb34d7 Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am: abea6dc466 am: ccfcb636ae am: 63e6aa8571 am: 32a190bd78 | |
| 32a190b Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am: abea6dc466 am: ccfcb636ae am: 63e6aa8571 | |
| 63e6aa8 Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am: abea6dc466 am: ccfcb636ae | |
| 80bd5e6 Merge "WindowDecorActionBar name change fix." into mnc-ub-dev am: 62302bd72a | |
| 62302bd Merge "WindowDecorActionBar name change fix." into mnc-ub-dev | |
| b0aae58 DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am: 8d6630b87c -s ours am: f23229f45f -s ours | |
| f23229f DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am: 8d6630b87c -s ours | |
| 2b05511 WindowDecorActionBar name change fix. | |
| 05afe50 Fix MVNO hotspot bug for Europe | |
| 8d6630b DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. | |
| c24b39e Camera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759 am: 062c629e5c am: 784f0f15a9 | |
| 784f0f1 Camera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759 am: 062c629e5c | |
| 062c629 Camera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759 | |
| 529893f Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 am: b45defae8e | |
| b45defa Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 | |
| 211abad Log errno when dup fd cannot be allocated BUG: 25165471 | |
| f34cefd Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev | |
| f9489a4 Import translations. DO NOT MERGE | |
| 0db53d9 Add Bluetooth headset API to allow disabling audio route. | |
| 4510d17 Import translations. DO NOT MERGE am: 83d65fea01 -s ours am: a6c50551cd -s ours | |
| a6c5055 Import translations. DO NOT MERGE am: 83d65fea01 -s ours | |
| 83d65fe Import translations. DO NOT MERGE | |
| 20ba5c9 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 am: 32265b9ea0 -s ours am: d45a18c8ec am: ef15ca85d7 am: 28fc76ecef | |
| 28fc76e Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 am: 32265b9ea0 -s ours am: d45a18c8ec am: ef15ca85d7 | |
| 3bab0fd Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev am: dce0f8040d am: 3e9f2b7894 am: 1b29fd87a2 | |
| 1b29fd8 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev am: dce0f8040d am: 3e9f2b7894 | |
| 0e6007d Merge "Initialize DisplayContent base info when object is constructed" into cw-e-dev am: fe482e0bca | |
| fe482e0 Merge "Initialize DisplayContent base info when object is constructed" into cw-e-dev | |
| 6777f54 Fix delegation of methods within inner static classes | |
| 4ff8463 Initialize DisplayContent base info when object is constructed | |
| 9752605 Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b am: c9eb8b4367 am: c4a9c319e5 am: d80d24f5b1 | |
| d80d24f Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b am: c9eb8b4367 am: c4a9c319e5 | |
| 7336557 Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74 am: c455148edc am: af5c9f809c am: 69ee300c90 am: ffffcf14c5 | |
| ffffcf1 Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74 am: c455148edc am: af5c9f809c am: 69ee300c90 | |
| 0972c26 DO NOT MERGE. Cherrypick UiBench from Master | |
| 761af3d Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dr-dev am: 5b6ad87630 am: 4f822bbf2a | |
| 4f822bb Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dr-dev am: 5b6ad87630 | |
| 4d93d12 Merge "DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files" into cw-e-dev am: 516ac154e1 -s ours | |
| 2d43dd3 Merge "DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events." into cw-e-dev am: 6915d809e8 -s ours | |
| 516ac15 Merge "DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files" into cw-e-dev | |
| 6915d80 Merge "DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events." into cw-e-dev | |
| d30c141 Improve error reporting on Exceptions in fw views. | |
| 481a343 DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files | |
| 7018f60 DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events. | |
| 7a062ed Camera: Documentation updates am: d8407271ff am: 37e78cf8f1 am: 0e57a4d021 | |
| 0e57a4d Camera: Documentation updates am: d8407271ff am: 37e78cf8f1 | |
| 102e661 Merge "ActivityView gets its own thread pool." into cw-e-dev am: 1090acc958 | |
| 1090acc Merge "ActivityView gets its own thread pool." into cw-e-dev | |
| 71c012e ActivityView gets its own thread pool. | |
| 44df02f Merge "Revert "Fix race condition when setting default ringtones"" into mnc-dr-dev am: 88d4cc1001 am: 4f22c781b6 | |
| 4f22c78 Merge "Revert "Fix race condition when setting default ringtones"" into mnc-dr-dev am: 88d4cc1001 | |
| bdc6cd2 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: efa66ca345 -s ours | |
| efa66ca Merge "Import translations. DO NOT MERGE" into cw-e-dev | |
| d00e9f8 Import translations. DO NOT MERGE am: 984f7fb960 -s ours am: adaccf62be -s ours | |
| ead61cc Import translations. DO NOT MERGE | |
| adaccf6 Import translations. DO NOT MERGE am: 984f7fb960 -s ours | |
| f8c9e49 Allow debugging only for apps forked from zygote am: f915991842 -s ours am: 48fdfa403e | |
| 48fdfa4 Allow debugging only for apps forked from zygote am: f915991842 -s ours | |
| f915991 Allow debugging only for apps forked from zygote | |
| d9c10d7 Merge "Block directory selection in openable modes." into mnc-dr-dev am: 00765ef5a2 am: e6538dcc06 | |
| e6538dc Merge "Block directory selection in openable modes." into mnc-dr-dev am: 00765ef5a2 | |
| 8fb0121 Merge "Fix race condition when setting default ringtones" into mnc-dr-dev am: 83702ec3ed am: 02bf433f90 | |
| 02bf433 Merge "Fix race condition when setting default ringtones" into mnc-dr-dev am: 83702ec3ed | |
| 919b74a Merge "Import translations. DO NOT MERGE" into cw-e-dev am: f3b3a2ce2b -s ours | |
| f3b3a2c Merge "Import translations. DO NOT MERGE" into cw-e-dev | |
| 016d9e7 Import translations. DO NOT MERGE | |
| 9ab5fb5 Import translations. DO NOT MERGE am: 49eeda33dd -s ours am: 0414438abe -s ours | |
| 0414438 Import translations. DO NOT MERGE am: 49eeda33dd -s ours | |
| a1d0738 Import translations. DO NOT MERGE am: 210f0afaf9 -s ours | |
| 210f0af Import translations. DO NOT MERGE | |
| 5491926 DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE am: d9a2be8d3d -s ours am: 634221adb2 | |
| 634221a DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE am: d9a2be8d3d -s ours | |
| d9a2be8 DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE | |
| c06ccd7 Merge "Revert "Remove -ffast-math from libhwui makefile"" into mnc-dr-dev am: 0cf48e9120 am: 17fc83cbde | |
| 73d60ff Merge "Kick movement preconditions onto handler thread." into mnc-dr-dev am: e10faaa410 am: 2de7e39ffa | |
| 17fc83c Merge "Revert "Remove -ffast-math from libhwui makefile"" into mnc-dr-dev am: 0cf48e9120 | |
| 2de7e39 Merge "Kick movement preconditions onto handler thread." into mnc-dr-dev am: e10faaa410 | |
| d829ab7 Merge "When the incoming light source is invalid, don\'t generate any shadow" into mnc-dr-dev am: 76d20b4a5c am: 1c7fbe0efb | |
| 1c7fbe0 Merge "When the incoming light source is invalid, don\'t generate any shadow" into mnc-dr-dev am: 76d20b4a5c | |
| efcb281 Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE am: 88c7c3e080 -s ours | |
| 88c7c3e Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE | |
| 7109346 Merge "Fix Switch colors" into mnc-ub-dev | |
| c9b8f95 Fix Switch colors | |
| 6c1144d Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev am: c8bb39d98d am: 2c740f1dcf | |
| 2c740f1 Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev am: c8bb39d98d | |
| a853bb4 Merge "Early return when the scale is 0." into mnc-dr-dev am: 10eb6ab94b am: 8b581e2bc7 | |
| 8b581e2 Merge "Early return when the scale is 0." into mnc-dr-dev am: 10eb6ab94b | |
| 1938c39 Merge "Remove -ffast-math from libhwui makefile" into mnc-dr-dev am: c4aaf0f4b8 am: 62b16e2e10 | |
| 62b16e2 Merge "Remove -ffast-math from libhwui makefile" into mnc-dr-dev am: c4aaf0f4b8 | |
| c5b905f Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 8e7ab07ce7 -s ours am: cbe037b01a -s ours | |
| e22d81d Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev | |
| 26f50df Merge "Revert "Use clang for libhwui"" into mnc-dr-dev am: 1e1fbd804b am: f8635c2e04 | |
| 632d26d Merge "Revert "Use clang for libhwui"" into mnc-dr-dev am: 1e1fbd804b am: f8635c2e04 | |
| 7c941cd Import translations. DO NOT MERGE am: 4c9cdbc7ba -s ours am: d4d6fdefdf -s ours | |
| cbe037b Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 8e7ab07ce7 -s ours | |
| f8635c2 Merge "Revert "Use clang for libhwui"" into mnc-dr-dev am: 1e1fbd804b | |
| d4d6fde Import translations. DO NOT MERGE am: 4c9cdbc7ba -s ours | |
| 1c442ac Merge "Remove auto-boxing during the inflate" into mnc-ub-dev | |
| 7dda46e Merge "Update StaticLayout_Delegate to use new nLoadHyphenator" into mnc-ub-dev | |
| b67481b Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 931082b728 -s ours | |
| 5bf5deb Import translations. DO NOT MERGE am: f44adbba69 -s ours | |
| 931082b Merge "Import translations. DO NOT MERGE" into cw-e-dev | |
| 3b2a114 Import translations. DO NOT MERGE | |
| f44adbb Import translations. DO NOT MERGE | |
| 631c2ff Update StaticLayout_Delegate to use new nLoadHyphenator | |
| d90c2da ActivityView gets its own thread pool. DO NOT MERGE am: 7e19e286cc -s ours am: 6e0a83bcd9 | |
| 6e0a83b ActivityView gets its own thread pool. DO NOT MERGE am: 7e19e286cc -s ours | |
| 7e19e28 ActivityView gets its own thread pool. DO NOT MERGE | |
| d6f3e38 Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev am: 966d6040c6 am: 95fc53b029 | |
| 95fc53b Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev am: 966d6040c6 | |
| a32f221 Merge "Use clang for libhwui" into mnc-dr-dev am: 61c93eb16d am: a66dc6e159 | |
| a66dc6e Merge "Use clang for libhwui" into mnc-dr-dev am: 61c93eb16d | |
| 9c7f6a4 Merge "Remove circular_display_mask_offset symbol and default" into cw-e-dev am: 7f54aa1e81 | |
| 7f54aa1 Merge "Remove circular_display_mask_offset symbol and default" into cw-e-dev | |
| a09ac2d Merge "Fix issue #25357209: Could not send SMS or MMS messages, had to reboot" into mnc-dr-dev am: 71e4984505 am: 9a13cc6992 | |
| 9a13cc6 Merge "Fix issue #25357209: Could not send SMS or MMS messages, had to reboot" into mnc-dr-dev am: 71e4984505 | |
| 91fa3ba Remove auto-boxing during the inflate | |
| 6efac05 Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev am: 1942be506e am: b1fe11fde4 | |
| b1fe11f Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev am: 1942be506e | |
| e0eaa03 Merge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev am: 8b86c76296 am: 48a0c3ae8d | |
| 48a0c3a Merge "Improve comment on EXTRA_CALL_RAT_TYPE." into mnc-dr-dev am: 8b86c76296 | |
| 391c87d Merge "Fix a crash while printing ICCID because of alphabets in UICC." into mnc-dr-dev am: b57c65b00e am: 71f018a411 | |
| 71f018a Merge "Fix a crash while printing ICCID because of alphabets in UICC." into mnc-dr-dev am: b57c65b00e | |
| 341d544 Fixed a bug where the panel could get stuck closing am: b0e4f9e97e am: 157e60f7a2 | |
| 157e60f Fixed a bug where the panel could get stuck closing am: b0e4f9e97e | |
| f83d778e Remove circular_display_mask_offset symbol and default | |
| 023f4d1 Merge "Don\'t try overriding system fixed permissions on install" into mnc-dr-dev am: a47f9dad2b am: c4c1866228 | |
| c4c1866 Merge "Don\'t try overriding system fixed permissions on install" into mnc-dr-dev am: a47f9dad2b | |
| 6423c0a Merge "Allow verifier to grant permissions" into mnc-dr-dev am: cfa233eefb am: 22d7f4c2ed | |
| 22d7f4c Merge "Allow verifier to grant permissions" into mnc-dr-dev am: cfa233eefb | |
| 12d2e98 PackageSettingBase needs to copy volume UUID. am: 3b1c6e03f6 am: e63509b509 | |
| e63509b PackageSettingBase needs to copy volume UUID. am: 3b1c6e03f6 | |
| d359137 Merge "Handle "uninstalled" apps when pruning app-ops." into mnc-dr-dev am: a975732a83 am: 637d05eb5c | |
| 637d05e Merge "Handle "uninstalled" apps when pruning app-ops." into mnc-dr-dev am: a975732a83 | |
| a8e20b3 Merge "Add intent extra for determining if apps are system apps" into cw-e-dev am: 3a9bf5c8ce | |
| 3a9bf5c Merge "Add intent extra for determining if apps are system apps" into cw-e-dev | |
| 22baf9b Merge "IMS: Support For Per-Call RAT Info" into mnc-dr-dev am: 4ec415800f am: b5ab0ec3c0 | |
| b5ab0ec Merge "IMS: Support For Per-Call RAT Info" into mnc-dr-dev am: 4ec415800f | |
| b45f1b8 Get rid of getTypesVisibleToCaller log spam. am: 02bffab9dc am: 1fd46d1581 | |
| 1fd46d1 Get rid of getTypesVisibleToCaller log spam. am: 02bffab9dc | |
| d33d66e UsbDeviceManager: set mUsbDataUnlocked=false on user switch am: 5701321701 am: aa330c0dc2 | |
| aa330c0 UsbDeviceManager: set mUsbDataUnlocked=false on user switch am: 5701321701 | |
| 091b11d Import translations. DO NOT MERGE am: c3cd7b1585 -s ours am: 57e5d5836c -s ours | |
| 57e5d58 Import translations. DO NOT MERGE am: c3cd7b1585 -s ours | |
| f379a92 Import translations. DO NOT MERGE am: 05738e33ca -s ours | |
| 05738e3 Import translations. DO NOT MERGE | |
| c52503a Merge "Don\'t crash if a DHCP server doesn\'t send the server ID option." into mnc-dr-dev am: a2cc04736d am: e4aacaeec9 | |
| e4aacae Merge "Don\'t crash if a DHCP server doesn\'t send the server ID option." into mnc-dr-dev am: a2cc04736d | |
| 3b6f9f7 Merge "Add ability to set whether audio route is allowed in BluetoothHeadsetClient" into cw-e-dev am: 4636770f0d | |
| 4636770 Merge "Add ability to set whether audio route is allowed in BluetoothHeadsetClient" into cw-e-dev | |
| dc13382 Add ability to set whether audio route is allowed in BluetoothHeadsetClient | |
| 2adf45b Merge "Revert "Declare new interface for headset client bluetooth profile to query."" into cw-e-dev am: 0a80294c81 | |
| 0a80294 Merge "Revert "Declare new interface for headset client bluetooth profile to query."" into cw-e-dev | |
| 70d4210 Revert "Declare new interface for headset client bluetooth profile to query." | |
| 8b4f21b Merge "Declare new interface for headset client bluetooth profile to query." into cw-e-dev am: a841973dee | |
| a841973 Merge "Declare new interface for headset client bluetooth profile to query." into cw-e-dev | |
| 694251e Declare new interface for headset client bluetooth profile to query. | |
| 08d013d Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev am: 2658cb002a am: 35151fbc8b | |
| 35151fb Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev am: 2658cb002a | |
| 41579ff Merge "Update permission label strings" into cw-e-dev am: b69cab65d1 | |
| b69cab6 Merge "Update permission label strings" into cw-e-dev | |
| c450099 Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev am: 36da2a208e | |
| 36da2a2 Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev | |
| 9aa91f9 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: c7522c0b1c -s ours am: d2b3815dda -s ours | |
| d2b3815 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: c7522c0b1c -s ours | |
| 4c55431 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: a4f0ea406d -s ours | |
| a4f0ea4 Merge "Import translations. DO NOT MERGE" into cw-e-dev | |
| c3b637f Import translations. DO NOT MERGE | |
| 3207621 Import translations. DO NOT MERGE am: b8afc77c0a -s ours am: 7934d4e206 -s ours | |
| 7934d4e Import translations. DO NOT MERGE am: b8afc77c0a -s ours | |
| 5d79e1b Import translations. DO NOT MERGE am: 44036023a5 -s ours | |
| 4403602 Import translations. DO NOT MERGE | |
| 638003c Merge "Petites fautes." into mnc-dr-dev am: da43cc0a21 am: 21858e56d6 -s ours | |
| 0e98ac7 Update permission label strings | |
| 21858e5 Merge "Petites fautes." into mnc-dr-dev am: da43cc0a21 | |
| 40bced1 Fix issue #25289999: Lower device idle alarm limit to 10 mins. am: 7682b26ea1 am: 26654c92ca | |
| 26654c9 Fix issue #25289999: Lower device idle alarm limit to 10 mins. am: 7682b26ea1 | |
| 3575a40 Add intent extra for determining if apps are system apps | |
| 515e97a Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 337495bded -s ours | |
| ad3bd48 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: db4f28692a -s ours | |
| fe4a48c Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 9865051825 -s ours | |
| 337495b Merge "Import translations. DO NOT MERGE" into cw-e-dev | |
| db4f286 Merge "Import translations. DO NOT MERGE" into cw-e-dev | |
| 9865051 Merge "Import translations. DO NOT MERGE" into cw-e-dev | |
| 7976a3f Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 8961b24ff2 -s ours | |
| e8be87e Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 4917e9dd1c -s ours | |
| 6b3e780 Import translations. DO NOT MERGE | |
| 76941be Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 82b5276866 -s ours | |
| 48dfdda Import translations. DO NOT MERGE | |
| 79c07f4 Import translations. DO NOT MERGE | |
| 8961b24 Merge "Import translations. DO NOT MERGE" into cw-e-dev | |
| 4917e9d Merge "Import translations. DO NOT MERGE" into cw-e-dev | |
| 82b5276 Merge "Import translations. DO NOT MERGE" into cw-e-dev | |
| 7ced195 Import translations. DO NOT MERGE | |
| db2cb7b Import translations. DO NOT MERGE | |
| 30616cb Import translations. DO NOT MERGE | |
| 4c42942 Merge "Add Telecom config bool to require a phone account to be present for handle" into cw-e-dev am: 521ac43fe5 | |
| 521ac43 Merge "Add Telecom config bool to require a phone account to be present for handle" into cw-e-dev | |
| 65b9942 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 609444dff3 -s ours | |
| 609444d Merge "Import translations. DO NOT MERGE" into cw-e-dev | |
| 6b129a1 Import translations. DO NOT MERGE | |
| eeb2376 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 14bb0511c6 -s ours am: 6995e0bf08 -s ours | |
| 6995e0b Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 14bb0511c6 -s ours | |
| 8b41305 Import translations. DO NOT MERGE am: f6fc9e2152 -s ours am: 432eb8e686 -s ours | |
| 432eb8e Import translations. DO NOT MERGE am: f6fc9e2152 -s ours | |
| a0b24e6 Import translations. DO NOT MERGE am: a1ecb9ee2b -s ours | |
| a1ecb9e Import translations. DO NOT MERGE | |
| c2f421a Add Telecom config bool to require a phone account to be present for handle | |
| b0482fe Merge "Prevent recents from coming up when in SUW" into mnc-dr-dev am: ca9c43b27b am: fc12c7c1b7 | |
| fc12c7c Merge "Prevent recents from coming up when in SUW" into mnc-dr-dev am: ca9c43b27b | |
| a540cbd Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a -s ours am: 410bea181b am: 511357c39b am: 7e16b2e8f5 -s ours am: e68e70d509 am: 493272c8a7 am: 06eb98c04d | |
| 06eb98c Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a -s ours am: 410bea181b am: 511357c39b am: 7e16b2e8f5 -s ours am: e68e70d509 am: 493272c8a7 | |
| 681a397 Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77 am: 6026b5b17e am: 6c3186ea07 -s ours am: ab4857790b am: d9a96ff747 am: e41b3b35b5 | |
| e41b3b3 Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77 am: 6026b5b17e am: 6c3186ea07 -s ours am: ab4857790b am: d9a96ff747 | |
| 625c731 Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 446dcc9ed7 am: 4db8c18755 am: 5da8453866 | |
| 5da8453 Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 446dcc9ed7 am: 4db8c18755 | |
| f6e4c9d Consolidates config_windowOutsetBottom and circular_display_mask_offset | |
| c49f5c8 Merge "[DO NOT MERGE] EAP-TLS PMKID mismatch error" into mnc-dr-dev am: 3b47afe765 am: 910e447d96 | |
| 998afcb Merge "Add config flag for reloading supported profiles in bluetooth on enable." into cw-e-dev am: 434a1fd687 | |
| 910e447 Merge "[DO NOT MERGE] EAP-TLS PMKID mismatch error" into mnc-dr-dev am: 3b47afe765 | |
| 434a1fd Merge "Add config flag for reloading supported profiles in bluetooth on enable." into cw-e-dev | |
| c17bbe0 Add config flag for reloading supported profiles in bluetooth on enable. | |
| 9cae56e Merge "Factor chin size into dimension checking to determine if CircularDisplayMask can be turned on." into cw-e-dev am: e94b3ba099 | |
| e94b3ba Merge "Factor chin size into dimension checking to determine if CircularDisplayMask can be turned on." into cw-e-dev | |
| 5e5f718 Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev am: 93a6b4c129 am: a53bbb652b | |
| a53bbb6 Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev am: 93a6b4c129 | |
| 6ff08bd Merge "DO NOT MERGE Fix issue #24118803: The screen doesn\'t turn off..." into mnc-dr-dev am: b32e020d23 am: 9161871f83 | |
| 9161871 Merge "DO NOT MERGE Fix issue #24118803: The screen doesn\'t turn off..." into mnc-dr-dev am: b32e020d23 | |
| b932dc5 Remove tether_apndata for Sasktel am: a665ea7207 am: af745653d0 | |
| af74565 Remove tether_apndata for Sasktel am: a665ea7207 | |
| 07129d5 Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev am: 09fd4ecf90 am: b402735fc0 | |
| b402735 Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev am: 09fd4ecf90 | |
| 9c57af4 Factor chin size into dimension checking to determine if CircularDisplayMask can be turned on. | |
| d7688f5 Merge "Don\'t resolve cross-profile app links without intent picker." into mnc-dr-dev am: 6666b29cf7 am: f31628f58b | |
| f31628f Merge "Don\'t resolve cross-profile app links without intent picker." into mnc-dr-dev am: 6666b29cf7 | |
| 5c6a387 SystemUI: fix automatic pairing of BT keyboards am: 79f00cf06f am: d3eee7c410 | |
| d3eee7c SystemUI: fix automatic pairing of BT keyboards am: 79f00cf06f | |
| 5f8ac21 Merge "Give watch Home app location permissions by default" into cw-e-dev am: 0a3270e00a | |
| 0a3270e Merge "Give watch Home app location permissions by default" into cw-e-dev | |
| 6a5bb15 Fix crash on calling removeSelection with showing selection handlers am: 9582e15196 am: 6649ee972b | |
| 6649ee9 Fix crash on calling removeSelection with showing selection handlers am: 9582e15196 | |
| bb8f652 Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev am: 809dcade99 am: bdc458048a | |
| bdc4580 Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev am: 809dcade99 | |
| 51692ac Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo() am: 0dccd12800 am: 64e8bdc476 | |
| 64e8bdc Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo() am: 0dccd12800 | |
| b129c10 Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev am: 42015c4081 am: 5be7dbc88d | |
| 5be7dbc Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev am: 42015c4081 | |
| 1a3c88a Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev am: f8a4dc4a6f am: dc9f8fab0f | |
| dc9f8fa Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev am: f8a4dc4a6f | |
| fda65d7 Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev am: 33e1d376eb am: 655c12edb0 | |
| 655c12e Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev am: 33e1d376eb | |
| ca8e4ce Merge "Hopefully fix issue #25153459: Sandboxed_process1 thrashing" into mnc-dr-dev am: 676534e008 am: 75c2993c91 | |
| 75c2993 Merge "Hopefully fix issue #25153459: Sandboxed_process1 thrashing" into mnc-dr-dev am: 676534e008 | |
| f728454 Merge "Delay hiding the cast icon for 3 seconds." into mnc-dr-dev am: cb10c09f0a am: b4aa8b0c5b | |
| b4aa8b0 Merge "Delay hiding the cast icon for 3 seconds." into mnc-dr-dev am: cb10c09f0a | |
| f998b60 Merge "Don\'t query ChooserTargetService apps that haven\'t been used recently" into mnc-dr-dev am: b8cfc12c3f am: 8c7b3e872b | |
| ae070b9 Merge "Changing the ordering for heads up notifications" into mnc-dr-dev am: 688e046bad am: f9c4f745e6 | |
| 8c7b3e8 Merge "Don\'t query ChooserTargetService apps that haven\'t been used recently" into mnc-dr-dev am: b8cfc12c3f | |
| f9c4f74 Merge "Changing the ordering for heads up notifications" into mnc-dr-dev am: 688e046bad | |
| c9f3b2f Merge "Maintain shared user list on OTA" into mnc-dr-dev am: 0cd10ec8cf am: d12f298da4 | |
| 7a6a7ae Narrow permission re-granting to specific volume. am: 052366ca4e am: 0b639c78f1 | |
| d12f298 Merge "Maintain shared user list on OTA" into mnc-dr-dev am: 0cd10ec8cf | |
| 0b639c7 Narrow permission re-granting to specific volume. am: 052366ca4e | |
| 2cd707e Merge "Watch dialer should have phone permission fixed" into cw-e-dev am: 52c6f9ecb3 | |
| 52c6f9e Merge "Watch dialer should have phone permission fixed" into cw-e-dev | |
| 90814f0 Give watch Home app location permissions by default | |
| d453992 Watch dialer should have phone permission fixed | |
| f0e4b99 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 255103a79f -s ours | |
| eb92dc2 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 457d7bb5ab -s ours | |
| 255103a Merge "Import translations. DO NOT MERGE" into cw-e-dev | |
| 457d7bb Merge "Import translations. DO NOT MERGE" into cw-e-dev | |
| 93e157a Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 9e30c4b406 -s ours | |
| 71829e4 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 6e66ac8e66 -s ours | |
| 596e71a Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 7c6d61e8eb -s ours | |
| 9e30c4b4 Merge "Import translations. DO NOT MERGE" into cw-e-dev | |
| 6e66ac8 Merge "Import translations. DO NOT MERGE" into cw-e-dev | |
| 7c6d61e Merge "Import translations. DO NOT MERGE" into cw-e-dev | |
| c55ea66 Import translations. DO NOT MERGE | |
| a01cf41 Import translations. DO NOT MERGE | |
| ea6ea27 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: a73a642bfe -s ours | |
| 1622b44 Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev | |
| c6fe063 Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev am: 84ab40cab2 | |
| 899d016 Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev | |
| 96b2507 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 8ba1cdd946 -s ours am: 762ce0fc44 -s ours | |
| b9315af Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev am: 84ab40cab2 | |
| fc7130c Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev | |
| be8fe13 Import translations. DO NOT MERGE | |
| 38d9cb2 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 7f174ff665 -s ours | |
| a948cfe Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 8ba1cdd946 -s ours am: 762ce0fc44 -s ours | |
| 9db8637 Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev | |
| 7829bc5 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 55bc169d50 -s ours | |
| f7e27a2 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 7f174ff665 -s ours | |
| 5bb1fa5 Import translations. DO NOT MERGE | |
| c49ecff Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 55bc169d50 -s ours | |
| 9aa4c09 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 721249f22b -s ours | |
| a400a12 Import translations. DO NOT MERGE | |
| 4c96a03 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 04733e23a3 -s ours | |
| a9af892 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: cd000a2228 -s ours | |
| bd0cfcf Merge "Import translations. DO NOT MERGE" into cw-e-dev am: b8f70e10ef -s ours | |
| a73a642 Merge "Import translations. DO NOT MERGE" into cw-e-dev | |
| b4dc6a3 Import translations. DO NOT MERGE | |
| 84ab40c Merge branch 'cw-e-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev | |
| 762ce0f Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 8ba1cdd946 -s ours | |
| 88f7134 Merge "Import translations. DO NOT MERGE" into cw-e-dev | |
| 7e1d841 Import translations. DO NOT MERGE | |
| 7f174ff Merge "Import translations. DO NOT MERGE" into cw-e-dev | |
| 55bc169 Merge "Import translations. DO NOT MERGE" into cw-e-dev | |
| 721249f Merge "Import translations. DO NOT MERGE" into cw-e-dev | |
| 04733e2 Merge "Import translations. DO NOT MERGE" into cw-e-dev | |
| cd000a2 Merge "Import translations. DO NOT MERGE" into cw-e-dev | |
| 8caa78e Import translations. DO NOT MERGE | |
| b8f70e1 Merge "Import translations. DO NOT MERGE" into cw-e-dev | |
| 5fafafc Import translations. DO NOT MERGE | |
| 1e7fb19 Import translations. DO NOT MERGE | |
| 91898cc Import translations. DO NOT MERGE | |
| 509a749 Merge "Fix toolbar flickering in ExtractedMode when longpressing." into mnc-dr-dev am: ee4ab0a55b am: 24fc647e70 | |
| 65855a1 Import translations. DO NOT MERGE | |
| efb0f8d Import translations. DO NOT MERGE | |
| 24fc647 Merge "Fix toolbar flickering in ExtractedMode when longpressing." into mnc-dr-dev am: ee4ab0a55b | |
| 2a75ecb Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev | |
| 146ef50 Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev am: 8deb694779 | |
| 0b2f041 Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev am: 8deb694779 | |
| eab4352 Merge "Don\'t include password on default encryption command" into mnc-dr-dev am: 68521fd7ce am: 29c5fb2646 | |
| 03c5ec7 Import translations. DO NOT MERGE am: fde4111eea -s ours am: c37fe84736 -s ours | |
| 8deb694 Merge branch 'cw-e-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev | |
| 29c5fb2 Merge "Don\'t include password on default encryption command" into mnc-dr-dev am: 68521fd7ce | |
| 3379409 Merge "Don\'t include password on default encryption command" into mnc-dr-dev am: 68521fd7ce | |
| c37fe84 Import translations. DO NOT MERGE am: fde4111eea -s ours | |
| c1fe7bd Import translations. DO NOT MERGE am: 0705d75d69 -s ours | |
| 0705d75 Import translations. DO NOT MERGE | |
| 18ec0b5 Merge "Don\'t buzz when automatically connecting to captive portals" into mnc-dr-dev am: d214496319 am: 5c09f31e49 | |
| 5c09f31 Merge "Don\'t buzz when automatically connecting to captive portals" into mnc-dr-dev am: d214496319 | |
| e01b99f Merge "Correctly derive ABI for apps on adopted media." into mnc-dr-dev am: 55d2b6e8e6 am: 257d2ca7fd | |
| 257d2ca Merge "Correctly derive ABI for apps on adopted media." into mnc-dr-dev am: 55d2b6e8e6 | |
| 2c26344 Merge "Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag" into mnc-dr-dev am: d99aade6e2 am: d91b1f6bb8 | |
| d91b1f6 Merge "Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag" into mnc-dr-dev am: d99aade6e2 | |
| a153a80 Merge "Catch exceptions thrown by pending activity launches." into mnc-dr-dev am: 9ada400e98 am: 894dd2b078 | |
| 894dd2b Merge "Catch exceptions thrown by pending activity launches." into mnc-dr-dev am: 9ada400e98 | |
| a362507 Merge "ignore initial request to disable iptable chain" into mnc-dr-dev am: 3554d62ca0 am: d166333eb5 | |
| 4e18ec7 Merge "DO NOT MERGE Race condition in JobServiceContext" into mnc-dr-dev am: cf43b5523f am: 07de80bd87 | |
| d166333 Merge "ignore initial request to disable iptable chain" into mnc-dr-dev am: 3554d62ca0 | |
| 07de80b Merge "DO NOT MERGE Race condition in JobServiceContext" into mnc-dr-dev am: cf43b5523f | |
| 4170794 Merge "DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure" into mnc-dr-dev am: 4823493647 am: ac02be311d | |
| ac02be3 Merge "DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure" into mnc-dr-dev am: 4823493647 | |
| d7d56a4 DO NOT MERGE Sync extras bundle comparison can throw NPE am: 7d7a2254bc am: cb937cbc6a | |
| cb937cb DO NOT MERGE Sync extras bundle comparison can throw NPE am: 7d7a2254bc | |
| 8caf80d Merge "Correct ActivityInfo constructors." into mnc-dr-dev am: cfea184d6c am: e2a49862c1 | |
| e2a4986 Merge "Correct ActivityInfo constructors." into mnc-dr-dev am: cfea184d6c | |
| 0eef4ab Merge "Re-set PROCESS_TEXT selection if nothing was returned." into mnc-dr-dev am: 3bd3655fd0 am: 9e97c20ed9 | |
| 9e97c20 Merge "Re-set PROCESS_TEXT selection if nothing was returned." into mnc-dr-dev am: 3bd3655fd0 | |
| 355e53e Merge "Add locking when mutating RecentTasks." into mnc-dr-dev am: 1a4efb77dd am: 3e9a3f3b71 | |
| 3b30aae Merge "Ignore network policies with missing IMSI." into mnc-dr-dev am: 38463bb950 am: 5d7604323f | |
| c3e46ad Merge "Update drawable matrix when bounds change in invalidateDrawable()" into mnc-dr-dev am: 840f38905c am: e3d745291e | |
| bc71059 Merge "Set the bounds on the drawable for ChangeBounds reparenting." into mnc-dr-dev am: 1313020acc am: ee15f087db | |
| 3e9a3f3 Merge "Add locking when mutating RecentTasks." into mnc-dr-dev am: 1a4efb77dd | |
| 5d76043 Merge "Ignore network policies with missing IMSI." into mnc-dr-dev am: 38463bb950 | |
| e3d7452 Merge "Update drawable matrix when bounds change in invalidateDrawable()" into mnc-dr-dev am: 840f38905c | |
| ee15f08 Merge "Set the bounds on the drawable for ChangeBounds reparenting." into mnc-dr-dev am: 1313020acc | |
| b959ce8 resolve merge conflicts of 57a5cba606 to cw-e-dev. am: bab2b42445 | |
| bab2b42 resolve merge conflicts of 57a5cba606 to cw-e-dev. | |
| 02940eb Merge "Retain fragment loaders" into mnc-dr-dev am: ad968cf4e5 am: 6320767fb1 | |
| 6320767 Merge "Retain fragment loaders" into mnc-dr-dev am: ad968cf4e5 | |
| 2a61cc8 Merge "DO NOT MERGE Fix jank when intent resolver/chooser windows animate in" into mnc-dr-dev am: 4ecfbcfdea am: eeed032eae | |
| eeed032 Merge "DO NOT MERGE Fix jank when intent resolver/chooser windows animate in" into mnc-dr-dev am: 4ecfbcfdea | |
| 011f9eb Merge "Reload content description of KeyButtonView" into mnc-dr-dev am: 9a345f31f2 am: 574b5f71e8 | |
| 574b5f7 Merge "Reload content description of KeyButtonView" into mnc-dr-dev am: 9a345f31f2 | |
| 7e5b18a Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev am: ec8a4ecc92 | |
| e9c7512 Merge "Set host when restoring a fragment" into mnc-dr-dev am: 986d4b482d am: d419d86952 | |
| efa447e Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev am: 7f2deeeef5 am: df0cc41a7b | |
| 2a95159 Merge "Don\'t allow concurrent permission requests." into mnc-dr-dev am: e199016a82 am: aebff7f1ad | |
| ec8a4ec Merge branch 'cw-e-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev | |
| d419d86 Merge "Set host when restoring a fragment" into mnc-dr-dev am: 986d4b482d | |
| 17b2b27 Merge "Set host when restoring a fragment" into mnc-dr-dev am: 986d4b482d | |
| df0cc41 Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev am: 7f2deeeef5 | |
| aebff7f Merge "Don\'t allow concurrent permission requests." into mnc-dr-dev am: e199016a82 | |
| 73b6750 am 005d36d1: Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev am: a817c90a7a | |
| 005d36d Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev am: a817c90a7a | |
| e0f00d0 am a6e7b3ae: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 7ba59c3559 -s ours | |
| a6e7b3a Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 7ba59c3559 -s ours | |
| ffdbfaa am 2a09706e: (-s ours) Import translations. DO NOT MERGE am: 5e4863205e -s ours | |
| 2a09706 Import translations. DO NOT MERGE am: 5e4863205e -s ours | |
| 9c25e23 am 3472f18e: am c7f2058c: Merge "count notification peeks by window action" into mnc-dr-dev | |
| 3472f18 am c7f2058c: Merge "count notification peeks by window action" into mnc-dr-dev | |
| 55dd957 am 7a027807: am c03443b2: Fix lens shading map origin calculation. | |
| 7a02780 am c03443b2: Fix lens shading map origin calculation. | |
| 4135092 am 303e5c41: am b9a73d2c: Merge "Stopping chronometers now when the shade is closed" into mnc-dr-dev | |
| 303e5c4 am b9a73d2c: Merge "Stopping chronometers now when the shade is closed" into mnc-dr-dev | |
| b70426b am 4c9fcd54: Merge "Add capability to identify phone accounts that are emergency only." into cw-e-dev | |
| c85315a am 9a365194: am 1f0ec16b: DO NOT MERGE Sanity check loaded periodics and cap runtime. | |
| 4c9fcd5 Merge "Add capability to identify phone accounts that are emergency only." into cw-e-dev | |
| 9a36519 am 1f0ec16b: DO NOT MERGE Sanity check loaded periodics and cap runtime. | |
| 0221328 am b3538082: am 5362f273: Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev | |
| b353808 am 5362f273: Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev | |
| 3c439c7 am 85fae34e: am 70ea8578: Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev | |
| 85fae34 am 70ea8578: Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev | |
| 542052d am 96faf5c8: am a762c210: Merge "Add \'until next alarm\' option to QS zen panel." into mnc-dr-dev | |
| 96faf5c am a762c210: Merge "Add \'until next alarm\' option to QS zen panel." into mnc-dr-dev | |
| 6331753 am b01a963a: am 68750116: Merge "DO NOT MERGE Change scheduling logic to run network jobs sooner" into mnc-dr-dev | |
| b01a963 am 68750116: Merge "DO NOT MERGE Change scheduling logic to run network jobs sooner" into mnc-dr-dev | |
| 824347d am d08f339b: am 749334bf: Merge "Fix ChooserTarget app scoring" into mnc-dr-dev | |
| d08f339 am 749334bf: Merge "Fix ChooserTarget app scoring" into mnc-dr-dev | |
| 723900d am 95b84f52: am a5917b71: Merge "DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA." into mnc-dr-dev | |
| 95b84f5 am a5917b71: Merge "DO NOT MERGE Add a new carrier config for DTMF tone gap in CDMA." into mnc-dr-dev | |
| 85978d7 am a3234f01: am 9c76f61d: Merge "DO NOT MERGE: Reduce delay of floating toolbar appearance." into mnc-dr-dev | |
| a3234f0 am 9c76f61d: Merge "DO NOT MERGE: Reduce delay of floating toolbar appearance." into mnc-dr-dev | |
| d56756f am 535726f6: am 0c15693e: Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev | |
| ad8e78c am 29ffdc91: am be655510: Merge "Disassociate system windows from apps" into mnc-dr-dev | |
| 535726f am 0c15693e: Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev | |
| 29ffdc9 am be655510: Merge "Disassociate system windows from apps" into mnc-dr-dev | |
| cf471ef am 001a651e: am 8d6d735f: Merge "Mask IccId which gets printed in bug reports & radio logs." into mnc-dr-dev | |
| 001a651 am 8d6d735f: Merge "Mask IccId which gets printed in bug reports & radio logs." into mnc-dr-dev | |
| 401f68b am 510f03c5: am 56f41971: Merge "Fix issue #24571425: Device does not come out of idle mode for maintenance" into mnc-dr-dev | |
| b36aebb am ffa8fd0e: am 6a032a3a: Don\'t project ripple for adequately tall spinners | |
| 510f03c am 56f41971: Merge "Fix issue #24571425: Device does not come out of idle mode for maintenance" into mnc-dr-dev | |
| ffa8fd0 am 6a032a3a: Don\'t project ripple for adequately tall spinners | |
| 0a543fa am 111b378a: am 575b629e: Merge "WindowStateAnimation: Clear transformation clip rect." into mnc-dr-dev | |
| 111b378 am 575b629e: Merge "WindowStateAnimation: Clear transformation clip rect." into mnc-dr-dev | |
| cad75a2 am 627bc805: am ae5a53d7: Merge "Update volume slider on device changed." into mnc-dr-dev | |
| 627bc80 am ae5a53d7: Merge "Update volume slider on device changed." into mnc-dr-dev | |
| 86fdb66 am 4f836839: am 67ea77ec: Merge "Selectively show zen footer." into mnc-dr-dev | |
| 4f83683 am 67ea77ec: Merge "Selectively show zen footer." into mnc-dr-dev | |
| 11543a1 am ea5ad487: am d8ef44bc: Merge "Don\'t call StopRecognition when recognition was aborted." into mnc-dr-dev | |
| ea5ad48 am d8ef44bc: Merge "Don\'t call StopRecognition when recognition was aborted." into mnc-dr-dev | |
| 522222b am f96ca344: am 75765dbe: am e34445f1: Merge "Docs only change: update build version docs." into mnc-dev | |
| f96ca34 am 75765dbe: am e34445f1: Merge "Docs only change: update build version docs." into mnc-dev | |
| 67255b4 am c007c150: am 8630e18a: am 31f19c44: Merge "Send next alarm\'s show intent via PendingIntent" into mnc-dev | |
| c007c15 am 8630e18a: am 31f19c44: Merge "Send next alarm\'s show intent via PendingIntent" into mnc-dev | |
| f12a749 am 9407aa7c: am 63aa02e4: Merge "Load binary hyphen data files" into mnc-dr-dev | |
| 9407aa7 am 63aa02e4: Merge "Load binary hyphen data files" into mnc-dr-dev | |
| bd4d81b am b248077a: am 2eac005b: Merge "Fix bugs introduced in ChooserActivity" into mnc-dr-dev | |
| b248077 am 2eac005b: Merge "Fix bugs introduced in ChooserActivity" into mnc-dr-dev | |
| a41ea5e am 8fb8c37c: am 7b28e6ec: Merge "Adding config to allow/disallow user to add APNs." into mnc-dr-dev | |
| b96d89c Add capability to identify phone accounts that are emergency only. | |
| 8fb8c37 am 7b28e6ec: Merge "Adding config to allow/disallow user to add APNs." into mnc-dr-dev | |
| ec3513e am ecf89edf: am 8a586c55: Merge "TDSCDMA: RSSI bar moves 1 bar into no signal without going through 0 bar" into mnc-dr-dev | |
| ecf89ed am 8a586c55: Merge "TDSCDMA: RSSI bar moves 1 bar into no signal without going through 0 bar" into mnc-dr-dev | |
| 58de286 am 6598022d: am bdf952aa: Merge "Make Hyphenator#get() return an object." into mnc-dr-dev | |
| 6598022 am bdf952aa: Merge "Make Hyphenator#get() return an object." into mnc-dr-dev | |
| 1c36cfd am d8fed39f: am c7a873e3: Merge "Ensure we update the active pointer id on pointer up/down." into mnc-dr-dev | |
| d8fed39 am c7a873e3: Merge "Ensure we update the active pointer id on pointer up/down." into mnc-dr-dev | |
| 9c8abd1 am f23eece2: am b7e722b8: Merge "Don\'t crash if an invalid always-on VPN profile is configured." into mnc-dr-dev | |
| f23eece am b7e722b8: Merge "Don\'t crash if an invalid always-on VPN profile is configured." into mnc-dr-dev | |
| 62679a1 am c095272a: (-s ours) am 7013f0c8: (-s ours) Import translations. DO NOT MERGE | |
| c095272 am 7013f0c8: (-s ours) Import translations. DO NOT MERGE | |
| f23e617 am 6c8ddfcc: am 40ec3a92: Merge "Correctly reschedule failed periodic" into mnc-dr-dev | |
| 6c8ddfc am 40ec3a92: Merge "Correctly reschedule failed periodic" into mnc-dr-dev | |
| acb867f am bf76eb7c: am a2ed535c: NotificationPlayer supports MediaPlayer errors | |
| bf76eb7 am a2ed535c: NotificationPlayer supports MediaPlayer errors | |
| f3c9215 am 66536146: am 4673b259: Merge "Show charging speed in all locales" into mnc-dr-dev | |
| 6653614 am 4673b259: Merge "Show charging speed in all locales" into mnc-dr-dev | |
| 83663c5 am 202538ee: am 50e79632: Merge "Remove ColorFade resouces when screen off." into mnc-dr-dev | |
| 202538e am 50e79632: Merge "Remove ColorFade resouces when screen off." into mnc-dr-dev | |
| 559f28e am d32df662: am de612dc1: MediaPlayer: remove obsolete function setPlaybackRate from comments. | |
| d32df66 am de612dc1: MediaPlayer: remove obsolete function setPlaybackRate from comments. | |
| 595a93e am 430a769a: Merge "Use wear style dialog for ICC hotswap restart dialog." into cw-e-dev | |
| 430a769 Merge "Use wear style dialog for ICC hotswap restart dialog." into cw-e-dev | |
| a14c579 am 59e52b9f: am 1c33939b: Merge "Shorten first boot time by filtering dexopted apps by LRU." into mnc-dr-dev | |
| 59e52b9 am 1c33939b: Merge "Shorten first boot time by filtering dexopted apps by LRU." into mnc-dr-dev | |
| 1bc47a6 am bfaa71bb: am 8e82755d: Merge "BluetoothMidiDevice: change write type to support JamStik" into mnc-dr-dev | |
| bfaa71b am 8e82755d: Merge "BluetoothMidiDevice: change write type to support JamStik" into mnc-dr-dev | |
| 92ae0a5 am 7bbb6fed: am 977fe03b: BLE-MIDI: change binding for BluetoothMidiService | |
| 7bbb6fe am 977fe03b: BLE-MIDI: change binding for BluetoothMidiService | |
| 4f1cbad Use wear style dialog for ICC hotswap restart dialog. | |
| c2fd35f am 57c332bd: am c024de3c: media: ignore null InputStream | |
| 57c332b am c024de3c: media: ignore null InputStream | |
| 8738d73 am a14d1bd7: am c1c462cb: Merge "MidiBluetoothService: add new device to HashMap" into mnc-dr-dev | |
| a14d1bd am c1c462cb: Merge "MidiBluetoothService: add new device to HashMap" into mnc-dr-dev | |
| 4299751 am 5b53211a: am ce42e922: Merge "Unbind IME client when unsetting the current IME." into mnc-dr-dev | |
| 5b53211 am ce42e922: Merge "Unbind IME client when unsetting the current IME." into mnc-dr-dev | |
| d93e404 am 1b872618: am 7a097ff1: Merge "Shared user retains permissions no longer used by any app on an app update" into mnc-dr-dev | |
| 1b87261 am 7a097ff1: Merge "Shared user retains permissions no longer used by any app on an app update" into mnc-dr-dev | |
| 1901a9e am 40ce70c9: am 11af1878: Merge "Add animation and positional stability to intent chooser UI" into mnc-dr-dev | |
| 40ce70c am 11af1878: Merge "Add animation and positional stability to intent chooser UI" into mnc-dr-dev | |
| 05222c3 am 829920ed: am 34c120dc: Merge ""Fix" issue #24357296: Debug.getMemoryInfo doesn\'t include EGL mtrack..." into mnc-dr-dev | |
| 829920e am 34c120dc: Merge ""Fix" issue #24357296: Debug.getMemoryInfo doesn\'t include EGL mtrack..." into mnc-dr-dev | |
| 56f9a42 am 1c9d43eb: am bde2707f: Merge "Add additional density enums to android:screenDensity attribute" into mnc-dr-dev | |
| 1c9d43e am bde2707f: Merge "Add additional density enums to android:screenDensity attribute" into mnc-dr-dev | |
| ff1e8f7 am 1b3eb741: am ca296978: Merge "MidiManager: fix double BTLE callback" into mnc-dr-dev | |
| 1b3eb74 am ca296978: Merge "MidiManager: fix double BTLE callback" into mnc-dr-dev | |
| 69ddaaf am 0a64b146: am e39def48: MidiService: update listener with current status when registered | |
| 0a64b14 am e39def48: MidiService: update listener with current status when registered | |
| ff95329 am d9635e60: am c83a6121: Merge "Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR" into mnc-dr-dev | |
| d9635e6 am c83a6121: Merge "Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR" into mnc-dr-dev | |
| ff71f26 am 51591b91: am 6cc3735a: Merge "Fix issue #23581553: Ignore Battery Optimization not work for re-install app" into mnc-dr-dev | |
| 51591b9 am 6cc3735a: Merge "Fix issue #23581553: Ignore Battery Optimization not work for re-install app" into mnc-dr-dev | |
| 9fc47b0 am b394e6de: am 5c18d051: Use effectiveUid instead of callingUid to set lockTaskMode | |
| b394e6d am 5c18d051: Use effectiveUid instead of callingUid to set lockTaskMode | |
| 4133331 am 46811dd9: am c4c42d55: Merge "[RenderScript] pass correct length of ains to BLAS functions" into mnc-dr-dev | |
| 46811dd am c4c42d55: Merge "[RenderScript] pass correct length of ains to BLAS functions" into mnc-dr-dev | |
| 97604b4 am 9f1ae4dc: am fe9c950a: Merge "Fix parole scheduling bugs." into mnc-dr-dev | |
| 75051c3 am 7f6d8754: am a03ecf7d: Merge "Push firewall rules up to ConnectivityService." into mnc-dr-dev | |
| 8feaed9 am da5d9af8: am fe45f1b9: Merge "Default location is "internalOnly" when undefined." into mnc-dr-dev | |
| 9f1ae4d am fe9c950a: Merge "Fix parole scheduling bugs." into mnc-dr-dev | |
| 7f6d875 am a03ecf7d: Merge "Push firewall rules up to ConnectivityService." into mnc-dr-dev | |
| da5d9af am fe45f1b9: Merge "Default location is "internalOnly" when undefined." into mnc-dr-dev | |
| f674719 am 04166953: am 6be61a98: wm: call displayReady for all built in displays when system is ready. | |
| 0416695 am 6be61a98: wm: call displayReady for all built in displays when system is ready. | |
| 99ec359 am ef2f6596: (-s ours) am ac3b53a7: (-s ours) Import translations. DO NOT MERGE | |
| ef2f659 am ac3b53a7: (-s ours) Import translations. DO NOT MERGE | |
| 553a934 am 647ec7f8: am 4e4d59ee: Connect the DHCP UDP socket to the server. | |
| 871d96b am 13c5dd5c: am eb0bbd45: Merge changes Id6a0b0de,I5f03b8b2,I62464b92 into mnc-dr-dev | |
| 647ec7f am 4e4d59ee: Connect the DHCP UDP socket to the server. | |
| 13c5dd5 am eb0bbd45: Merge changes Id6a0b0de,I5f03b8b2,I62464b92 into mnc-dr-dev | |
| 4b77f2e am 94252b62: am 09e405d6: Merge "Fix issue #24743380: VoiceInteractionManagerService doesn\'t use current..." into mnc-dr-dev | |
| 94252b6 am 09e405d6: Merge "Fix issue #24743380: VoiceInteractionManagerService doesn\'t use current..." into mnc-dr-dev | |
| 2aa403f Merge "LayoutLib: Fix android:dependency for preferences." into mnc-ub-dev | |
| 2f01cf2 LayoutLib: Fix android:dependency for preferences. | |
| 073a162 am 6b566ec5: Merge "Give Android Wear system apps default permission" into cw-e-dev | |
| 6b566ec Merge "Give Android Wear system apps default permission" into cw-e-dev | |
| d5c27f5 am 8550261a: am 1078942e: Safely handle interrupts during Thread.join() | |
| 70bb3f3 am bc7391d8: resolved conflicts for 93db3d4b to cw-e-dev | |
| 8550261 am 1078942e: Safely handle interrupts during Thread.join() | |
| bc7391d resolved conflicts for 93db3d4b to cw-e-dev | |
| 979b81a Give Android Wear system apps default permission | |
| 4e33c1c am 3a409081: am 29433f70: Merge "Actually apply after no sims change." into mnc-dr-dev | |
| 3a40908 am 29433f70: Merge "Actually apply after no sims change." into mnc-dr-dev | |
| e021064 am a0ef1048: am d473a144: Merge "Hold wake-lock during copy operations." into mnc-dr-dev | |
| a0ef104 am d473a144: Merge "Hold wake-lock during copy operations." into mnc-dr-dev | |
| d621ee1 am edc3585f: am 0a1f0e56: Merge "Add ESC mapping for Pixel C keyboard" into mnc-dr-dev | |
| 0068ea5 am 8810285f: am 06d1254c: Merge "Add layout and keymap for Pixel C Bluetooth keyboard" into mnc-dr-dev | |
| edc3585 am 0a1f0e56: Merge "Add ESC mapping for Pixel C keyboard" into mnc-dr-dev | |
| 8810285 am 06d1254c: Merge "Add layout and keymap for Pixel C Bluetooth keyboard" into mnc-dr-dev | |
| 6c271b8 am f3acc630: am 01356906: Merge "Ensure SurfaceView requests WM relayout when size changes." into mnc-dr-dev | |
| f3acc63 am 01356906: Merge "Ensure SurfaceView requests WM relayout when size changes." into mnc-dr-dev | |
| d07d007 am 02e4400c: am ab781275: Merge "MediaActionSound: Fix video stop sound" into mnc-dr-dev | |
| 02e4400 am ab781275: Merge "MediaActionSound: Fix video stop sound" into mnc-dr-dev | |
| 527da81 am a71bb6b9: am 9d688336: am a636be6c: Camera: fix wrong FULL feature string | |
| a71bb6b am 9d688336: am a636be6c: Camera: fix wrong FULL feature string | |
| 9969f85 LayoutLib: Fix ring rendering. | |
| 8db8bc6 Merge "Skip drawing empty shapes to keep Apple JRE happy." into mnc-ub-dev | |
| 4064e11 Skip drawing empty shapes to keep Apple JRE happy. | |
| 081cebf Implement Path.approximate and add PathMeasure support | |
| c686580 am f5d3f960: am 2a6f1d4a: Merge "ZenModeHelper: fix cross deadlock with AudioService" into mnc-dr-dev | |
| f5d3f96 am 2a6f1d4a: Merge "ZenModeHelper: fix cross deadlock with AudioService" into mnc-dr-dev | |
| ab8616c am 235a6911: am 714a61cd: Merge "Ambient display now comes up immediately when a notification comes in" into mnc-dr-dev | |
| 235a691 am 714a61cd: Merge "Ambient display now comes up immediately when a notification comes in" into mnc-dr-dev | |
| 42efe5b33 am c87996e5: am 8461f2fa: am 46684d2c: Merge "Add anydpi to the providing-resources docs" into mnc-dev | |
| c87996e am 8461f2fa: am 46684d2c: Merge "Add anydpi to the providing-resources docs" into mnc-dev | |
| 7f33f6e am 38b987ab: am 0155856a: Fix AudioService rotation helper thread | |
| 38b987a am 0155856a: Fix AudioService rotation helper thread | |
| 456a451 am a186456f: Safely handle interrupts during Thread.join() | |
| a186456 Safely handle interrupts during Thread.join() | |
| e5d3baf LayoutLib: Fix bitmap scaling. | |
| f107709 am 13a71fbc: Merge "Fix the logging of wake time saved by Ungaze." into cw-e-dev | |
| 13a71fb Merge "Fix the logging of wake time saved by Ungaze." into cw-e-dev | |
| 024872e Fix the logging of wake time saved by Ungaze. | |
| ad111b6 am 3daab8e7: (-s ours) am faebbe82: (-s ours) Import translations. DO NOT MERGE | |
| 3daab8e am faebbe82: (-s ours) Import translations. DO NOT MERGE | |
| 24f0248 am 67775422: Retry if interrupted before mMessageThread has joined | |
| 6777542 Retry if interrupted before mMessageThread has joined | |
| 0e28d91 am 3af80eff: am 79176379: Merge "Send POWER_HINT_INTERACTION on rotate." into mnc-dr-dev | |
| 3af80ef am 79176379: Merge "Send POWER_HINT_INTERACTION on rotate." into mnc-dr-dev | |
| c69f4b9 am 54afa2bd: am 8c66fa94: Merge "Add minimum time for double tap gesture" into mnc-dr-dev | |
| 54afa2b am 8c66fa94: Merge "Add minimum time for double tap gesture" into mnc-dr-dev | |
| 11568be am 5f48baef: am 24806db8: AudioService: alternative way of handling device rotation | |
| 5f48bae am 24806db8: AudioService: alternative way of handling device rotation | |
| 98e0cec am 3c708be3: am 6ffe9f05: am 2813b0fa: Camera2: Update video stabilization API doc. | |
| 3c708be am 6ffe9f05: am 2813b0fa: Camera2: Update video stabilization API doc. | |
| 7a9f771 Merge "Don't break error string (easier grepping)" into mnc-ub-dev | |
| c2fa99e am 792a9cc3: am 30fd0628: Merge "Relax auto-launch checks for GET_CONTENT." into mnc-dr-dev | |
| 3d65dcb am 58843059: am e69ff2a8: Merge "Clean stale entries when deleting files." into mnc-dr-dev | |
| e69c0e4 am a4a75803: (-s ours) am a6bf0ebd: (-s ours) Import translations. DO NOT MERGE | |
| 792a9cc am 30fd0628: Merge "Relax auto-launch checks for GET_CONTENT." into mnc-dr-dev | |
| 5884305 am e69ff2a8: Merge "Clean stale entries when deleting files." into mnc-dr-dev | |
| a4a7580 am a6bf0ebd: (-s ours) Import translations. DO NOT MERGE | |
| 1bd276f Don't break error string (easier grepping) | |
| b9c4ccc Merge "Reduce the amount of allocations on Paint_Delegate" into mnc-ub-dev | |
| 6dac0d4 Reduce the amount of allocations on Paint_Delegate | |
| 4e27221 Merge "Support databinding in listitem layouts." into mnc-ub-dev | |
| e91096c Support databinding in listitem layouts. | |
| 8b7beae am 8197e2de: am ffc6ce00: Merge "Fix asymmetry in parceling/unparceling code for BatteryStats summary" into mnc-dr-dev | |
| 8197e2d am ffc6ce00: Merge "Fix asymmetry in parceling/unparceling code for BatteryStats summary" into mnc-dr-dev | |
| 2711eb4 am 3de2d53a: am c25d5460: Merge "Fix jank: Don\'t write lockout deadline if not needed" into mnc-dr-dev | |
| 3de2d53 am c25d5460: Merge "Fix jank: Don\'t write lockout deadline if not needed" into mnc-dr-dev | |
| 81451c1 am cb4bafb4: am 86e153d5: am f360bbca: Merge "Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev | |
| cb4bafb am 86e153d5: am f360bbca: Merge "Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev | |
| 6fb2da6 Merge "docs: fix a wrong link" into mnc-ub-dev | |
| b812653 am d913782f: am d5f10154: Bump BatteryStats version | |
| d913782 am d5f10154: Bump BatteryStats version | |
| ab46a9a am a9abcc43: (-s ours) am edd35f92: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 4ecf83e am 4ac4ba5d: (-s ours) am 0307a2a6: (-s ours) Import translations. DO NOT MERGE | |
| a9abcc4 am edd35f92: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 4ac4ba5 am 0307a2a6: (-s ours) Import translations. DO NOT MERGE | |
| 861559d am 24e5efda: Merge "Add additional broadcast for when a phone account is unregistered." into cw-e-dev | |
| 24e5efd Merge "Add additional broadcast for when a phone account is unregistered." into cw-e-dev | |
| 6ad696c am f0740e0a: Merge "Add ThermalObserver system service to capture thermal state uevents." into cw-e-dev | |
| f0740e0 Merge "Add ThermalObserver system service to capture thermal state uevents." into cw-e-dev | |
| bc58f59 Add ThermalObserver system service to capture thermal state uevents. | |
| 47a497c am 1a6f9216: am 896b9c62: Merge "Show charging speed when time to full is available" into mnc-dr-dev | |
| 1a6f921 am 896b9c62: Merge "Show charging speed when time to full is available" into mnc-dr-dev | |
| 5eccf89 am faf3f370: Merge "Fix sensor usage model" into cw-e-dev | |
| faf3f37 Merge "Fix sensor usage model" into cw-e-dev | |
| 11b87b9 am 1b69fcbf: am f4e1d10c: Kill ActivityView\'s background thread when it\'s destroyed | |
| 1b69fcb am f4e1d10c: Kill ActivityView\'s background thread when it\'s destroyed | |
| 20feaea Fix sensor usage model | |
| 57551c2 docs: fix a wrong link | |
| 4111026 am b17d1e5e: Merge "Adds an option to override RemoteViews transition." into cw-e-dev | |
| b17d1e5 Merge "Adds an option to override RemoteViews transition." into cw-e-dev | |
| 4c74a02 am 3af6163a: am 31fe464d: Merge "Give the DhcpClient alarm broadcasts foreground priority." into mnc-dr-dev | |
| 1ed322b Adds an option to override RemoteViews transition. | |
| 3af6163 am 31fe464d: Merge "Give the DhcpClient alarm broadcasts foreground priority." into mnc-dr-dev | |
| 5d05db2 am ac342d38: (-s ours) Merge "Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE" into cw-e-dev | |
| ac342d3 Merge "Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE" into cw-e-dev | |
| 818c379 Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE | |
| 1727a8e am 31519f63: am ea9675e7: Merge "Do not issue config change command when not needed" into mnc-dr-dev | |
| 31519f6 am ea9675e7: Merge "Do not issue config change command when not needed" into mnc-dr-dev | |
| 52762ce am f99986ee: am 65bfe1ca: Merge "AudioService: cleanup sco audio mode upon disconnection." into mnc-dr-dev | |
| f99986e am 65bfe1ca: Merge "AudioService: cleanup sco audio mode upon disconnection." into mnc-dr-dev | |
| 8403b9b am 437ee52a: (-s ours) am 2f09d2a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| b4f7abb am 56c2f8ee: (-s ours) am 4ee34138: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| c266a51 am 6a39ee4d: (-s ours) am 9db221c8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| fdfd01b am 683db030: (-s ours) am 9b1c6f77: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 437ee52 am 2f09d2a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 56c2f8e am 4ee34138: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 6a39ee4 am 9db221c8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 683db03 am 9b1c6f77: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| f9f9999 am b7b9b31f: am ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev | |
| b7b9b31 am ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev | |
| a86465d am 8c743655: am cb13da97: Merge "Revert "Dismiss color fade when it is no longer used."" into mnc-dr-dev | |
| 8c74365 am cb13da97: Merge "Revert "Dismiss color fade when it is no longer used."" into mnc-dr-dev | |
| 2ce4fb0 am a4150f49: am f02ba4b8: am 09945c0b: am fe7ceca1: (-s ours) am 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev | |
| a4150f4 am f02ba4b8: am 09945c0b: am fe7ceca1: (-s ours) am 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev | |
| 2d39bfd Merge "Properly expose methods that override a non-hidden method in a hidden superclass in the API files." into mnc-ub-dev | |
| 2d48a93 am 98a8c7c5: am e1de9f67: Fix black Keyguard | |
| 98a8c7c am e1de9f67: Fix black Keyguard | |
| 30b0aa0 Add additional broadcast for when a phone account is unregistered. | |
| 2bc3ff3 am de02fe2a: am 629909e0: Merge "Disable wifi firmware logging by default" into mnc-dr-dev | |
| de02fe2 am 629909e0: Merge "Disable wifi firmware logging by default" into mnc-dr-dev | |
| b278ea0 am 27f26df6: am 05b11bf3: Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev | |
| 27f26df am 05b11bf3: Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev | |
| f4e1d10 Kill ActivityView's background thread when it's destroyed | |
| 51a05d7 Merge "Fix TypedArray.getTextArray()" into mnc-ub-dev | |
| 6649ca3 Fix TypedArray.getTextArray() | |
| 1af3c6f am 1bcb3472: am 6a15d528: Do not go over handler to dispatch keyguard visibility | |
| 1bcb347 am 6a15d528: Do not go over handler to dispatch keyguard visibility | |
| 8faa9e9 am 898e6973: am 739bb7c6: Merge "save "retain loader" state" into mnc-dr-dev | |
| 898e697 am 739bb7c6: Merge "save "retain loader" state" into mnc-dr-dev | |
| a2e47e2 am d737f715: am 4b7b8117: am 9971167f: am 5ebe8e26: am 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev | |
| 8867494 am 6a728e17: am 83ce299c: am 62bb1897: am 554cecea: (-s ours) am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev | |
| 1584eef am eb1e4b14: (-s ours) am 9c5e49b7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| b89ac61 am 981c592d: (-s ours) am 18daf48f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 68aefee am c31d6b70: (-s ours) am d213d288: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 43c9b3e am a58143b4: (-s ours) am a6928d4d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 16bea03 am 0b97b8cf: (-s ours) am 64f17a52: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| d737f71 am 4b7b8117: am 9971167f: am 5ebe8e26: am 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev | |
| 6a728e1 am 83ce299c: am 62bb1897: am 554cecea: (-s ours) am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev | |
| eb1e4b1 am 9c5e49b7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 981c592 am 18daf48f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| c31d6b7 am d213d288: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| a58143b am a6928d4d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 0b97b8c am 64f17a52: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| e2153b9 am 184440ce: am 47cae240: Merge "Extended the maximum pulsing duration when dozing" into mnc-dr-dev | |
| 184440c am 47cae240: Merge "Extended the maximum pulsing duration when dozing" into mnc-dr-dev | |
| 0f3d061 am 0d93002a: am 17a76443: Merge "Dismiss color fade when it is no longer used." into mnc-dr-dev | |
| 0d93002 am 17a76443: Merge "Dismiss color fade when it is no longer used." into mnc-dr-dev | |
| 7b9bcf0 am fd5cb76e: am 79490dba: Merge "Fix reintroduction of b/10845061" into mnc-dr-dev | |
| 1bdfd12 am 6da88610: am 302475e9: Fix verifyUnlock | |
| 249d238 am 7ef6b8d7: am 1b68e8b7: Log time difference between power button presses for gesture | |
| fd5cb76 am 79490dba: Merge "Fix reintroduction of b/10845061" into mnc-dr-dev | |
| 6da8861 am 302475e9: Fix verifyUnlock | |
| 7ef6b8d am 1b68e8b7: Log time difference between power button presses for gesture | |
| d70a773 am 6e7cbb7c: Merge "Add logs for the ungaze gesture." into cw-e-dev | |
| 6e7cbb7 Merge "Add logs for the ungaze gesture." into cw-e-dev | |
| 2d80edc Add logs for the ungaze gesture. | |
| 0d78b16 am 2c08546a: am d2b597d1: Merge "Enforce a timeout for Content Providers to be published." into mnc-dr-dev | |
| 2c08546 am d2b597d1: Merge "Enforce a timeout for Content Providers to be published." into mnc-dr-dev | |
| 6a8d1fd am dbca76cd: am 1b57758a: Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev | |
| 53ed452 am 9ce68b24: am b49245f9: Merge "Frameworks/base: Propagate boot status to installd" into mnc-dr-dev | |
| dbca76c am 1b57758a: Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-dev | |
| 9ce68b2 am b49245f9: Merge "Frameworks/base: Propagate boot status to installd" into mnc-dr-dev | |
| 0e766de Avoid calling scrollBy(0,0) on render | |
| d8b4785 save "retain loader" state DO NOT MERGE | |
| 5695a7f am ef44f99d: am 88f92ec5: am fed28546: am 3e344f3f: (-s ours) am ba80596b: am f8cda089: am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings | |
| 3a273f4 am 4a9ccd15: am c53f18b7: am 937141cb: am 0cae8381: (-s ours) am b5173241: am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings | |
| ef44f99 am 88f92ec5: am fed28546: am 3e344f3f: (-s ours) am ba80596b: am f8cda089: am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings | |
| 4a9ccd1 am c53f18b7: am 937141cb: am 0cae8381: (-s ours) am b5173241: am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings | |
| 9314f94 am b7b17fa6: am 281a868c: am e1a6299b: Relax locking when scanning private volumes. | |
| b7b17fa am 281a868c: am e1a6299b: Relax locking when scanning private volumes. | |
| 448ada6 am 1f66ec8b: Merge "Allows starting window to be shown for swipe-dismiss windows." into cw-e-dev | |
| 1f66ec8 Merge "Allows starting window to be shown for swipe-dismiss windows." into cw-e-dev | |
| 2a06860 am c89f3a48: am 7aa79efe: Grab a wakelock while doing ARP/ND probing | |
| c89f3a4 am 7aa79efe: Grab a wakelock while doing ARP/ND probing | |
| 5c3ea10 am 331c3ec7: (-s ours) am 7bd7a242: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 957457a am 861caaa9: (-s ours) am 462c76f1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 54368ed am 560a1551: (-s ours) am 78ef803f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 2434a36 am af0c15d7: (-s ours) am 4cfcdac0: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| e97d2b1 am 9f46f1be: (-s ours) am 5eed30f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 042567f am 0727c1bd: (-s ours) am 20094d70: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 3eb0ccb am 684a63f1: (-s ours) am 18b2419d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| d542fb0 am 26d1a338: (-s ours) am 14d7a10a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| d88b143 am 2f52c65c: (-s ours) am 39dc2f31: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 57e83d5 am 06f02f3e: (-s ours) am dc6c5277: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 8ac4050 am 40507863: (-s ours) am 5aecb21d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 5786132 am 27afa63a: (-s ours) am 396c4a73: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 3c25fc8 am 075a4c9c: (-s ours) am 6fad59a4: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 331c3ec am 7bd7a242: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 861caaa am 462c76f1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 560a155 am 78ef803f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| af0c15d am 4cfcdac0: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 9f46f1b am 5eed30f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 0727c1b am 20094d70: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 684a63f am 18b2419d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 26d1a33 am 14d7a10a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 2f52c65 am 39dc2f31: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 06f02f3 am dc6c5277: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 4050786 am 5aecb21d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 27afa63 am 396c4a73: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 075a4c9 am 6fad59a4: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| c488631 am cbf24e12: (-s ours) am 2deb87d4: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| d159a20 am a64c3e57: (-s ours) am ce992f1b: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| cbf24e1 am 2deb87d4: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| a64c3e5 am ce992f1b: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 08b0042 am 1f463957: am 91f2123b: Merge "Add support for setting color transforms" into mnc-dr-dev | |
| 0c4050b am bdfbd821: am 0eb10ede: Merge "Always set the usb config when modifying it." into mnc-dr-dev | |
| 1f46395 am 91f2123b: Merge "Add support for setting color transforms" into mnc-dr-dev | |
| bdfbd82 am 0eb10ede: Merge "Always set the usb config when modifying it." into mnc-dr-dev | |
| 1762a44 am 7e765dd7: am 22fe39b4: Merge "set config_use_sim_language_file false for SE Telia/Sweden 3G" into mnc-dr-dev | |
| 3bdbda7 am dd0238ec: am e54253bd: Merge "Fix crash when no power_profile is specified" into mnc-dr-dev | |
| 7e765dd am 22fe39b4: Merge "set config_use_sim_language_file false for SE Telia/Sweden 3G" into mnc-dr-dev | |
| dd0238e am e54253bd: Merge "Fix crash when no power_profile is specified" into mnc-dr-dev | |
| 039fd00 am 13c23df9: Merge "Manual \'cherry pick\' to fix CTS tests for MediaControllerTest." into cw-e-dev | |
| 13c23df Merge "Manual 'cherry pick' to fix CTS tests for MediaControllerTest." into cw-e-dev | |
| 2eb7d47 Manual 'cherry pick' to fix CTS tests for MediaControllerTest. | |
| 069594f am 4e86aae6: am 68055395: Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev | |
| 4e86aae am 68055395: Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev | |
| e82f3c9 Allows starting window to be shown for swipe-dismiss windows. | |
| 96c95ba am 5f22c0b2: am 1b67a6b8: Merge "Badge ChooserActivity choices with their app icon for disambig" into mnc-dr-dev | |
| 5f22c0b am 1b67a6b8: Merge "Badge ChooserActivity choices with their app icon for disambig" into mnc-dr-dev | |
| 8de564a Properly expose methods that override a non-hidden method in a hidden superclass in the API files. | |
| 773afa2 am 04feedd4: am 896f738c: Merge "Allow non-persistent manual network selection." into mnc-dr-dev | |
| 04feedd am 896f738c: Merge "Allow non-persistent manual network selection." into mnc-dr-dev | |
| 3a56566 am 5c2bfa8f: am 58e378b0: Merge "Start fingerprint authentication in onStartedGoingToSleep" into mnc-dr-dev | |
| 3ac7e49 am dc09ffad: am 5c0c5ac8: Handle case correctly when screen times out and locking immediately | |
| 5c2bfa8 am 58e378b0: Merge "Start fingerprint authentication in onStartedGoingToSleep" into mnc-dr-dev | |
| dc09ffa am 5c0c5ac8: Handle case correctly when screen times out and locking immediately | |
| cd8fc98 am 3c9ffc2d: am 2ebcf2c2: am ad0acf1d: am 9836b64f: am f68b1953: am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev | |
| 3c9ffc2 am 2ebcf2c2: am ad0acf1d: am 9836b64f: am f68b1953: am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev | |
| d533412 am 2f8ac2a3: Fix build due to merge of duplicate variable. | |
| 2f8ac2a Fix build due to merge of duplicate variable. | |
| 4816ea0 am a02f9823: am 952d5b33: Merge "Send power hint on fling gestures." into mnc-dr-dev | |
| a02f982 am 952d5b33: Merge "Send power hint on fling gestures." into mnc-dr-dev | |
| 7de9e3e am 09999fb9: am 18f18ae0: Allow camera launch also when device is interactive | |
| 09999fb am 18f18ae0: Allow camera launch also when device is interactive | |
| c95668c am 88daa997: am c38ffecc: Merge "Moving BTtraffic from experiment location to here" into cw-d-mr1-dev | |
| 88daa99 am c38ffecc: Merge "Moving BTtraffic from experiment location to here" into cw-d-mr1-dev | |
| c38ffec Merge "Moving BTtraffic from experiment location to here" into cw-d-mr1-dev | |
| 2de4b74 Moving BTtraffic from experiment location to here | |
| 1ac3792 am 4873c549: am 39e94ebe: Handle single-choice ChooserActivities and bound ChooserTargetServices | |
| 71b4b73 am d20f2106: am bfc584df: Merge "Use app directory as apkPath for cluster installs" into mnc-dr-dev | |
| 0860719 am 717e39df: am 870a9e6a: Merge "Added a carrier config key for emergency messages on/off option always showing." into mnc-dr-dev | |
| 4873c54 am 39e94ebe: Handle single-choice ChooserActivities and bound ChooserTargetServices | |
| d20f210 am bfc584df: Merge "Use app directory as apkPath for cluster installs" into mnc-dr-dev | |
| 717e39d am 870a9e6a: Merge "Added a carrier config key for emergency messages on/off option always showing." into mnc-dr-dev | |
| e46bf3f am ee16be69: am 3290f5dd: Merge "Do not back up/restore the "pulse LED for notifications" setting" into mnc-dr-dev | |
| ee16be6 am 3290f5dd: Merge "Do not back up/restore the "pulse LED for notifications" setting" into mnc-dr-dev | |
| 8d9ba68 am 5b78fda9: am 38e6e4ef: Merge "reset lockout deadline on device reboot" into mnc-dr-dev | |
| 5b78fda am 38e6e4ef: Merge "reset lockout deadline on device reboot" into mnc-dr-dev | |
| ea19688 am e1ab0999: am 2b564bf4: am 716c6269: am 63348ae4: (-s ours) am 11317e82: am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev | |
| d00737f am eee9c2de: am 0098cbc0: am 971ff47c: am 1b06455e: (-s ours) am 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev | |
| e1ab099 am 2b564bf4: am 716c6269: am 63348ae4: (-s ours) am 11317e82: am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev | |
| eee9c2d am 0098cbc0: am 971ff47c: am 1b06455e: (-s ours) am 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev | |
| 5bc891c am 774adb03: am 7198c0aa: Merge "Framework fixes for RSSI offload." into mnc-dr-dev | |
| 774adb0 am 7198c0aa: Merge "Framework fixes for RSSI offload." into mnc-dr-dev | |
| f84e053 am 0dd1163a: am dca3b2f7: Merge "Add logging to track fingerprint reco but not unlocking" into mnc-dr-dev | |
| 8bc9238 am 9e4a4606: am fe74fb95: extend svc command to control NFC state | |
| 4f5b020 am 51491627: am 276da47a: am cd946024: Default grant SMS and Phone to the verifier | |
| 8d5f358 am 41e13b0a: Update circular mask after display is ready. | |
| 0dd1163 am dca3b2f7: Merge "Add logging to track fingerprint reco but not unlocking" into mnc-dr-dev | |
| 9e4a460 am fe74fb95: extend svc command to control NFC state | |
| 5149162 am 276da47a: am cd946024: Default grant SMS and Phone to the verifier | |
| 41e13b0 Update circular mask after display is ready. | |
| 3bb69fa am 1d121b78: am e1e97377: Merge "NetworkDiagnostics: ping default router from all global addreses." into mnc-dr-dev | |
| 1d121b7 am e1e97377: Merge "NetworkDiagnostics: ping default router from all global addreses." into mnc-dr-dev | |
| aae9c4a am 74c3a0e7: Merge "Add some constants for Wear MNC Perms" into cw-e-dev | |
| 74c3a0e Merge "Add some constants for Wear MNC Perms" into cw-e-dev | |
| c350430 am 92a420eb: am efc03355: (-s ours) DO NOT MERGE MediaPlayer: Disable acquiring wakelocks based on property. | |
| 31f01e2 am 4cc1553c: am 0b388d4a: (-s ours) Don\'t animate burn-in return when it wasn\'t applied. | |
| 92a420e am efc03355: (-s ours) DO NOT MERGE MediaPlayer: Disable acquiring wakelocks based on property. | |
| 4cc1553 am 0b388d4a: (-s ours) Don\'t animate burn-in return when it wasn\'t applied. | |
| 61665cc Add some constants for Wear MNC Perms | |
| 9902b3b am 699a5376: am 6b04e3a6: Merge "Fix light status bar transitions" into mnc-dr-dev | |
| 699a537 am 6b04e3a6: Merge "Fix light status bar transitions" into mnc-dr-dev | |
| 693e11e am 6a261fd6: Merge "Cherry-pick system theme rebase to fix square UI on round watches" into cw-e-dev | |
| 6a261fd Merge "Cherry-pick system theme rebase to fix square UI on round watches" into cw-e-dev | |
| f40365f am ae0b7ca9: am c9180528: Merge "Add capability to ignore carrier entitlement checks" into mnc-dr-dev | |
| ae0b7ca am c9180528: Merge "Add capability to ignore carrier entitlement checks" into mnc-dr-dev | |
| 3d2337e Cherry-pick system theme rebase to fix square UI on round watches | |
| 12e273f am f66e4979: am 84dc08a2: Dump Keyguard state in SystemUI and PhoneWindowManager | |
| f66e497 am 84dc08a2: Dump Keyguard state in SystemUI and PhoneWindowManager | |
| 7914680 am 58c483fc: am 62b94c35: Merge "Avoid OOBE when AbsListView layout is out of sync with adapter" into mnc-dr-dev | |
| 58c483f am 62b94c35: Merge "Avoid OOBE when AbsListView layout is out of sync with adapter" into mnc-dr-dev | |
| 9b5f75f am ca7240a0: am 8ed28188: Merge "Add carrier config for characters to escape with backslash." into mnc-dr-dev | |
| ca7240a am 8ed28188: Merge "Add carrier config for characters to escape with backslash." into mnc-dr-dev | |
| 471d548 am e3d006b1: am 0a067dc7: Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev | |
| e3d006b am 0a067dc7: Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev | |
| d541159 am a58bff50: am 3cf7eef1: Listen for fingerprint when on bouncer | |
| b52a4a5 am 7b7a2100: am 6e90ea03: Don\'t wait for brightness changes | |
| a58bff5 am 3cf7eef1: Listen for fingerprint when on bouncer | |
| 7b7a210 am 6e90ea03: Don\'t wait for brightness changes | |
| 572a78c am 9d4cad8b: am b1cebd9e: am 5579e41c: Add op package to the UID special case handling in account manager. | |
| 9d4cad8 am b1cebd9e: am 5579e41c: Add op package to the UID special case handling in account manager. | |
| 888699b am c291ce21: am 55c3a196: Merge "Add to configure for MDC_INITIAL_MAX_RETRY" into mnc-dr-dev | |
| c291ce2 am 55c3a196: Merge "Add to configure for MDC_INITIAL_MAX_RETRY" into mnc-dr-dev | |
| 4bf3dfe am ffa2d691: Merge "Adds config flag for USB notification." into cw-e-dev | |
| ffa2d69 Merge "Adds config flag for USB notification." into cw-e-dev | |
| 4809354 am 5c732ee5: am e1d2d422: Merge "Fix missing copyright headers." into mnc-dr-dev | |
| 5c732ee am e1d2d422: Merge "Fix missing copyright headers." into mnc-dr-dev | |
| 27cb567 am 3d1115db: Merge "Fixes cloned notification actions missing icon." into cw-e-dev | |
| 3d1115d Merge "Fixes cloned notification actions missing icon." into cw-e-dev | |
| e753361 Adds config flag for USB notification. | |
| f5bff46f Fixes cloned notification actions missing icon. | |
| f327fd3 am 5a45dc96: am 0018323c: Merge "Add carrier config variable to hide preferred network type" into mnc-dr-dev | |
| c6fa591 am 847bdf00: am 5b40e225: Merge "Make the vertical navbar 48dp like the horizontal one." into mnc-dr-dev | |
| 5a45dc9 am 0018323c: Merge "Add carrier config variable to hide preferred network type" into mnc-dr-dev | |
| 847bdf0 am 5b40e225: Merge "Make the vertical navbar 48dp like the horizontal one." into mnc-dr-dev | |
| 17076cc am 5a9bb951: resolved conflicts for 5d0e02b6 to cw-e-dev | |
| 5a9bb95 resolved conflicts for 5d0e02b6 to cw-e-dev | |
| a8831ba am 5b9f8dd7: am 2ebbf4c8: Merge "Special interval value to always run benchmarks." into mnc-dr-dev | |
| 5b9f8dd am 2ebbf4c8: Merge "Special interval value to always run benchmarks." into mnc-dr-dev | |
| f27035d am 131d541a: am 16093fe3: Revert "Disable fingerprint after force lock" | |
| 131d541 am 16093fe3: Revert "Disable fingerprint after force lock" | |
| d428dc4 am 12fdaf85: am a4fca2c7: Merge "Fixed a racecondition where the camera would not launch" into mnc-dr-dev | |
| 12fdaf8 am a4fca2c7: Merge "Fixed a racecondition where the camera would not launch" into mnc-dr-dev | |
| 46154b8 am b5304547: am 5e354223: Use AlarmManager for lockout reset | |
| b530454 am 5e354223: Use AlarmManager for lockout reset | |
| 63d94e4 am 95198ee9: am ebd14658: Merge "Add carrier config variable to hide ims apn" into mnc-dr-dev | |
| 95198ee am ebd14658: Merge "Add carrier config variable to hide ims apn" into mnc-dr-dev | |
| 67e4317 am 6544d5a2: am dee1c5c9: Merge "Add carrier config for specifying invalid characters." into mnc-dr-dev | |
| 6544d5a am dee1c5c9: Merge "Add carrier config for specifying invalid characters." into mnc-dr-dev | |
| 4f1bd15 am db4efcfa: am f57d9856: am 4f7d0bc7: Merge "Add get_accounts app op" into mnc-dev | |
| db4efcf am f57d9856: am 4f7d0bc7: Merge "Add get_accounts app op" into mnc-dev | |
| aded82c am 6d8bdb50: am 5536d447: Merge "Changed the vibration duration from 1s to 750ms." into mnc-dr-dev | |
| 6d8bdb5 am 5536d447: Merge "Changed the vibration duration from 1s to 750ms." into mnc-dr-dev | |
| 22262f3 am 0bc35668: am 017223ac: Merge changes from topic \'packet-keepalive-fixes\' into mnc-dr-dev | |
| 0bc3566 am 017223ac: Merge changes from topic \'packet-keepalive-fixes\' into mnc-dr-dev | |
| 2a198de am 975ceef6: am 52429b4a: Cancel animation when hiding Keyguard | |
| 975ceef am 52429b4a: Cancel animation when hiding Keyguard | |
| 89d8047 am ad69e53e: am edf47486: Removed the secure camera launcher | |
| ad69e53 am edf47486: Removed the secure camera launcher | |
| efc0335 DO NOT MERGE MediaPlayer: Disable acquiring wakelocks based on property. | |
| 07b3195 am c698ece7: am 3bed3bf4: am 92aeac34: am 1c88f605: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev | |
| 27a85cc am fb53f115: am d35c7940: am 2c31a0d7: am 9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove empty bullet | |
| c698ece am 3bed3bf4: am 92aeac34: am 1c88f605: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev | |
| fb53f11 am d35c7940: am 2c31a0d7: am 9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove empty bullet | |
| fb4e032 am 2248874b: am ee1babec: Merge "Introduce config_wifi_revert_country_code_on_cellular_loss" into mnc-dr-dev | |
| 2248874 am ee1babec: Merge "Introduce config_wifi_revert_country_code_on_cellular_loss" into mnc-dr-dev | |
| dee9011 am 10352f7a: am 5e8e1c63: Do not expand notifications with expand gesture when disallowed | |
| 10352f7 am 5e8e1c63: Do not expand notifications with expand gesture when disallowed | |
| 740cf71 am 56ecfcce: Handle KEYCODE_SOFT_SLEEP from Ungaze. | |
| 56ecfcc Handle KEYCODE_SOFT_SLEEP from Ungaze. | |
| 36afc2b am 9b8f82a3: Merge "Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."" into cw-e-dev | |
| 9b8f82a Merge "Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."" into cw-e-dev | |
| b331bf9 Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze." | |
| 953c6a4 am 024fb4d4: (-s ours) am 9f3e169c: (-s ours) Import translations. DO NOT MERGE | |
| 024fb4d am 9f3e169c: (-s ours) Import translations. DO NOT MERGE | |
| 179594b am dd9c75f3: am 24a6be46: am 36866dc7: am 4afcda74: am 79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs | |
| d9c1c83 am 18b68b26: am 8f2a5b25: am 1edd4ebc: am a8b9a2b7: am 81e0dff0: Minor fix on Auto Desktop Head Unit doc. | |
| dd9c75f am 24a6be46: am 36866dc7: am 4afcda74: am 79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs | |
| 18b68b2 am 8f2a5b25: am 1edd4ebc: am a8b9a2b7: am 81e0dff0: Minor fix on Auto Desktop Head Unit doc. | |
| 597c55b am e686d9b3: am 8e285f2f: Merge "Cut down some logs." into mnc-dr-dev | |
| e686d9b am 8e285f2f: Merge "Cut down some logs." into mnc-dr-dev | |
| 551de25 am ebff4c1d: Merge "Do not wtf when the systemui is not present." into cw-e-dev | |
| ebff4c1 Merge "Do not wtf when the systemui is not present." into cw-e-dev | |
| acddf2b Do not wtf when the systemui is not present. | |
| 43c4459 am 6f0ba402: Merge "Handle KEYCODE_SOFT_SLEEP from Ungaze." into cw-e-dev | |
| 6f0ba40 Merge "Handle KEYCODE_SOFT_SLEEP from Ungaze." into cw-e-dev | |
| 677adf1 Handle KEYCODE_SOFT_SLEEP from Ungaze. | |
| 578151c am fb611846: am 566886f7: Merge "IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL" into mnc-dr-dev | |
| 1dcccdf am 46b7e9e9: am 4c97f3a4: Do not show roaming icon for some operators of Chile | |
| fb61184 am 566886f7: Merge "IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL" into mnc-dr-dev | |
| 46b7e9e am 4c97f3a4: Do not show roaming icon for some operators of Chile | |
| f1ed1fd am 1b03cd8e: am 1d5e2e29: Merge "Bluetooth: Fix profile auto-connect logic" into mnc-dr-dev | |
| 1b03cd8 am 1d5e2e29: Merge "Bluetooth: Fix profile auto-connect logic" into mnc-dr-dev | |
| 4a90942 am f615872c: am 0b887e57: Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev | |
| f615872 am 0b887e57: Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev | |
| ff751be am 2f142ab0: am 8a670f1d: Merge changes from topic \'TDSCDMA support\' into mnc-dr-dev | |
| 2f142ab am 8a670f1d: Merge changes from topic \'TDSCDMA support\' into mnc-dr-dev | |
| 80770c0 am 16db4101: Merge "DO NOT MERGE Add \'bluetooth\' user to the \'system\' group." into cw-e-dev | |
| 16db410 Merge "DO NOT MERGE Add 'bluetooth' user to the 'system' group." into cw-e-dev | |
| 6bd2f87 am bd2ad550: am 34411e8f: Merge "Don\'t disable fingerprint when entering wrong credential" into mnc-dr-dev | |
| 95179ad am 54ceea19: am 95200e6f: Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev | |
| bd2ad55 am 34411e8f: Merge "Don\'t disable fingerprint when entering wrong credential" into mnc-dr-dev | |
| 54ceea1 am 95200e6f: Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev | |
| 4eb8134 am b90f1de2: am 1b5cc3a4: Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev | |
| b90f1de am 1b5cc3a4: Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev | |
| 1635e81 am cb92577a: am 7d223aee: am 0a76afb9: Merge "Don\'t crash on (invalid) hardware address lengths > 127." into mnc-dev | |
| 8fddbc4 am a5cd5d87: am 0b5162c8: am 6dd856b1: Merge "Don\'t drop runtime permissions on older system app update." into mnc-dev | |
| 6802599 am 1942f8a7: am d4ef34ce: am 512141d5: Merge "Respect DONT_KILL_APP flag when bringing down a disabled service." into mnc-dev | |
| cb92577 am 7d223aee: am 0a76afb9: Merge "Don\'t crash on (invalid) hardware address lengths > 127." into mnc-dev | |
| a5cd5d8 am 0b5162c8: am 6dd856b1: Merge "Don\'t drop runtime permissions on older system app update." into mnc-dev | |
| 1942f8a am d4ef34ce: am 512141d5: Merge "Respect DONT_KILL_APP flag when bringing down a disabled service." into mnc-dev | |
| 87e4c95 am 59c1a0e1: am 8ae90587: Merge "Add TabletModeChangedListener for SystemUI." into mnc-dr-dev | |
| 59c1a0e am 8ae90587: Merge "Add TabletModeChangedListener for SystemUI." into mnc-dr-dev | |
| ac1da48 am f873f9ab: am bd5b61c4: Merge "Fingerprint should throttle after 5 attempts" into mnc-dr-dev | |
| f873f9a am bd5b61c4: Merge "Fingerprint should throttle after 5 attempts" into mnc-dr-dev | |
| 7f15432 am 1afe952c: am 90738c2a: Merge "Use private action for SUPL related connectivity changes." into mnc-dr-dev | |
| 1afe952 am 90738c2a: Merge "Use private action for SUPL related connectivity changes." into mnc-dr-dev | |
| 280b449 am 967c8816: am cfd45ae4: Merge "Add SUPL-specific network bcast" into mnc-dr-dev | |
| a91d435 am 623def69: am 7bae31f8: am 60aae166: Apply default link-handling policy at OTA from pre-M | |
| 967c881 am cfd45ae4: Merge "Add SUPL-specific network bcast" into mnc-dr-dev | |
| 623def6 am 7bae31f8: am 60aae166: Apply default link-handling policy at OTA from pre-M | |
| b991034 am ac2b543b: am 304e3772: Merge "Fix wrong mode for fingerprint unlock when bouncer not showing" into mnc-dr-dev | |
| ac2b543 am 304e3772: Merge "Fix wrong mode for fingerprint unlock when bouncer not showing" into mnc-dr-dev | |
| bef95e9 am 93e66738: (-s ours) Enable debugging for device idle in wear branch DO NOT MERGE ANYWHERE | |
| 97db5d7 am 23d681bb: Device Idle: Android wear support | |
| 93e6673 Enable debugging for device idle in wear branch DO NOT MERGE ANYWHERE | |
| 23d681b Device Idle: Android wear support | |
| 573cdc4 am 38ae1196: am 7cd6aaaf: am ee72f99d: Merge "Allow shell to disable keyguard when not secure" into mnc-dev | |
| 38ae119 am 7cd6aaaf: am ee72f99d: Merge "Allow shell to disable keyguard when not secure" into mnc-dev | |
| 9b12688 am 01232c50: am 582b186c: am f7b220ab: Merge "Fix Custom action mode menu item onclick is not working" into mnc-dev | |
| 01232c5 am 582b186c: am f7b220ab: Merge "Fix Custom action mode menu item onclick is not working" into mnc-dev | |
| 9051eab am 9edfb36a: am dd124802: Merge "set config_use_sim_language_file false for KR LGU+/KT" into mnc-dr-dev | |
| bade952 am 258a7cd9: Merge "Use LOCAL_MAC_ADDRESS permission in bluetoothtests." into cw-e-dev | |
| 9edfb36 am dd124802: Merge "set config_use_sim_language_file false for KR LGU+/KT" into mnc-dr-dev | |
| 258a7cd Merge "Use LOCAL_MAC_ADDRESS permission in bluetoothtests." into cw-e-dev | |
| c4809bc am 8750f04a: am a14e9001: Merge "Reformat only KR numbers with leading "+82"." into mnc-dr-dev | |
| 8750f04 am a14e9001: Merge "Reformat only KR numbers with leading "+82"." into mnc-dr-dev | |
| 4997cd3 am 9e30e202: am 2af5010a: am 36a75d6a: Merge "Fixed a crash in the notification group manager" into mnc-dev | |
| ee1eed7 am 7209945f: am 0e150a8b: am 0c5fd7e3: am eb541727: am dd21212f: am eb26f5ce: LayoutLib: Fix typedArray caching. | |
| 9e30e20 am 2af5010a: am 36a75d6a: Merge "Fixed a crash in the notification group manager" into mnc-dev | |
| 7209945 am 0e150a8b: am 0c5fd7e3: am eb541727: am dd21212f: am eb26f5ce: LayoutLib: Fix typedArray caching. | |
| 12fa3d1 Use LOCAL_MAC_ADDRESS permission in bluetoothtests. | |
| a32bef0 am 4f7d5dcd: am be342fc3: Merge "Only allow foreground app and keyguard to access FingerprintManager" into mnc-dr-dev | |
| 4f7d5dc am be342fc3: Merge "Only allow foreground app and keyguard to access FingerprintManager" into mnc-dr-dev | |
| 521ded6 am dbf8c0d9: am 991e4936: am cbacd4f0: Merge "Don\'t perform layout while adjusting displays/stacks state." into mnc-dev | |
| cb41a60 am 7f2b4b6a: am 7e28b3bc: am f50d4ce6: Merge "DO NOT MERGE: Fix DngCreator default crop calculations." into mnc-dev | |
| 260ae8e am 3e64c75f: am 146dc265: am 9a2d5742: Merge "Fixed when the notification effects are being cleared" into mnc-dev | |
| dbf8c0d am 991e4936: am cbacd4f0: Merge "Don\'t perform layout while adjusting displays/stacks state." into mnc-dev | |
| 7f2b4b6 am 7e28b3bc: am f50d4ce6: Merge "DO NOT MERGE: Fix DngCreator default crop calculations." into mnc-dev | |
| 3e64c75 am 146dc265: am 9a2d5742: Merge "Fixed when the notification effects are being cleared" into mnc-dev | |
| 444f8d2 am d050cc87: am e45761ff: Merge "Fix broken enter key after failed PIN attempts." into mnc-dr-dev | |
| 971f899 am 53c14ce4: am 860aa1e1: Merge "Do not show roaming icon for NL KPN network with Telfort SIM" into mnc-dr-dev | |
| d050cc8 am e45761ff: Merge "Fix broken enter key after failed PIN attempts." into mnc-dr-dev | |
| 53c14ce am 860aa1e1: Merge "Do not show roaming icon for NL KPN network with Telfort SIM" into mnc-dr-dev | |
| 42e3c36 am dc436aaa: am 69228600: am fb9ec507: Incorrect app op check in broadcast queue | |
| dc436aa am 69228600: am fb9ec507: Incorrect app op check in broadcast queue | |
| e2565ae am e20eff91: am 3491da4e: Merge "Enable migration to big cores for app launches." into mnc-dr-dev | |
| e20eff9 am 3491da4e: Merge "Enable migration to big cores for app launches." into mnc-dr-dev | |
| babe815 DO NOT MERGE Add 'bluetooth' user to the 'system' group. | |
| 0a24799 am aa06c808: am 363c694a: Merge "Don\'t launch the camera if it already in foreground." into mnc-dr-dev | |
| d302508 am 4a306fd7: am 3a464785: Add a private API to get notified about lockout resets | |
| aa06c80 am 363c694a: Merge "Don\'t launch the camera if it already in foreground." into mnc-dr-dev | |
| 4a306fd am 3a464785: Add a private API to get notified about lockout resets | |
| d6597cb am 1bc7d0c8: am 70c958c4: Merge "Save/restore errno in SIGCHLD handler." into mnc-dr-dev | |
| 1bc7d0c am 70c958c4: Merge "Save/restore errno in SIGCHLD handler." into mnc-dr-dev | |
| f7bf24a am 9fe274d6: am 9e25e164: am e7078e18: Merge "Ensure host is set before onInflate()" into mnc-dev | |
| 9030dab am 2d7df3ef: am d66d4d1b: am 627975fc: am 74890df7: (-s ours) am 3cb7e91f: am 199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev | |
| f86894c am a42870fc: am 188a33c7: am 7b7a3e75: am 0bafa33f: (-s ours) am 35c1eb9e: am 82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s. | |
| 9fe274d am 9e25e164: am e7078e18: Merge "Ensure host is set before onInflate()" into mnc-dev | |
| 2d7df3e am d66d4d1b: am 627975fc: am 74890df7: (-s ours) am 3cb7e91f: am 199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev | |
| a42870f am 188a33c7: am 7b7a3e75: am 0bafa33f: (-s ours) am 35c1eb9e: am 82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s. | |
| 603cfdc am 6a9baca0: am 7878eee8: Merge "Rename carrier config constant." into mnc-dr-dev | |
| 6a9baca am 7878eee8: Merge "Rename carrier config constant." into mnc-dr-dev | |
| 406b60a am b8645fa7: am a7cad8e8: Merge "Fixed a bug where the secure camera would flash when rotated" into mnc-dr-dev | |
| b8645fa am a7cad8e8: Merge "Fixed a bug where the secure camera would flash when rotated" into mnc-dr-dev | |
| 9cb060d am 7e1775d2: am 78195312: Merge "Disable fingerprint after force lock" into mnc-dr-dev | |
| aaebdd7 am 02be9316: am 06fb3b2d: am 0e2e8589: Merge "Don\'t throttle "while idle" alarms while not dozing" into mnc-dev | |
| 7e1775d am 78195312: Merge "Disable fingerprint after force lock" into mnc-dr-dev | |
| 02be931 am 06fb3b2d: am 0e2e8589: Merge "Don\'t throttle "while idle" alarms while not dozing" into mnc-dev | |
| b63db9f am 3bd58233: am d833cb54: Merge "Add carrier config for allowing non-emerg calls in ECM mode." into mnc-dr-dev | |
| 3bd5823 am d833cb54: Merge "Add carrier config for allowing non-emerg calls in ECM mode." into mnc-dr-dev | |
| d0ce1fb am 69e17f59: am da43a3aa: Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev | |
| 69e17f5 am da43a3aa: Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev | |
| d1c6dca am bbd723ce: am 144c4ff0: am 4cb113ed: Merge "Fix a NPE when shutting down instrumentation" into mnc-dev | |
| bbd723c am 144c4ff0: am 4cb113ed: Merge "Fix a NPE when shutting down instrumentation" into mnc-dev | |
| 3ef6880 am ad9a0efc: Merge "Add capability for a connection hand rejection text response." into cw-e-dev | |
| ad9a0ef Merge "Add capability for a connection hand rejection text response." into cw-e-dev | |
| 59f3c34 am 6611cff4: am d9efca99: Merge "Support uneditable enhanced 4g lte mode config" into mnc-dr-dev | |
| 999576d am 8038391a: (-s ours) am 469fa946: (-s ours) Import translations. DO NOT MERGE | |
| 6611cff am d9efca99: Merge "Support uneditable enhanced 4g lte mode config" into mnc-dr-dev | |
| 8038391 am 469fa946: (-s ours) Import translations. DO NOT MERGE | |
| 098cb24 am 3396a11e: am 3656975e: Merge "Run callbacks from fingerprintd through handler." into mnc-dr-dev | |
| 3396a11 am 3656975e: Merge "Run callbacks from fingerprintd through handler." into mnc-dr-dev | |
| 2e80aa7 am 6f75cb14: am 8d027e6d: am 3c227bf2: Merge "Show the ResolverActivity in dock mode" into mnc-dev | |
| 6f75cb1 am 8d027e6d: am 3c227bf2: Merge "Show the ResolverActivity in dock mode" into mnc-dev | |
| b8ae187 Merge "Fix android:theme parsing for custom views." into mnc-ub-dev | |
| 8190168 Add capability for a connection hand rejection text response. | |
| 38ba43a am 60337b6b: am e774bdd6: Merge "Added animation for trusted to fingerprint error" into mnc-dr-dev | |
| 60337b6 am e774bdd6: Merge "Added animation for trusted to fingerprint error" into mnc-dr-dev | |
| e6b0282 am a2681383: am acace94c: Fix race condition by guarding callbacks | |
| 67322b1 Add rotary encoder input source | |
| a268138 am acace94c: Fix race condition by guarding callbacks | |
| e65066d am 7a193899: am 96990d0c: Merge "Fix DngCreator default crop calculations." into mnc-dr-dev | |
| fbb28f5 am 77d02900: am 5799f428: am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev | |
| 7535177 Fix android:theme parsing for custom views. | |
| 7a19389 am 96990d0c: Merge "Fix DngCreator default crop calculations." into mnc-dr-dev | |
| 77d0290 am 5799f428: am e3bcde94: Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev | |
| 7b93389 am e3238e53: am b774e554: Optimize fp touch to wake: Shortcut for report next draw | |
| e3238e53 am b774e554: Optimize fp touch to wake: Shortcut for report next draw | |
| b5bcd60 am 27c5cfd7: am 9b2f9bcb: am 82d14d60: Merge "Crashing the system process is inadvisable" into mnc-dev | |
| 52e6d45 am 430778bd: am 482635e3: Merge "Fix deadlock when updating rotation" into mnc-dr-dev | |
| 27c5cfd am 9b2f9bcb: am 82d14d60: Merge "Crashing the system process is inadvisable" into mnc-dev | |
| 430778b am 482635e3: Merge "Fix deadlock when updating rotation" into mnc-dr-dev | |
| ac4fd07 am 90023609: am 71f15791: am d88152b4: Merge "Give shell permission to move apps." into mnc-dev | |
| 9002360 am 71f15791: am d88152b4: Merge "Give shell permission to move apps." into mnc-dev | |
| 1367b50 am 65d43856: am 8b403e8c: am 3ab2e664: Merge "Docs: Localized DAC landing pages for M Preview, updated for Dev Prev 3." into mnc-dev | |
| d4f02f0 am eeaf35cd: am 144020c9: am 02e5b0f2: Docs: Fixes a mistaken TOC item at top-right so it now matches the item it links to. | |
| 65d4385 am 8b403e8c: am 3ab2e664: Merge "Docs: Localized DAC landing pages for M Preview, updated for Dev Prev 3." into mnc-dev | |
| eeaf35c am 144020c9: am 02e5b0f2: Docs: Fixes a mistaken TOC item at top-right so it now matches the item it links to. | |
| a3d10f0 am c02034a1: am 34c08828: Merge "Fix NPE in AR hardware binding sequence. b/22772433" into mnc-dr-dev | |
| c02034a am 34c08828: Merge "Fix NPE in AR hardware binding sequence. b/22772433" into mnc-dr-dev | |
| fec26a3 am 7c388b0f: am ffa3d040: am 3883e72a: Merge "BatteryStats: Bump checkin version" into mnc-dev | |
| 7c388b0 am ffa3d040: am 3883e72a: Merge "BatteryStats: Bump checkin version" into mnc-dev | |
| 30aa53c am 92fb5342: am c07701f2: am 3e5b0118: Merge "Add StateMachine.removeDeferredMessages()" into mnc-dev | |
| 92fb534 am c07701f2: am 3e5b0118: Merge "Add StateMachine.removeDeferredMessages()" into mnc-dev | |
| 155c1ad am 38f6f487: am aef51d09: am 4a8034ca: AudioTrack: error reporting for getTimestamp() | |
| 38f6f48 am aef51d09: am 4a8034ca: AudioTrack: error reporting for getTimestamp() | |
| c63a12b7 am 6fe373b1: am 16d7245b: Merge "Prevent Fingerprint when SIM is locked" into mnc-dr-dev | |
| 6fe373b am 16d7245b: Merge "Prevent Fingerprint when SIM is locked" into mnc-dr-dev | |
| 49ea829 am 60220b77: am fd538001: Merge "Added event log for camera launch gesture." into mnc-dr-dev | |
| 1aee37e am d255b44c: am dfb8cca0: Merge "Don\'t check the keyguard PIN a second time" into mnc-dr-dev | |
| 60220b7 am fd538001: Merge "Added event log for camera launch gesture." into mnc-dr-dev | |
| d255b44 am dfb8cca0: Merge "Don\'t check the keyguard PIN a second time" into mnc-dr-dev | |
| 3fa7669 am f71e3b2b: am 9dbc35d1: am 258b56ec: am 9f37bd8a: am 0238bf24: docs: New auto Desktop Head Unit (DHU) docs | |
| 98922dd am 56d0bb7f: am 442c48b9: am a4a1e68f: am ebdedb47: (-s ours) am 42994097: am a1be8b43: LayoutLib: Update golden test images. [DO NOT MERGE] | |
| b108223 am 025960a1: am e81c3b45: am c2e98ca3: am 68ff174b: (-s ours) am 2b99b5da: am c9862b44: An ugly hack to render CalendarView. [DO NOT MERGE] | |
| d00d3df am 22115d8f: am 52bd715d: am 58967c69: am d9600c98: (-s ours) am 7eb81868: am b1ad4a15: LayoutLib: Fix true transparency in status bar. [DO NOT MERGE] | |
| 54d6ff3 am 7d4d67bb: am 14d291e8: am 5d282e3f: am 5769732e: (-s ours) am 9d6e87b6: am da687918: Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE] | |
| e938bdf am e831bfd5: am 1ddcfe84: am 47530108: am 728fc731: (-s ours) am c43506fc: am 8c674fda: Fix layout mirroring. [DO NOT MERGE] | |
| 924831b am 8a872e4a: am 7b552da2: am 4116ed7b: am 37ae8f4e: (-s ours) am 918e62f1: am 7aa36129: Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE] | |
| 1fddda2 am a5e6fcbd: am 6fb99762: am dfcd35d7: am e4b4b084: (-s ours) am eb15670c: am 92f373fe: Fix Matrix_Delegate.native_getValues() [DO NOT MERGE] | |
| 6f33838 am ec797aa2: am 66c51bef: am a0bef60c: am 05ed2d91: (-s ours) am 42e53ecb: am 66d91401: Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE] | |
| bc4f75d am 14ebdd92: am f0d24b65: am af3deb06: am 21f66a6b: (-s ours) am 5078ad32: am 6b1b651f: Fix imports. [DO NOT MERGE] | |
| cdb02e9 am dc1bf91f: am 84544de7: am 554f3a35: am 34f6f597: (-s ours) am 4a213763: am 5ad4dae1: Fix theme namespace in tests. [DO NOT MERGE] | |
| f627f56 am c835bc87: am baff0776: am 4ed5de88: am 39b4f4cc: (-s ours) am f988761c: am 723e136f: Run setup for full tests only once. [DO NOT MERGE] | |
| a35dad1 am 54b801b1: am e77d052b: am dd7d7aac: am de8da279: (-s ours) am e54dbc4a: am 3ba16c1d: LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE] | |
| 7783a1e am df4a0199: am be6438aa: am 28677599: am 963cac18: (-s ours) am 147c0506: am 55a36337: LayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE] | |
| a9f0ba6 am 583c4b23: am 14383771: am fe0e8709: am 76111ecb: (-s ours) am e093bbf3: am d861fd81: Set support flag for custom layouts for RecyclerView. [DO NOT MERGE] | |
| 2347ee1 am ddbe2b9e: am 0155fb64: am b342aba0: am c5bd6146: (-s ours) am 8a50ecea: am 82fae621: LayoutLib: translucent sys ui bars [DO NOT MERGE] | |
| 7fa4aff am f2c8d8fb: am a5e87b01: am 23a7bc9c: am 6dcfe1e2: (-s ours) am d4be80d9: am 9068539a: Update nav bar icons. [DO NOT MERGE] | |
| 94c5608 am 9916580e: am befeb767: am 884cc475: am 5eaa09ff: (-s ours) am d1dde055: am e5afc311: Move the layout code out of RenderSessionImpl. [DO NOT MERGE] | |
| 709b080 am 78da4c76: am 1f178854: am d7e001e6: am 1f2c15ca: (-s ours) am 87f5fd6b: am c989950d: CalendarView rendering: use R.styleable to find attr. [DO NOT MERGE] | |
| 0328e51 am 5fd70701: am a097124d: am 19229a8e: am 36e164e0: (-s ours) am e3eecca9: am b2fdaca9: Add tools:openDrawer to open a DrawerLayout. [DO NOT MERGE] | |
| f6114ab am 6befd01e: am 5e570d37: am c1b987f0: am 13cd7660: (-s ours) am b4060700: am a14ec6f4: Change tools:list_item to listitem. [DO NOT MERGE] | |
| 9dc7b8c am bda7a537: am 44063c65: am af51c690: am a556d756: (-s ours) am 8bfc5a9d: am b1e21330: Implement tools:list_item for RecyclerView. [DO NOT MERGE] | |
| 8caef72 am e34a4f14: am 8d0ec8a2: am 7f795d16: am 413d41aa: (-s ours) am 67b73b60: am cd4d5b3f: Support AppBar from Material Design. [DO NOT MERGE] | |
| 7ce63e6 am f27f1cc1: am 8ffa52af: am 1df73c5b: am 7a92c26e: (-s ours) am 6f5709ca: am de13095d: Update tests per new layoutlib_api [DO NOT MERGE] | |
| bc6347e am 88aa6f15: am 4de90cf0: am 40960191: am c5c2ea04: (-s ours) am 9a13b1e7: am db67caa6: Add missing resolveResValue call. [DO NOT MERGE] | |
| 875af15 am 06fc0dc5: am 15dd3802: am b9d2a529: am e4acf0ad: (-s ours) am ad16968d: am 6eef1246: LayoutLib: Skip classes from java package. [DO NOT MERGE] | |
| 96d8b95 am 9e559b21: am 74f88968: am 637eacfd: am 7911c8b9: (-s ours) am 15e549a8: am 4f5e6c63: Skip warnings for some unresolved references. [DO NOT MERGE] | |
| a1582e6 am 7069ff8f: am 1d1fae81: am 8cafc782: am 13670bc6: (-s ours) am 669e4969: am 3e875dbb: Fix import order. [DO NOT MERGE] | |
| c0f11ab am ea5cc4cc: am a62ad156: am 57185503: am 6dc8bab9: (-s ours) am c0fd1316: am e5fa12ad: Fix ParserFactory not initialized error. [DO NOT MERGE] | |
| 6a06795 am 42c923e6: am 26bdd0c8: am e779dec0: am bf7907bf: (-s ours) am 6b836cd0: am a287b842: Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE] | |
| f91820f am 604b6ce1: am ec160c67: am 42872f73: am f2bf5470: (-s ours) am 91e456d2: am e698bb27: Fix BridgeTypedArray.getType() [DO NOT MERGE] | |
| 0b42faf am 95174adc: am 0b95542d: am 35f6976e: am 7ec7805a: (-s ours) am 8a6295e8: am e481e713: Include Shapes in LayoutLib. [DO NOT MERGE] | |
| 89c000b am 063d75bc: am c0a9faad: am dc78e108: am 594939fc: (-s ours) am 66d5f24d: am ba5a02c5: LayoutLib: Support getting resource arrays. [DO NOT MERGE] | |
| 4e49ce3 am 7e36b8b8: am f3696835: am 0ae85775: am bd343c1f: (-s ours) am b32e44ff: am a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE] | |
| 5a8f69f am b7aa8f7e: am b602943f: am 7d7f0f47: am 9b1ac269: (-s ours) am 1754824c: am c96ef952: Add documentation about hack in commit: f8ea750455 [DO NOT MERGE] | |
| 52fca40 am 4ca95916: am 0f0cae1a: am fcc62127: am 6b7f9ae6: (-s ours) am 678f0ea2: am b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE] | |
| 64a0fb9 am 6d0a2480: am 14be8ed3: am e3040e9a: am d6363d86: (-s ours) am 2e57c1e2: am cc5e69e4: Inject anonymous inner classes of injected classes [DO NOT MERGE] | |
| e293713 am d8f30c2b: am 2c1cc061: am 56c72f4c: am 5b886bb0: (-s ours) am 899daf75: am d7e89906: Update platformDir search in tests. [DO NOT MERGE] | |
| b2dede6 am 363bdce9: am 4b030f0b: am 720d677f: am aae9c930: (-s ours) am 2f50403f: am afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE] | |
| 2dcf20c am 672feef1: am bf2c3b67: am ef319302: am 522e67e4: (-s ours) am de3ac8f9: am 92480a9a: Fix include tag rendering. [DO NOT MERGE] | |
| ac3df5d am ba4f6272: am 8053ef0c: am a6d71a2c: am 8df6131a: (-s ours) am 50e1406a: am f6b08547: Show better error message for color attr not found. [DO NOT MERGE] | |
| 605e0d8 am 932a9fc5: am 48aea8cc: am df44516b: am 59f026e9: (-s ours) am 81990c3f: am b1370c26: Fix build: udpate parser factory method [DO NOT MERGE] | |
| 1037c32 am 33bebe2a: am ac5f66e3: am bf019327: am b44f7fda: (-s ours) am 0a07bb95: am aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE] | |
| 16a3a82 am d7147860: am 8affffc7: am ef284578: am 78d77bc3: (-s ours) am bbbdc2ad: am 5c90c4f4: Remove kxml dependency [DO NOT MERGE] | |
| f71e3b2 am 9dbc35d1: am 258b56ec: am 9f37bd8a: am 0238bf24: docs: New auto Desktop Head Unit (DHU) docs | |
| 56d0bb7 am 442c48b9: am a4a1e68f: am ebdedb47: (-s ours) am 42994097: am a1be8b43: LayoutLib: Update golden test images. [DO NOT MERGE] | |
| 025960a am e81c3b45: am c2e98ca3: am 68ff174b: (-s ours) am 2b99b5da: am c9862b44: An ugly hack to render CalendarView. [DO NOT MERGE] | |
| 22115d8 am 52bd715d: am 58967c69: am d9600c98: (-s ours) am 7eb81868: am b1ad4a15: LayoutLib: Fix true transparency in status bar. [DO NOT MERGE] | |
| 7d4d67b am 14d291e8: am 5d282e3f: am 5769732e: (-s ours) am 9d6e87b6: am da687918: Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE] | |
| e831bfd am 1ddcfe84: am 47530108: am 728fc731: (-s ours) am c43506fc: am 8c674fda: Fix layout mirroring. [DO NOT MERGE] | |
| 8a872e4 am 7b552da2: am 4116ed7b: am 37ae8f4e: (-s ours) am 918e62f1: am 7aa36129: Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE] | |
| a5e6fcb am 6fb99762: am dfcd35d7: am e4b4b084: (-s ours) am eb15670c: am 92f373fe: Fix Matrix_Delegate.native_getValues() [DO NOT MERGE] | |
| ec797aa am 66c51bef: am a0bef60c: am 05ed2d91: (-s ours) am 42e53ecb: am 66d91401: Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE] | |
| 14ebdd9 am f0d24b65: am af3deb06: am 21f66a6b: (-s ours) am 5078ad32: am 6b1b651f: Fix imports. [DO NOT MERGE] | |
| dc1bf91 am 84544de7: am 554f3a35: am 34f6f597: (-s ours) am 4a213763: am 5ad4dae1: Fix theme namespace in tests. [DO NOT MERGE] | |
| c835bc8 am baff0776: am 4ed5de88: am 39b4f4cc: (-s ours) am f988761c: am 723e136f: Run setup for full tests only once. [DO NOT MERGE] | |
| 54b801b am e77d052b: am dd7d7aac: am de8da279: (-s ours) am e54dbc4a: am 3ba16c1d: LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE] | |
| df4a019 am be6438aa: am 28677599: am 963cac18: (-s ours) am 147c0506: am 55a36337: LayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE] | |
| 583c4b2 am 14383771: am fe0e8709: am 76111ecb: (-s ours) am e093bbf3: am d861fd81: Set support flag for custom layouts for RecyclerView. [DO NOT MERGE] | |
| ddbe2b9 am 0155fb64: am b342aba0: am c5bd6146: (-s ours) am 8a50ecea: am 82fae621: LayoutLib: translucent sys ui bars [DO NOT MERGE] | |
| f2c8d8f am a5e87b01: am 23a7bc9c: am 6dcfe1e2: (-s ours) am d4be80d9: am 9068539a: Update nav bar icons. [DO NOT MERGE] | |
| 9916580 am befeb767: am 884cc475: am 5eaa09ff: (-s ours) am d1dde055: am e5afc311: Move the layout code out of RenderSessionImpl. [DO NOT MERGE] | |
| 78da4c7 am 1f178854: am d7e001e6: am 1f2c15ca: (-s ours) am 87f5fd6b: am c989950d: CalendarView rendering: use R.styleable to find attr. [DO NOT MERGE] | |
| 5fd7070 am a097124d: am 19229a8e: am 36e164e0: (-s ours) am e3eecca9: am b2fdaca9: Add tools:openDrawer to open a DrawerLayout. [DO NOT MERGE] | |
| 6befd01 am 5e570d37: am c1b987f0: am 13cd7660: (-s ours) am b4060700: am a14ec6f4: Change tools:list_item to listitem. [DO NOT MERGE] | |
| bda7a53 am 44063c65: am af51c690: am a556d756: (-s ours) am 8bfc5a9d: am b1e21330: Implement tools:list_item for RecyclerView. [DO NOT MERGE] | |
| e34a4f1 am 8d0ec8a2: am 7f795d16: am 413d41aa: (-s ours) am 67b73b60: am cd4d5b3f: Support AppBar from Material Design. [DO NOT MERGE] | |
| f27f1cc am 8ffa52af: am 1df73c5b: am 7a92c26e: (-s ours) am 6f5709ca: am de13095d: Update tests per new layoutlib_api [DO NOT MERGE] | |
| 88aa6f1 am 4de90cf0: am 40960191: am c5c2ea04: (-s ours) am 9a13b1e7: am db67caa6: Add missing resolveResValue call. [DO NOT MERGE] | |
| 06fc0dc am 15dd3802: am b9d2a529: am e4acf0ad: (-s ours) am ad16968d: am 6eef1246: LayoutLib: Skip classes from java package. [DO NOT MERGE] | |
| 9e559b2 am 74f88968: am 637eacfd: am 7911c8b9: (-s ours) am 15e549a8: am 4f5e6c63: Skip warnings for some unresolved references. [DO NOT MERGE] | |
| 7069ff8 am 1d1fae81: am 8cafc782: am 13670bc6: (-s ours) am 669e4969: am 3e875dbb: Fix import order. [DO NOT MERGE] | |
| ea5cc4c am a62ad156: am 57185503: am 6dc8bab9: (-s ours) am c0fd1316: am e5fa12ad: Fix ParserFactory not initialized error. [DO NOT MERGE] | |
| 42c923e am 26bdd0c8: am e779dec0: am bf7907bf: (-s ours) am 6b836cd0: am a287b842: Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE] | |
| 604b6ce am ec160c67: am 42872f73: am f2bf5470: (-s ours) am 91e456d2: am e698bb27: Fix BridgeTypedArray.getType() [DO NOT MERGE] | |
| 95174ad am 0b95542d: am 35f6976e: am 7ec7805a: (-s ours) am 8a6295e8: am e481e713: Include Shapes in LayoutLib. [DO NOT MERGE] | |
| 063d75b am c0a9faad: am dc78e108: am 594939fc: (-s ours) am 66d5f24d: am ba5a02c5: LayoutLib: Support getting resource arrays. [DO NOT MERGE] | |
| 7e36b8b am f3696835: am 0ae85775: am bd343c1f: (-s ours) am b32e44ff: am a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE] | |
| b7aa8f7 am b602943f: am 7d7f0f47: am 9b1ac269: (-s ours) am 1754824c: am c96ef952: Add documentation about hack in commit: f8ea750455 [DO NOT MERGE] | |
| 4ca9591 am 0f0cae1a: am fcc62127: am 6b7f9ae6: (-s ours) am 678f0ea2: am b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE] | |
| 6d0a248 am 14be8ed3: am e3040e9a: am d6363d86: (-s ours) am 2e57c1e2: am cc5e69e4: Inject anonymous inner classes of injected classes [DO NOT MERGE] | |
| d8f30c2 am 2c1cc061: am 56c72f4c: am 5b886bb0: (-s ours) am 899daf75: am d7e89906: Update platformDir search in tests. [DO NOT MERGE] | |
| 363bdce am 4b030f0b: am 720d677f: am aae9c930: (-s ours) am 2f50403f: am afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE] | |
| 672feef am bf2c3b67: am ef319302: am 522e67e4: (-s ours) am de3ac8f9: am 92480a9a: Fix include tag rendering. [DO NOT MERGE] | |
| ba4f627 am 8053ef0c: am a6d71a2c: am 8df6131a: (-s ours) am 50e1406a: am f6b08547: Show better error message for color attr not found. [DO NOT MERGE] | |
| 932a9fc am 48aea8cc: am df44516b: am 59f026e9: (-s ours) am 81990c3f: am b1370c26: Fix build: udpate parser factory method [DO NOT MERGE] | |
| 33bebe2 am ac5f66e3: am bf019327: am b44f7fda: (-s ours) am 0a07bb95: am aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE] | |
| d714786 am 8affffc7: am ef284578: am 78d77bc3: (-s ours) am bbbdc2ad: am 5c90c4f4: Remove kxml dependency [DO NOT MERGE] | |
| 32e3e72 am 3b7b06a1: am 487cdebd: am 8f1ea834: Handle the -a flag for dumpsys appops. | |
| 3b7b06a am 487cdebd: am 8f1ea834: Handle the -a flag for dumpsys appops. | |
| e0f69aa am 9df996ed: am 6ad12315: Merge "Reformat local Korean numbers in national format." into mnc-dr-dev | |
| f334940 am 243095c9: am 47ee2ecf: Merge "Disable AR HW when client binder dies." into mnc-dr-dev | |
| 9df996e am 6ad12315: Merge "Reformat local Korean numbers in national format." into mnc-dr-dev | |
| 243095c am 47ee2ecf: Merge "Disable AR HW when client binder dies." into mnc-dr-dev | |
| 76c73ae am 12874d2d: am b9b57225: am 95137857: Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev | |
| 12874d2 am b9b57225: am 95137857: Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev | |
| 4eb298a LayoutLib: Fix true transparency in status bar. | |
| 2aa23ac am aebc3cce: am fd059b34: am e4c3ff2f: Merge "Camera: Update for reprocess session" into mnc-dev | |
| aebc3cc am fd059b34: am e4c3ff2f: Merge "Camera: Update for reprocess session" into mnc-dev | |
| 5554a4e am 6c97bb1b: am 59af87c2: am 7c17ec5f: Merge "Add GET_APP_OPS_STATS to Shell" into mnc-dev | |
| 75713dd am 9b4b427a: am e67268e6: Merge "Migrate camera vibration to the systemUI" into mnc-dr-dev | |
| 6c97bb1 am 59af87c2: am 7c17ec5f: Merge "Add GET_APP_OPS_STATS to Shell" into mnc-dev | |
| 9b4b427 am e67268e6: Merge "Migrate camera vibration to the systemUI" into mnc-dr-dev | |
| e4d6198 am f440fe06: am 8ff73b59: Merge "Cherry-pick: Add callback-based support for HW Activity Recognition." into mnc-dr-dev | |
| f440fe0 am 8ff73b59: Merge "Cherry-pick: Add callback-based support for HW Activity Recognition." into mnc-dr-dev | |
| 42af140 am 8f7a7e01: am a07177f0: Merge "Launching the camera now from systemUI including animations" into mnc-dr-dev | |
| 8f7a7e0 am a07177f0: Merge "Launching the camera now from systemUI including animations" into mnc-dr-dev | |
| 5897f6a am 9e974a89: (-s ours) am a67f961f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 9e974a8 am a67f961f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 4e06032 am 3d74e1f2: am 09952195: Merge "Update rotation without holding the WOL lock." into mnc-dr-dev | |
| 3d74e1f am 09952195: Merge "Update rotation without holding the WOL lock." into mnc-dr-dev | |
| f90169d am 5bc2a2c0: am d56892da: Merge "Disable fingerprint after user lockout" into mnc-dr-dev | |
| 5bc2a2c am d56892da: Merge "Disable fingerprint after user lockout" into mnc-dr-dev | |
| 7421845 am 388e6854: am 81d0325f: am 5983ae7b: Merge "Allow extra slop in battery stats" into mnc-dev | |
| 388e685 am 81d0325f: am 5983ae7b: Merge "Allow extra slop in battery stats" into mnc-dev | |
| 8d662a0 am e49dcfed: am 9b7a4ac5: am e62421f1: Merge "Teach Pm about the "always ask" link-handling state" into mnc-dev | |
| e49dcfe am 9b7a4ac5: am e62421f1: Merge "Teach Pm about the "always ask" link-handling state" into mnc-dev | |
| bf375cd am 04531d5c: am f03c090f: am 8304c6c0: Merge "Truncate and ellipsize app name if too long for dialog." into mnc-dev | |
| 04531d5 am f03c090f: am 8304c6c0: Merge "Truncate and ellipsize app name if too long for dialog." into mnc-dev | |
| a1cc380 am 919a3fdf: am 01c5bf54: Merge "Handle driver errors from remove, enroll and auth." into mnc-dr-dev | |
| 919a3fd am 01c5bf54: Merge "Handle driver errors from remove, enroll and auth." into mnc-dr-dev | |
| bdb151e am 4816d7d5: am e30e8980: Merge "Disable RT animations for header ripple" into mnc-dr-dev | |
| 4816d7d am e30e8980: Merge "Disable RT animations for header ripple" into mnc-dr-dev | |
| df98fda am 5d636c8c: Merge "Fix AudioAttributes.usageToString() string return values" into cw-e-dev | |
| 632c240 am 3f62358b: Merge "*ring ring* Who is it? Destiny? I\'ve been expecting your call..." into cw-e-dev | |
| 5d636c8 Merge "Fix AudioAttributes.usageToString() string return values" into cw-e-dev | |
| 3f62358 Merge "*ring ring* Who is it? Destiny? I've been expecting your call..." into cw-e-dev | |
| 8a6f55e am 30275c19: Refactor UidDetailProvider and its dependencies to SettingsLib. | |
| fe8b247 Fix AudioAttributes.usageToString() string return values | |
| f1b4814 *ring ring* Who is it? Destiny? I've been expecting your call... | |
| 608cf68 am 37e1db23: Merge "Move SummaryForAllUidLoader to SettingsLib." into cw-e-dev | |
| 30275c1 Refactor UidDetailProvider and its dependencies to SettingsLib. | |
| 6fbf272 am ae2880a6: am 26b555d4: am d34ecae4: Don\'t set a null filter to a cross-profile ResolveInfo. | |
| 37e1db2 Merge "Move SummaryForAllUidLoader to SettingsLib." into cw-e-dev | |
| ae2880a am 26b555d4: am d34ecae4: Don\'t set a null filter to a cross-profile ResolveInfo. | |
| b50d5b4 am d267c3b3: am 83d83194: Merge "instrument fingerprint crypto token service" into mnc-dr-dev | |
| d267c3b am 83d83194: Merge "instrument fingerprint crypto token service" into mnc-dr-dev | |
| 9bdcde8 am 49eb98e7: add permissions strings that have to be altered from framework originals for use in Wear BUG: 23223527 | |
| 49eb98e add permissions strings that have to be altered from framework originals for use in Wear BUG: 23223527 | |
| 667691b am 2ef327ed: am 2cb70049: Scale notifications on lockscreen for 420 dpi devices | |
| 2ef327e am 2cb70049: Scale notifications on lockscreen for 420 dpi devices | |
| cb4c0af am 46814fbf: Merge "Override Body Sensors string for watches" into cw-e-dev | |
| 46814fb Merge "Override Body Sensors string for watches" into cw-e-dev | |
| d969822 Override Body Sensors string for watches | |
| 29b588a Merge "Add documentation for media router's palette dependency." into mnc-ub-dev | |
| d7f3dfb am cd05509a: am 6393275f: am 2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev | |
| cd05509 am 6393275f: am 2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev | |
| 044826a am 7166ae1d: am d94d3a2a: Fix issues with light status bar and fp wake-and-unlock | |
| a6774c5 am 7edca79e: am 8a8885b9: am def6896d: Fix shifted wallpaper after OTA | |
| 7166ae1 am d94d3a2a: Fix issues with light status bar and fp wake-and-unlock | |
| 7edca79 am 8a8885b9: am def6896d: Fix shifted wallpaper after OTA | |
| 307bd0b am 379e7343: Merge "DO NOT MERGE guard against null DimLayer instances in TaskStack BUG: 23452983" into cw-e-dev | |
| 8373cf7 am 5d552f2c: am 414985c4: Remove window from mWaitingForDrawn when policy hidden | |
| 379e734 Merge "DO NOT MERGE guard against null DimLayer instances in TaskStack BUG: 23452983" into cw-e-dev | |
| 5d552f2 am 414985c4: Remove window from mWaitingForDrawn when policy hidden | |
| 4d0a2d2 DO NOT MERGE guard against null DimLayer instances in TaskStack BUG: 23452983 | |
| f2a7fed am c9a110b0: am 8c8a0c00: am c550a6fa: Merge "docs: Add Studio 1.3.2 release notes and download links" into mnc-dev | |
| c9a110b am 8c8a0c00: am c550a6fa: Merge "docs: Add Studio 1.3.2 release notes and download links" into mnc-dev | |
| 93826c7 am f2c5ce5d: am a42cf680: Merge "Camera: Add support for notifying NFC stack when camera is active" into mnc-dr-dev | |
| f2c5ce5 am a42cf680: Merge "Camera: Add support for notifying NFC stack when camera is active" into mnc-dr-dev | |
| 4888cdf am 7fd1014f: am 21490522: Merge "Don\'t show roaming icon when connecting HT HR network with Tele2 SIM" into mnc-dr-dev | |
| 7fd1014 am 21490522: Merge "Don\'t show roaming icon when connecting HT HR network with Tele2 SIM" into mnc-dr-dev | |
| c0b99c9 Move SummaryForAllUidLoader to SettingsLib. | |
| 595e565 am 1c5e92b1: am 8b86268b: am c04d21fc: Merge "add placeholder for platform name in download button. This change depends on the following change to the script that loads the platform name... https://googleplex-android-review.git.corp.google.com/#/c/752776/" into mnc-de | |
| 1c5e92b am 8b86268b: am c04d21fc: Merge "add placeholder for platform name in download button. This change depends on the following change to the script that loads the platform name... https://googleplex-android-review.git.corp.google.com/#/c/752776/" into mnc-dev | |
| cca7c4f am 92f43c8e: (-s ours) am 4e3af2ec: (-s ours) Import translations. DO NOT MERGE | |
| 92f43c8 am 4e3af2ec: (-s ours) Import translations. DO NOT MERGE | |
| b5a913f am f99eba07: am ec2efb9c: am 08b12dfb: Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev | |
| f99eba0 am ec2efb9c: am 08b12dfb: Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev | |
| b25c4e6 am 7795faac: am 4351111b: Merge "Fix jank when clicking on HUN" into mnc-dr-dev | |
| 7795faa am 4351111b: Merge "Fix jank when clicking on HUN" into mnc-dr-dev | |
| 906cc3f am 3f233293: am e2ca8593: am 9520071b: Merge "docs: Fix return info for support lib checkSelfPermission()" into mnc-dev | |
| 3f23329 am e2ca8593: am 9520071b: Merge "docs: Fix return info for support lib checkSelfPermission()" into mnc-dev | |
| 68f4601 am 00ca835d: am e5b4c3d5: am a7dde2e8: Merge "Camera: Fix depth documentation issues" into mnc-dev | |
| 00ca835 am e5b4c3d5: am a7dde2e8: Merge "Camera: Fix depth documentation issues" into mnc-dev | |
| 0035f2c am 403eaaf2: am c445438e: am d9eef347: Merge "MIDI docs: fix buffer allocation" into mnc-dev | |
| 0be53ae am c4b0028e: am a4f65ff5: am 41fc973c: am 251f2479: am dc35d48f: Merge "docs: changed red to yellow in code snippet" into mnc-preview-docs | |
| 037281d am 563f974d: am d7cdbd4d: am e6c64508: Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev | |
| b51e34c am fb6f6f24: am 2c632c88: Merge "Invoke strong auth callback and default strong auth expired to true" into mnc-dr-dev | |
| 7225af9 am c66a0db2: am 1bbc2750: am 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev | |
| b1dded0 am e2fb50b2: am fbcd78e6: Merge "Add support for new window orientation sensor." into mnc-dr-dev | |
| 69fd61c am a8bbebd4: am b5e47228: Add StrongAuthTracker | |
| a141536 am 2021956a: am ab45a217: Make wake-and-unlock faster | |
| 6014635 am 83526e3b: am 86bed406: Fix fingerprint listening state race conditions | |
| 403eaaf am c445438e: am d9eef347: Merge "MIDI docs: fix buffer allocation" into mnc-dev | |
| c4b0028 am a4f65ff5: am 41fc973c: am 251f2479: am dc35d48f: Merge "docs: changed red to yellow in code snippet" into mnc-preview-docs | |
| 563f974 am d7cdbd4d: am e6c64508: Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev | |
| fb6f6f2 am 2c632c88: Merge "Invoke strong auth callback and default strong auth expired to true" into mnc-dr-dev | |
| c66a0db am 1bbc2750: am 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev | |
| e2fb50b am fbcd78e6: Merge "Add support for new window orientation sensor." into mnc-dr-dev | |
| a8bbebd am b5e47228: Add StrongAuthTracker | |
| 2021956 am ab45a217: Make wake-and-unlock faster | |
| 83526e3 am 86bed406: Fix fingerprint listening state race conditions | |
| c9dec16 am e96b80f3: am 446c00a2: am cb59747d: Merge "Add missing removed permissions to the platform manifest" into mnc-dev | |
| e96b80f am 446c00a2: am cb59747d: Merge "Add missing removed permissions to the platform manifest" into mnc-dev | |
| 0fbbe38 am 36970140: am 79cb3ef9: am 7cd2d343: am 852c6178: (-s ours) am b63e291d: am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE | |
| 3697014 am 79cb3ef9: am 7cd2d343: am 852c6178: (-s ours) am b63e291d: am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE | |
| b56c643 am b1d01411: am 5d2faf11: am c5151d2c: am b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev | |
| b1d0141 am 5d2faf11: am c5151d2c: am b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev | |
| adde39d am b893c1ba: am 99b252ad: am ddc2536d: Make sure to kill restore-at-install full-data targets after restore | |
| b893c1b am 99b252ad: am ddc2536d: Make sure to kill restore-at-install full-data targets after restore | |
| 5646203 am 63e9875a: am 786529f2: am 54c807e7: Merge "Translate ripple mask to account for drawable bounds" into mnc-dev | |
| 63e9875 am 786529f2: am 54c807e7: Merge "Translate ripple mask to account for drawable bounds" into mnc-dev | |
| 1ffb592 am 78985f3f: am ea57b592: am 1773ded8: Merge "Fixed key comparison in equals method" into mnc-dev | |
| 78985f3 am ea57b592: am 1773ded8: Merge "Fixed key comparison in equals method" into mnc-dev | |
| b6e737e am 740eef52: am 33074733: am 46eddef4: am 504623e1: am 5389f46c: Docs: Fixes to interactive-watch-face docs (CL 743190) | |
| da9fb3c am 51e8df2e: am a001f7ae: Merge "Add carrier config variable to hide merge call button" into mnc-dr-dev | |
| 9fde6f2 am edf93764: am b460cc88: Merge "Remove wifi enabled checking from settings TetherUtil" into mnc-dr-dev | |
| f8d6f72 am 69504b53: Merge "DO NOT MERGE Work around for not getting APN info in NetworkInfo object." into cw-e-dev | |
| 740eef5 am 33074733: am 46eddef4: am 504623e1: am 5389f46c: Docs: Fixes to interactive-watch-face docs (CL 743190) | |
| 51e8df2 am a001f7ae: Merge "Add carrier config variable to hide merge call button" into mnc-dr-dev | |
| edf9376 am b460cc88: Merge "Remove wifi enabled checking from settings TetherUtil" into mnc-dr-dev | |
| 69504b5 Merge "DO NOT MERGE Work around for not getting APN info in NetworkInfo object." into cw-e-dev | |
| 2aa0523 DO NOT MERGE Work around for not getting APN info in NetworkInfo object. | |
| ee93161 Add documentation for media router's palette dependency. | |
| e30df6f am 7de9fbca: am 2364af20: Merge "Save interactive/screen-on state in KeyguardServiceDelegate" into mnc-dr-dev | |
| e46b5b4 am a2737bee: am 1fa7384a: Merge changes Ie8264c4d,Ic83ac0f1 into mnc-dr-dev | |
| 7de9fbc am 2364af20: Merge "Save interactive/screen-on state in KeyguardServiceDelegate" into mnc-dr-dev | |
| a2737be am 1fa7384a: Merge changes Ie8264c4d,Ic83ac0f1 into mnc-dr-dev | |
| 60931a7 am dc4442f1: am 2af6ec51: am c14cbac4: Merge "Fix issue #23361510: Increase assist timeout from 500ms to 1 second" into mnc-dev | |
| dc4442f am 2af6ec51: am c14cbac4: Merge "Fix issue #23361510: Increase assist timeout from 500ms to 1 second" into mnc-dev | |
| e6983e8 am cd6ba412: am bbb5717d: am f3ad1eab: Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev | |
| 66d7cdc am df5ca90e: am 37c11800: Don\'t animate in the navigation bar when going to full shade | |
| 7be017c am 3871224e: am 28f1794f: am 6a21a5a1: am 9f4ddca9: am 56c22d29: Merge "Docs: Creating interactive watch faces Bug: 21721463" into mnc-preview-docs | |
| cd6ba41 am bbb5717d: am f3ad1eab: Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev | |
| df5ca90 am 37c11800: Don\'t animate in the navigation bar when going to full shade | |
| 3871224 am 28f1794f: am 6a21a5a1: am 9f4ddca9: am 56c22d29: Merge "Docs: Creating interactive watch faces Bug: 21721463" into mnc-preview-docs | |
| c50ed7d am eea063d9: am 96a3c9a7: am 6540375a: am 311f8eee: am ed54f60a: Merge "Docs: Updating, clarifying Debug-over-WiFi instructions. Bug: 21371836" into mnc-preview-docs | |
| eea063d am 96a3c9a7: am 6540375a: am 311f8eee: am ed54f60a: Merge "Docs: Updating, clarifying Debug-over-WiFi instructions. Bug: 21371836" into mnc-preview-docs | |
| 7d4cf23 am 9e191aa6: am a6562603: am 1e9bfc64: Fix incorrect android.telecom.Call.Details equality check. | |
| 9e191aa am a6562603: am 1e9bfc64: Fix incorrect android.telecom.Call.Details equality check. | |
| ab5e962 am d7121f56: am 0257c82f: am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev | |
| 6abed07 am 359f5944: am 06a86644: Merge "Fix wakelock leak for dozing" into mnc-dr-dev | |
| d7121f5 am 0257c82f: am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev | |
| 359f594 am 06a86644: Merge "Fix wakelock leak for dozing" into mnc-dr-dev | |
| 6fdab99 am 86d86c2e: am c3aa7f3a: Merge "Camera2: Handle surface size change" into mnc-dr-dev | |
| 86d86c2 am c3aa7f3a: Merge "Camera2: Handle surface size change" into mnc-dr-dev | |
| 6e6fbc9 am 7102fb5f: am e1df482c: am e3de6c5d: Merge "Fix crashes when removing work profile" into mnc-dev | |
| 7102fb5 am e1df482c: am e3de6c5d: Merge "Fix crashes when removing work profile" into mnc-dev | |
| 81b4616 am aa8c876e: am 5c577bab: am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev | |
| aa8c876 am 5c577bab: am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev | |
| cdeeecb am 37aa01a3: (-s ours) am 399237f8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 4caf6b9 am 880ef585: am f2f01148: Merge "Launched camera in the correct user." into mnc-dr-dev | |
| 37aa01a am 399237f8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 880ef58 am f2f01148: Merge "Launched camera in the correct user." into mnc-dr-dev | |
| 5b9e329 am 257a9a87: (-s ours) am 81d99d47: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 257a9a8 am 81d99d47: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 2c6fe6c am 0c6eba36: (-s ours) am c2e81a0c: (-s ours) Import translations. DO NOT MERGE | |
| 0c6eba3 am c2e81a0c: (-s ours) Import translations. DO NOT MERGE | |
| 6ac4af0f am 8cc1abcb: am b960e75e: am 8b8fa3e9: Fix SysUI crash when no metadata is provided | |
| 8cc1abc am b960e75e: am 8b8fa3e9: Fix SysUI crash when no metadata is provided | |
| 43fdc25 am e6c029b4: am 27c1a728: am f610bd78: Fix race conditions for camera prewarm service | |
| f10e475 am ebcd9d55: am 0835f33a: Merge "Improve motion for wake-and-unlocking while pulsing" into mnc-dr-dev | |
| 1dc1c93 am caa6cb3a: am 394686ef: Merge "Fix race condition for doze mode and wake-and-unlocking" into mnc-dr-dev | |
| 9c45aa8 am ca3c865d: am 892768fb: am 0b804542: Merge "Constrain drawBitmap matrix-to-rect optimization" into mnc-dev | |
| 23cee7c am a2de2177: am df23f371: am c9ecc985: Merge "Add some bookmarks to plugin-for-gradle page" into mnc-dev | |
| b696779 am dd8ccccd: am f17a4f42: am 54bdb2e7: Merge "docs: Updated hardware system images for M." into mnc-dev | |
| 56df15d am 5b3a38e0: am bda9b324: am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev | |
| 40c7583 am b7f482ab: am ee2cfe48: Only call authenticate when we are not listening yet | |
| ce6fb7b am 7ef77271: am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev | |
| 1d9a8c5 am 2591d6ff: am 358fcc79: Do not start with a black frame in bootanimation | |
| 309fef1 am e11fbc08: am 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-dev | |
| 458d4d6 am 9b1fd822: am 2ad94499: Merge "Use init to write usb typec props." into mnc-dr-dev | |
| c91b67a am 31a536e1: am 57928364: am 53c38c88: Merge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev | |
| 217d456 am 8100b3fa: am 4439dcdc: am af75c17b: Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest | |
| e6c029b am 27c1a728: am f610bd78: Fix race conditions for camera prewarm service | |
| ebcd9d5 am 0835f33a: Merge "Improve motion for wake-and-unlocking while pulsing" into mnc-dr-dev | |
| caa6cb3 am 394686ef: Merge "Fix race condition for doze mode and wake-and-unlocking" into mnc-dr-dev | |
| ca3c865 am 892768fb: am 0b804542: Merge "Constrain drawBitmap matrix-to-rect optimization" into mnc-dev | |
| a2de217 am df23f371: am c9ecc985: Merge "Add some bookmarks to plugin-for-gradle page" into mnc-dev | |
| dd8cccc am f17a4f42: am 54bdb2e7: Merge "docs: Updated hardware system images for M." into mnc-dev | |
| 5b3a38e am bda9b324: am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev | |
| b7f482a am ee2cfe48: Only call authenticate when we are not listening yet | |
| 7ef7727 am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev | |
| 2591d6f am 358fcc79: Do not start with a black frame in bootanimation | |
| e11fbc0 am 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-dev | |
| 9b1fd82 am 2ad94499: Merge "Use init to write usb typec props." into mnc-dr-dev | |
| 31a536e am 57928364: am 53c38c88: Merge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev | |
| 8100b3f am 4439dcdc: am af75c17b: Fix issue #23270878: NPE in UsageStatsService while running UserManagementTest | |
| 3244dc2 am 677cd087: am e9de1b4c: am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev | |
| 677cd08 am e9de1b4c: am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev | |
| 9b56bff am 20a9ca15: am d294dc43: am 96695d2f: Merge "docs: App link doc update for M Preview 3" into mnc-dev | |
| 20a9ca1 am d294dc43: am 96695d2f: Merge "docs: App link doc update for M Preview 3" into mnc-dev | |
| 878acad am d7792759: am 5f89ce64: am 3e40a27e: Merge "Docs: Fixing files that didn\'t merge properly from mnc-preview-docs" into mnc-dev | |
| d779275 am 5f89ce64: am 3e40a27e: Merge "Docs: Fixing files that didn\'t merge properly from mnc-preview-docs" into mnc-dev | |
| d29dd0c am b59404a1: am eb2f302d: am 610008c0: Merge "Clear old clip rect when creating new surface." into mnc-dev | |
| b59404a am eb2f302d: am 610008c0: Merge "Clear old clip rect when creating new surface." into mnc-dev | |
| cfd288b am 5211c063: am 6da89844: am 12b9c2d6: Merge "Fix issue #23214751: Get a GPS fix before going in to doze" into mnc-dev | |
| 5211c06 am 6da89844: am 12b9c2d6: Merge "Fix issue #23214751: Get a GPS fix before going in to doze" into mnc-dev | |
| 591b371 am ccbb02f9: am b16cd62c: am c0a2254e: Merge "Clean up properly if outcall for doRestoreFinished() fails" into mnc-dev | |
| ccbb02f am b16cd62c: am c0a2254e: Merge "Clean up properly if outcall for doRestoreFinished() fails" into mnc-dev | |
| 338b055 am 905af2b4: am 0c61fe76: am 7aa6fc67: Merge "docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev | |
| 33c9093 am a215557b: am 0805fcc3: am 036895e1: Merge "docs: M Preview 3 post-release cleanup" into mnc-dev | |
| 905af2b am 0c61fe76: am 7aa6fc67: Merge "docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev | |
| a215557 am 0805fcc3: am 036895e1: Merge "docs: M Preview 3 post-release cleanup" into mnc-dev | |
| 13bf77e am d2a4165a: am ebadc461: am dd8df041: Merge "Setting config_use_sim_language_file to false for 334-020." into mnc-dev | |
| d2a4165 am ebadc461: am dd8df041: Merge "Setting config_use_sim_language_file to false for 334-020." into mnc-dev | |
| 514fa3c am a6aa1fbd: am d4d61826: Merge "Not allowing empty fingerprint names anymore" into mnc-dr-dev | |
| a6aa1fb am d4d61826: Merge "Not allowing empty fingerprint names anymore" into mnc-dr-dev | |
| 8787d8e am 73ef4642: am 581fd0fb: am 757e2c7f: Merge "Fix documentation issue" into mnc-dev | |
| 73ef464 am 581fd0fb: am 757e2c7f: Merge "Fix documentation issue" into mnc-dev | |
| c75d405 am 811330ed: am 1eb1f7cf: am 46ae218b: Merge "docs: Support Library v23 updates" into mnc-dev | |
| 811330e am 1eb1f7cf: am 46ae218b: Merge "docs: Support Library v23 updates" into mnc-dev | |
| a38d97c am 76342acf: am ed257d1a: am bd58d6fc: Doc change: misc fixes for preview 3. | |
| 76342ac am ed257d1a: am bd58d6fc: Doc change: misc fixes for preview 3. | |
| 55d39ec am d74a66bd: Merge "Introduce permission for updating the cell broadcast content provider." into cw-e-dev | |
| d74a66b Merge "Introduce permission for updating the cell broadcast content provider." into cw-e-dev | |
| 9ddc014 am 88c4e406: am 150123a3: am f2cb6f7e: Merge "Grant SMS carrier provisioning app the permission to receive SMS." into mnc-dev | |
| 498cf7a am a0d4c975: am 1a31af15: am a3fd27ad: Merge "Check component permissions like \'exported\' before assigned permissions" into mnc-dev | |
| 88c4e40 am 150123a3: am f2cb6f7e: Merge "Grant SMS carrier provisioning app the permission to receive SMS." into mnc-dev | |
| 433ecac am 101059b7: am aefae50d: am a03567bf: docs: Fixed unclosed anchor tag for M Program Overview. | |
| a0d4c97 am 1a31af15: am a3fd27ad: Merge "Check component permissions like \'exported\' before assigned permissions" into mnc-dev | |
| 101059b am aefae50d: am a03567bf: docs: Fixed unclosed anchor tag for M Program Overview. | |
| 8552b77 am f377bffb: am a8f68d2d: am af46e1b4: resolved conflicts for merge of 44053b4e to mnc-dev | |
| f377bff am a8f68d2d: am af46e1b4: resolved conflicts for merge of 44053b4e to mnc-dev | |
| 305680d am 3723af53: am c57f309a: Merge "Add experimental camera session prepare API." into mnc-dr-dev | |
| 3723af5 am c57f309a: Merge "Add experimental camera session prepare API." into mnc-dr-dev | |
| 5b37c0d am 22994783: am 877c2257: Merge "instrument fingerprint service" into mnc-dr-dev | |
| 2299478 am 877c2257: Merge "instrument fingerprint service" into mnc-dr-dev | |
| 8f00f74 am 3449530c: am ee222a7f: am ed7961eb: Merge "docs: Fixed typo in Android for Work section in MNC Behavior Changes doc." into mnc-dev | |
| 3449530 am ee222a7f: am ed7961eb: Merge "docs: Fixed typo in Android for Work section in MNC Behavior Changes doc." into mnc-dev | |
| 375cd38 am 0b638fd2: am f3490b5f: am 9b3c0bc9: am 398d655f: am d381eb95: Merge "Adding link to location API video." into mnc-preview-docs | |
| 1a3b04f am 425bb3fb: am 8a4246b0: am 7f328d98: am 08b3f121: am 72c1f222: Merge "docs: studio 1.3.1 revision updates" into mnc-preview-docs | |
| 11bfdbe am 3fcd8272: am 99596170: am 50a16111: am 285c9cb7: am 4f66c1da: Merge "docs: studio 1.3.1 download updates" into mnc-preview-docs | |
| bd62289 am 123bcea2: am c2d4a012: am a5913fbb: am a2f11f81: am caec50ec: docs: changed version 5 to 3 for Billing API | |
| b1122b5 am fe1b5329: am 2788a5af: am 3f90a43c: am 98d2d0d5: am 862f0f03: doc: Updated Auto quality guideline for media playback (AU-MT). The update reflects new guidance that media apps do not autoplay on startup of Android Auto or without user initiated action | |
| e592908 am d74ac1d5: am a09f35eb: am 96b2c10d: am 55ee752e: am c5b58011: Merge "docs: gradle plugin revision update" into mnc-preview-docs | |
| b5b63a1 am 1d9cff65: am 076eefa6: am f71cc012: am 9186895b: am 5fd0eff1: docs: August 2015 Android Dashboard update | |
| f304ef8 am 10ceae25: am 3b793ec5: am d00a5b1b: am 998f5501: am 378a3a89: Merge "docs: studio 1.3 annotation-update" into mnc-preview-docs | |
| b52b13d am eb7d99c2: am 26b379fc: am 43c8a1c8: am 3ee95327: am 6c00399c: docs: studio 1.3 private resources | |
| 1cb2d6b am c8846fbd: am 1b197f6c: am 1614f115: am 8f0d5451: am e5fe2468: docs: studio 1.3 allocation tracker | |
| 376c79a am fd9a3e6b: am 07116df2: am 605c890b: am 860e65be: am 16c5726e: docs: studio 1.3 developer services | |
| 3a4200e am bc275406: am 99a2f740: am 30996739: am e62df60a: am b90583ac: Merge "docs: create-project-link in studio overview" into mnc-preview-docs | |
| 3cc6b84 am 0a373930: am b9fe2732: am c6bfe586: am ccd0fe27: am c87ca50a: Merge "docs: studio 1.3 downloads" into mnc-preview-docs | |
| 8f5c409 am c45a4f7a: am ea483d71: am 0ac81a6e: am fd8da61a: am f0cd0441: Merge "docs: studio 1.3 manifest merger update" into mnc-preview-docs | |
| 7fb18f1 am bdb6bd8e: am c6ea82af: am 3cff3688: am 371ccd13: am 51c02f6a: Merge "docs: studio 1.3 revisions - android plugin for gradle" into mnc-preview-docs | |
| 26aba63 am ea4afc6e: am 152f836b: am 110a5574: am f82f33d3: am 4c5b6cc4: Merge "docs: studio 1.3 live templates" into mnc-preview-docs | |
| d6cf72e am 0bbf06db: am 49246c83: am 7026df3b: am 5f8d3728: am b8987585: Merge "docs: studio 1.3 revisions - studio" into mnc-preview-docs | |
| 22c86c4 am fcb11c12: am 32fd0933: am 7cbc35be: am c4fe8db7: am 322de02a: Merge "docs: studio 1.3 hprof viewer" into mnc-preview-docs | |
| 31fb3c5 am b743065b: am b54cbb5d: am 1c6997b3: am 27b24602: am 47c88fca: Merge "docs: studio 1.3 separate test folder" into mnc-preview-docs | |
| fa716ea am 565513fc: am 6d663251: am ff7526c1: am 71178f02: am 29dfe902: Merge "docs: studio 1.3 fingerprint support" into mnc-preview-docs | |
| d9ccb88 am 095d74ab: am f888d47c: am b4e5608d: am 57cdc011: am 054711b6: Merge "docs: studio 1.3 sdk manager updates" into mnc-preview-docs | |
| bb62735 am 0dbae184: am b42f499e: am 1beefcad: am 7a76e44d: am 1f6a5f89: docs: design support library 22.2.1 revisions | |
| 376d20c am 849897c9: am 9a94b442: am 8c6a2208: am 8a9972cc: am 803c5738: Merge "docs: Updated the list of auto partners, added links" into mnc-preview-docs | |
| 0b638fd am f3490b5f: am 9b3c0bc9: am 398d655f: am d381eb95: Merge "Adding link to location API video." into mnc-preview-docs | |
| 425bb3f am 8a4246b0: am 7f328d98: am 08b3f121: am 72c1f222: Merge "docs: studio 1.3.1 revision updates" into mnc-preview-docs | |
| 3fcd827 am 99596170: am 50a16111: am 285c9cb7: am 4f66c1da: Merge "docs: studio 1.3.1 download updates" into mnc-preview-docs | |
| 123bcea am c2d4a012: am a5913fbb: am a2f11f81: am caec50ec: docs: changed version 5 to 3 for Billing API | |
| fe1b532 am 2788a5af: am 3f90a43c: am 98d2d0d5: am 862f0f03: doc: Updated Auto quality guideline for media playback (AU-MT). The update reflects new guidance that media apps do not autoplay on startup of Android Auto or without user initiated action to select th | |
| d74ac1d am a09f35eb: am 96b2c10d: am 55ee752e: am c5b58011: Merge "docs: gradle plugin revision update" into mnc-preview-docs | |
| 1d9cff6 am 076eefa6: am f71cc012: am 9186895b: am 5fd0eff1: docs: August 2015 Android Dashboard update | |
| 10ceae2 am 3b793ec5: am d00a5b1b: am 998f5501: am 378a3a89: Merge "docs: studio 1.3 annotation-update" into mnc-preview-docs | |
| eb7d99c am 26b379fc: am 43c8a1c8: am 3ee95327: am 6c00399c: docs: studio 1.3 private resources | |
| c8846fb am 1b197f6c: am 1614f115: am 8f0d5451: am e5fe2468: docs: studio 1.3 allocation tracker | |
| fd9a3e6 am 07116df2: am 605c890b: am 860e65be: am 16c5726e: docs: studio 1.3 developer services | |
| bc27540 am 99a2f740: am 30996739: am e62df60a: am b90583ac: Merge "docs: create-project-link in studio overview" into mnc-preview-docs | |
| 0a37393 am b9fe2732: am c6bfe586: am ccd0fe27: am c87ca50a: Merge "docs: studio 1.3 downloads" into mnc-preview-docs | |
| c45a4f7 am ea483d71: am 0ac81a6e: am fd8da61a: am f0cd0441: Merge "docs: studio 1.3 manifest merger update" into mnc-preview-docs | |
| bdb6bd8 am c6ea82af: am 3cff3688: am 371ccd13: am 51c02f6a: Merge "docs: studio 1.3 revisions - android plugin for gradle" into mnc-preview-docs | |
| ea4afc6 am 152f836b: am 110a5574: am f82f33d3: am 4c5b6cc4: Merge "docs: studio 1.3 live templates" into mnc-preview-docs | |
| 0bbf06d am 49246c83: am 7026df3b: am 5f8d3728: am b8987585: Merge "docs: studio 1.3 revisions - studio" into mnc-preview-docs | |
| fcb11c1 am 32fd0933: am 7cbc35be: am c4fe8db7: am 322de02a: Merge "docs: studio 1.3 hprof viewer" into mnc-preview-docs | |
| b743065 am b54cbb5d: am 1c6997b3: am 27b24602: am 47c88fca: Merge "docs: studio 1.3 separate test folder" into mnc-preview-docs | |
| 565513f am 6d663251: am ff7526c1: am 71178f02: am 29dfe902: Merge "docs: studio 1.3 fingerprint support" into mnc-preview-docs | |
| 095d74a am f888d47c: am b4e5608d: am 57cdc011: am 054711b6: Merge "docs: studio 1.3 sdk manager updates" into mnc-preview-docs | |
| 0dbae18 am b42f499e: am 1beefcad: am 7a76e44d: am 1f6a5f89: docs: design support library 22.2.1 revisions | |
| 849897c am 9a94b442: am 8c6a2208: am 8a9972cc: am 803c5738: Merge "docs: Updated the list of auto partners, added links" into mnc-preview-docs | |
| 6f07eaa am cda0ab68: am 8cfbae04: Merge "Show usb charging notification when in host mode" into mnc-dr-dev | |
| cda0ab6 am 8cfbae04: Merge "Show usb charging notification when in host mode" into mnc-dr-dev | |
| 31638de am 07b36bd3: am aed1c9fb: am 5d467ac5: Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev | |
| 07b36bd am aed1c9fb: am 5d467ac5: Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev | |
| 434770d am 5f5c4b23: (-s ours) am ea49b2f6: (-s ours) Import translations. DO NOT MERGE | |
| 5f5c4b2 am ea49b2f6: (-s ours) Import translations. DO NOT MERGE | |
| 5adb4de am 46888bbc: am 0c636b0f: am 4fd784e1: Merge "Add Support Lib v23 API Diff" into mnc-dev | |
| 46888bb am 0c636b0f: am 4fd784e1: Merge "Add Support Lib v23 API Diff" into mnc-dev | |
| f21c2e2 am e3cd66eb: am b0514a0c: am 70004d9f: docs: fix build errors due to linked apache http classes | |
| e3cd66e am b0514a0c: am 70004d9f: docs: fix build errors due to linked apache http classes | |
| 5935fbd am bf14237d: am 7f64fa51: am 28f2ba8e: docs: Remove Google Play Services pages under Develop > Google Services. | |
| bf14237 am 7f64fa51: am 28f2ba8e: docs: Remove Google Play Services pages under Develop > Google Services. | |
| ec8ee87 am d9b4126b: am e9b48d70: am 85429c0d: docs: Android 5.1 API Release notes (Lollipop MR1) | |
| d9b4126 am e9b48d70: am 85429c0d: docs: Android 5.1 API Release notes (Lollipop MR1) | |
| 5c82a93 am a3b5f588: am b447316a: am 637db47e: docs: SDK Tools v23.3.4 release download links | |
| a3b5f58 am b447316a: am 637db47e: docs: SDK Tools v23.3.4 release download links | |
| 7ebbad4 am 70c7aab5: am a4d1e7e0: am 0baf95bf: docs: SDK Tools Release notes for v24.3.4 | |
| 70c7aab am a4d1e7e0: am 0baf95bf: docs: SDK Tools Release notes for v24.3.4 | |
| 874da02 am fa23d090: am 5e9de544: am 472b6b44: docs: Platform release notes for Android 6.0 (API 23) revision 1 | |
| fa23d09 am 5e9de544: am 472b6b44: docs: Platform release notes for Android 6.0 (API 23) revision 1 | |
| a2a6189 am 14d207f2: am 0051cbac: am 6a3016d2: Merge "docs: Build Tools 23.0.0 release notes" into mnc-dev | |
| 14d207f am 0051cbac: am 6a3016d2: Merge "docs: Build Tools 23.0.0 release notes" into mnc-dev | |
| e28e158 am 2f7c5e48: am 2aa5b510: am bd4ed32f: docs: Preview 3 - Support page updates | |
| 2f7c5e4 am 2aa5b510: am bd4ed32f: docs: Preview 3 - Support page updates | |
| 6f41290 am f9ed55be: am 3c315c90: am 42c22d04: Merge "Doc change: Edits for final SDK and dev preview 3. Add selector to manage landing page image." into mnc-dev | |
| df75f41 am 06731e6d: am 33c9c52f: am bf8f17f8: docs: Update Preview downloads page for Developer Preview 3 | |
| c16a33c am 454ba0b3: am 54c1efd8: am 5c7817bc: Merge "Update the RenderScript runtime documentation for MNC." into mnc-dev | |
| f9ed55b am 3c315c90: am 42c22d04: Merge "Doc change: Edits for final SDK and dev preview 3. Add selector to manage landing page image." into mnc-dev | |
| 06731e6 am 33c9c52f: am bf8f17f8: docs: Update Preview downloads page for Developer Preview 3 | |
| 454ba0b am 54c1efd8: am 5c7817bc: Merge "Update the RenderScript runtime documentation for MNC." into mnc-dev | |
| 028c2e4 am 33689420: am eec25a4f: am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev | |
| 5530de1 am 9f18c69c: am a99dd2c9: am 6fa531e0: Merge "docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev | |
| 687a302 am 674e5eb0: am d4828d67: am fbf170cb: Merge "docs: API diff report 22 to 23" into mnc-dev | |
| 835032b am 24e05601: am 186c4c2f: am 886e382d: Merge "docs: Added Javadoc links for new M Preview permissions methods" into mnc-dev | |
| 244898f am 83f941b2: am f8134c85: am 5bd5c25e: Merge "Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page Bug: 22947123" into mnc-dev | |
| 914eda0 am 574f9b42: am ac11522e: am 06f552cf: Merge "Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo..." into mnc-dev | |
| d81e103 am 83e0a223: am 7a372767: am eee09f49: Merge "cherrypick from mnc-preview-docs docs: Preview 3 permissions docs. Original Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18" into mnc-dev | |
| 6df21b5 am 085a6b42: am 89a3c5ad: am 0cd143ad: Merge "AAPT: Fix regression in resource versioning" into mnc-dev | |
| 5abde23 am ef7e8ccb: am 791def59: am b8fb239a: Merge "docs: Updated API Overview and Behavior Changes docs for M Preview 3." into mnc-dev | |
| 98e684e am b66e755b: am 64b05c0f: am 9f238a94: Merge "Introducing M Land." into mnc-dev | |
| 87c1e1b am 415c6cb2: am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev | |
| 567139e am a5e012e6: Merge commit \'8dcda391c79e8c2fd20a87834f1f61645aa771ea\' into cw-e-dev | |
| 3368942 am eec25a4f: am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev | |
| 9f18c69 am a99dd2c9: am 6fa531e0: Merge "docs: Updated gms_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev | |
| 674e5eb am d4828d67: am fbf170cb: Merge "docs: API diff report 22 to 23" into mnc-dev | |
| 24e0560 am 186c4c2f: am 886e382d: Merge "docs: Added Javadoc links for new M Preview permissions methods" into mnc-dev | |
| 83f941b am f8134c85: am 5bd5c25e: Merge "Docs: Migration, rewrite of Doze/App Standby doc from M Preview behavior page Bug: 22947123" into mnc-dev | |
| 574f9b4 am ac11522e: am 06f552cf: Merge "Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo..." into mnc-dev | |
| 83e0a22 am 7a372767: am eee09f49: Merge "cherrypick from mnc-preview-docs docs: Preview 3 permissions docs. Original Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18" into mnc-dev | |
| 085a6b4 am 89a3c5ad: am 0cd143ad: Merge "AAPT: Fix regression in resource versioning" into mnc-dev | |
| ef7e8cc am 791def59: am b8fb239a: Merge "docs: Updated API Overview and Behavior Changes docs for M Preview 3." into mnc-dev | |
| b66e755 am 64b05c0f: am 9f238a94: Merge "Introducing M Land." into mnc-dev | |
| 415c6cb am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev | |
| a5e012e Merge commit '8dcda391c79e8c2fd20a87834f1f61645aa771ea' into cw-e-dev | |
| eb694bb am 546909c9: am 479c482c: am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev | |
| 546909c am 479c482c: am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev | |
| 8dd0bce am 4e65a05f: am ac5f9628: am 7df411d0: Merge "Clear calling identity before getting the current user." into mnc-dev | |
| 4e65a05 am ac5f9628: am 7df411d0: Merge "Clear calling identity before getting the current user." into mnc-dev | |
| c74a43b am 4fb3e9b3: am 50ff3afb: Start pulse fading exactly when screen is turned on | |
| 4fb3e9b am 50ff3afb: Start pulse fading exactly when screen is turned on | |
| c81daf7 am db56efe6: am 2152edeb: am 16fa58cb: Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev | |
| db56efe am 2152edeb: am 16fa58cb: Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev | |
| 13845ae am b2d4c550: am b47890c4: am 7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev | |
| 1058bf0 am e2fd2850: am 9e398eb5: am 81f3a85a: Merge "Fix issue #22940169: "pm grant" can no longer grant permissions..." into mnc-dev | |
| b2d4c55 am b47890c4: am 7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev | |
| e2fd285 am 9e398eb5: am 81f3a85a: Merge "Fix issue #22940169: "pm grant" can no longer grant permissions..." into mnc-dev | |
| 340314f am 7c3d595a: am 4b655fd1: am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev | |
| 7c3d595 am 4b655fd1: am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev | |
| 4efd3f2 am d28991a5: am b6f5bcd0: am cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev | |
| d28991a am b6f5bcd0: am cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev | |
| b189e87 am e135f5b7: am 672c0a75: am 37dd5240: Merge "Doc change: Update preview pages for dp3." into mnc-dev | |
| e135f5b am 672c0a75: am 37dd5240: Merge "Doc change: Update preview pages for dp3." into mnc-dev | |
| bafc9ee am 7453a0aa: am 587488e0: am 81eeef58: Merge "Update time when turning on screen, in addition to waking up" into mnc-dev | |
| 7453a0a am 587488e0: am 81eeef58: Merge "Update time when turning on screen, in addition to waking up" into mnc-dev | |
| ddd3e32 am d6fb8958: Merge "Add a setting to enable cellular on boot." into cw-e-dev | |
| d6fb895 Merge "Add a setting to enable cellular on boot." into cw-e-dev | |
| 5169535 am a1bed325: am e41c18d6: am f7557729: Merge "docs: Update uses-sdk-element page with API 23 (M) listing" into mnc-dev | |
| a1bed32 am e41c18d6: am f7557729: Merge "docs: Update uses-sdk-element page with API 23 (M) listing" into mnc-dev | |
| 9b8bc3d am db5b38b2: am 195b1fd2: am 8d149d7f: Merge "docs: Update developer docs make file to include API 23" into mnc-dev | |
| db5b38b am 195b1fd2: am 8d149d7f: Merge "docs: Update developer docs make file to include API 23" into mnc-dev | |
| 80ca7d2 am 28918812: am 045ffe31: am 226ae04d: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev | |
| 2891881 am 045ffe31: am 226ae04d: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev | |
| a7e07fd am 1f567039: am 60823dc1: am 90460c79: Merge "Add more intelligence to bluetooth connection state" into mnc-dev | |
| 1f56703 am 60823dc1: am 90460c79: Merge "Add more intelligence to bluetooth connection state" into mnc-dev | |
| a35ada4 am 3ab3ffc6: am b7ae1990: am bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev | |
| 3ab3ffc am b7ae1990: am bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev | |
| 4846c62 am 24cf8349: am ac9fbe9d: Merge "Do not vibrate if we don\'t have a fingerprint client" into mnc-dr-dev | |
| 24cf834 am ac9fbe9d: Merge "Do not vibrate if we don\'t have a fingerprint client" into mnc-dr-dev | |
| 5f3af14 am d59f5c02: am a78181b6: Merge "Fix touch-to-wake while dozing" into mnc-dr-dev | |
| deb6a3a am 73d9e1ce: am 69082a29: Merge "Require strong authentication after a timeout" into mnc-dr-dev | |
| 40bc206 am a54d4583: am 9512a857: am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev | |
| d59f5c0 am a78181b6: Merge "Fix touch-to-wake while dozing" into mnc-dr-dev | |
| 73d9e1c am 69082a29: Merge "Require strong authentication after a timeout" into mnc-dr-dev | |
| a54d458 am 9512a857: am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev | |
| b4ac378 am d913d78a: am ea68c4ce: am c97509c0: Merge "Update ifaces when global restriction changes." into mnc-dev | |
| d913d78 am ea68c4ce: am c97509c0: Merge "Update ifaces when global restriction changes." into mnc-dev | |
| b40108f am 289ecbbf: am 737aed41: Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev | |
| 289ecbb am 737aed41: Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev | |
| cf2d44b am 855a862f: am c98a786c: am beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev | |
| 855a862 am c98a786c: am beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev | |
| f21ecd0 am 6986410a: am 5679800f: am 242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev | |
| 6986410 am 5679800f: am 242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev | |
| 4a6b0c9 am 79fdfecb: am 954ca10e: am ad285c16: Merge "Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."" into mnc-dev | |
| 79fdfec am 954ca10e: am ad285c16: Merge "Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."" into mnc-dev | |
| ea73528 am afdfc2c0: am 192ca56d: am c0a4883d: Merge "Prevent overlap of color views in landscape" into mnc-dev | |
| afdfc2c am 192ca56d: am c0a4883d: Merge "Prevent overlap of color views in landscape" into mnc-dev | |
| fc10c98 am 36ea805f: am 670b8b59: am 0c762957: Merge "Fix tuner for secondary users" into mnc-dev | |
| 29e963a am b689d776: (-s ours) am 9e47ba6e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 36ea805 am 670b8b59: am 0c762957: Merge "Fix tuner for secondary users" into mnc-dev | |
| b689d77 am 9e47ba6e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| ae878c8 am 6379ddbe: am 3f5d76dd: am 7f2f96cc: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev | |
| f5107e3 am d43f4d92: am 8af3406a: am 24e4d48f: Merge "Promote system app permissions" into mnc-dev | |
| 8f527a8 am d3b7314e: am d9c906e7: am e20493ea: Merge "Log last filtered sensor timestamp." into mnc-dev | |
| 6379ddb am 3f5d76dd: am 7f2f96cc: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev | |
| d43f4d9 am 8af3406a: am 24e4d48f: Merge "Promote system app permissions" into mnc-dev | |
| d3b7314 am d9c906e7: am e20493ea: Merge "Log last filtered sensor timestamp." into mnc-dev | |
| a181770 Add a setting to enable cellular on boot. | |
| c42acbd am 088c4155: am 86b6d204: am bf88205b: Fall back to persist.sys.language/country if locale isn\'t set. | |
| 088c415 am 86b6d204: am bf88205b: Fall back to persist.sys.language/country if locale isn\'t set. | |
| 5665e04 am ab5bd5d8: am e950a4b2: am e19b76cb: Merge "Add more examples of generating/importing keys to Javadocs." into mnc-dev | |
| ab5bd5d am e950a4b2: am e19b76cb: Merge "Add more examples of generating/importing keys to Javadocs." into mnc-dev | |
| 64fcffd am f9ddfd23: am c7f2030f: am e022cb08: Merge "Don\'t attempt to stop the receive thread if we never started it." into mnc-dev | |
| f9ddfd2 am c7f2030f: am e022cb08: Merge "Don\'t attempt to stop the receive thread if we never started it." into mnc-dev | |
| acd8b54 am cbb24e24: am 332d6653: am 968fc3ab: Merge "Fix deadlock." into mnc-dev | |
| cbb24e2 am 332d6653: am 968fc3ab: Merge "Fix deadlock." into mnc-dev | |
| bcca1fd am edf02322: am b46c2a81: am 77b0d6e9: Merge "New landscape Navigation bar icons." into mnc-dev | |
| edf0232 am b46c2a81: am 77b0d6e9: Merge "New landscape Navigation bar icons." into mnc-dev | |
| 8d97651 am 13c9828f: am c40d6799: Merge "Indicating fingerprint error messages on the bouncer now" into mnc-dr-dev | |
| 13c9828 am c40d6799: Merge "Indicating fingerprint error messages on the bouncer now" into mnc-dr-dev | |
| d200aa4 am a546e5be: am ba1e3915: am 59123b9b: Merge "When closing task stack remove reference to display content." into mnc-dev | |
| a546e5b am ba1e3915: am 59123b9b: Merge "When closing task stack remove reference to display content." into mnc-dev | |
| 4ce98e4 am e92b1374: am ea5ce408: am 15f704e7: Merge "Fix issue #23122445: Add 420 density" into mnc-dev | |
| 0c44284 am b3a6244c: am ceada4fd: am e43d43c3: Merge "Fixed issue with moveTaskToBack on single stack devices" into mnc-dev | |
| e92b137 am ea5ce408: am 15f704e7: Merge "Fix issue #23122445: Add 420 density" into mnc-dev | |
| b3a6244 am ceada4fd: am e43d43c3: Merge "Fixed issue with moveTaskToBack on single stack devices" into mnc-dev | |
| 167d7af am 5717273b: am dd7bc4ae: am 494d6e9b: [fingerprint] use credential owner in FingerprintService | |
| ae9e513 am 4f600aab: am ec85b522: am 8851608d: Merge "Always call onProvidersChanged() when packages containing widgets are updated." into mnc-dev | |
| 5717273 am dd7bc4ae: am 494d6e9b: [fingerprint] use credential owner in FingerprintService | |
| 4f600aa am ec85b522: am 8851608d: Merge "Always call onProvidersChanged() when packages containing widgets are updated." into mnc-dev | |
| 5d3a382 am 6d7af4b7: Merge "DO NOT MERGE Allow a custom component to handle network policy notifications" into cw-e-dev | |
| 61c70aa am f306cef4: am 959431bc: Wake device when Keyguard invisible and getting fingerprint | |
| 6d7af4b Merge "DO NOT MERGE Allow a custom component to handle network policy notifications" into cw-e-dev | |
| f306cef am 959431bc: Wake device when Keyguard invisible and getting fingerprint | |
| c157e49 am ebd0b26b: am 5ace41f5: am 19aa341a: Merge "Save data registration roaming state" into mnc-dev | |
| ebd0b26 am 5ace41f5: am 19aa341a: Merge "Save data registration roaming state" into mnc-dev | |
| 143ebdb DO NOT MERGE Allow a custom component to handle network policy notifications | |
| 2c230a0 am 5d1c34f5: Merge "Add actions and extras for custom voicemail notification handling." into cw-e-dev | |
| 5d1c34f Merge "Add actions and extras for custom voicemail notification handling." into cw-e-dev | |
| 62db64f am 83ec22a8: am af8c19e7: am 7d85b543: Merge "Make DelegateManager thread safe" into mnc-dev | |
| 83ec22a am af8c19e7: am 7d85b543: Merge "Make DelegateManager thread safe" into mnc-dev | |
| b2087fa am f3d04cbf: am bb03bf05: am 105febd2: Merge "Don\'t re-wrap alert dialog context" into mnc-dev | |
| 570a236 am a8431e8c: am bfd62580: am 11104791: Merge "Ensure ripple mask is drawn at correct position" into mnc-dev | |
| f3d04cb am bb03bf05: am 105febd2: Merge "Don\'t re-wrap alert dialog context" into mnc-dev | |
| a8431e8 am bfd62580: am 11104791: Merge "Ensure ripple mask is drawn at correct position" into mnc-dev | |
| 1743988 am 6c3a468c: am e720297f: am b4eb0640: Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev | |
| 6c3a468 am e720297f: am b4eb0640: Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev | |
| 49ae8f2 am d7468176: am 5bba07eb: am ad7719de: Merge "Crash apps with bad notification icons." into mnc-dev | |
| d746817 am 5bba07eb: am ad7719de: Merge "Crash apps with bad notification icons." into mnc-dev | |
| 413493b am c7789c3e: am 36052477: Merge "Add setting to disable camera gesture" into mnc-dr-dev | |
| c7789c3 am 36052477: Merge "Add setting to disable camera gesture" into mnc-dr-dev | |
| 84bd217 am 8e85fdfe: am 467951ee: am 4dbb37ae: Merge "Update setApplicationRestrictions documentation" into mnc-dev | |
| 8e85fdf am 467951ee: am 4dbb37ae: Merge "Update setApplicationRestrictions documentation" into mnc-dev | |
| 1be6e1c am 9502cc54: am d0669693: am b08c24a3: Frameworks/base: Disable Clang in core/jni | |
| 9502cc5 am d0669693: am b08c24a3: Frameworks/base: Disable Clang in core/jni | |
| bfa04f4 am b12ca163: am bc58c945: am c00b1067: Merge "Pushing the startActivity before the calls to remove task." into mnc-dev | |
| b12ca16 am bc58c945: am c00b1067: Merge "Pushing the startActivity before the calls to remove task." into mnc-dev | |
| 231bdde am 1785c097: am 3767d85c: am f8359cfb: Merge "Don\'t show fingerprint cancellation messages in keyguard" into mnc-dev | |
| 1785c09 am 3767d85c: am f8359cfb: Merge "Don\'t show fingerprint cancellation messages in keyguard" into mnc-dev | |
| afacdbe am 09e77852: am 5cf89a01: am b2b02092: Merge "Fix issue #23037899: Support for Battery Optimization permission + Dialog" into mnc-dev | |
| 09e7785 am 5cf89a01: am b2b02092: Merge "Fix issue #23037899: Support for Battery Optimization permission + Dialog" into mnc-dev | |
| ae88437 am 83682890: am 2c8c251e: am 77d5b914: Merge "DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED" into mnc-dev | |
| d4c0b52 am 1e05bc6f: am 5ca842ae: am 5d05a24c: Merge "Fix wifi disable during restore" into mnc-dev | |
| 8368289 am 2c8c251e: am 77d5b914: Merge "DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED" into mnc-dev | |
| 1e05bc6 am 5ca842ae: am 5d05a24c: Merge "Fix wifi disable during restore" into mnc-dev | |
| 2a532f2 Add actions and extras for custom voicemail notification handling. | |
| 53c8948 am 49da3cbb: am 862840d6: am 301dfe08: Merge "[Fix getAccounts MANAGE_USERS permission]" into mnc-dev | |
| 49da3cb am 862840d6: am 301dfe08: Merge "[Fix getAccounts MANAGE_USERS permission]" into mnc-dev | |
| 608f228 am 31a0f46f: (-s ours) am 3ea5cfa8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 31a0f46 am 3ea5cfa8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| e869b39 am 20272bec: am c207c943: am c5283927: Close ZipFiles correctly in WebViewFactory. | |
| 20272be am c207c943: am c5283927: Close ZipFiles correctly in WebViewFactory. | |
| 761ec60 am 8cb92371: Merge "add call back intents for clearing missed calls and calling back." into cw-e-dev | |
| fcb34b4 am 850e5ee1: am a5c0c209: am 4218e46a: Merge "Initialize network name better in NetworkController" into mnc-dev | |
| 8cb9237 Merge "add call back intents for clearing missed calls and calling back." into cw-e-dev | |
| 8d41d1d add call back intents for clearing missed calls and calling back. | |
| 850e5ee am a5c0c209: am 4218e46a: Merge "Initialize network name better in NetworkController" into mnc-dev | |
| fc28481 am 0c4999c2: Merge "Add action for notifying custom components of missed calls." into cw-e-dev | |
| 0c4999c Merge "Add action for notifying custom components of missed calls." into cw-e-dev | |
| ba6fad7 am ac112990: am e6639066: am a2e39c6a: Merge "Filtering Remote-Submix and Back-mic devices from AudioDeviceInfo API." into mnc-dev | |
| fa63af3 am c81abd9a: am 1d19dc58: am beda6e2b: Merge "Revert "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test."" into mnc-dev | |
| ac11299 am e6639066: am a2e39c6a: Merge "Filtering Remote-Submix and Back-mic devices from AudioDeviceInfo API." into mnc-dev | |
| c81abd9 am 1d19dc58: am beda6e2b: Merge "Revert "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test."" into mnc-dev | |
| 2c63624 am e618963b: (-s ours) am 035e10f8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| e618963 am 035e10f8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 8eafcc1 am bf965352: (-s ours) am e53e421e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| cc92ae9 am 2c997149: (-s ours) am ba4a568c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 6468a29 am 326afbf4: (-s ours) am 2393f7e2: (-s ours) Import translations. DO NOT MERGE | |
| bf96535 am e53e421e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 2c99714 am ba4a568c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 326afbf am 2393f7e2: (-s ours) Import translations. DO NOT MERGE | |
| 546a344 am e12a685c: am 02d6c013: am 90b030ba: Merge "Do not show removed permissions in the UI - framework" into mnc-dev | |
| e12a685 am 02d6c013: am 90b030ba: Merge "Do not show removed permissions in the UI - framework" into mnc-dev | |
| e98e0b4 am 0e6bd33e: am 42f6d217: am fc81be94: Merge "Fix issue #23037093: "Write system settings" permission value fails..." into mnc-dev | |
| 0e6bd33 am 42f6d217: am fc81be94: Merge "Fix issue #23037093: "Write system settings" permission value fails..." into mnc-dev | |
| 1a23251 am 3b006485: am ae81ebf8: Merge "camera2: Update DngCreator with bad pixel opcode." into mnc-dr-dev | |
| 3b00648 am ae81ebf8: Merge "camera2: Update DngCreator with bad pixel opcode." into mnc-dr-dev | |
| ef56bfb am 3e96e06f: Merge "Make sure that changes to UI in SwipeDismissLayout are on UI thread." into cw-e-dev | |
| 99271a3 am 9751afcf: am 26ab6ed3: am 70f998e5: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev | |
| 3e96e06 Merge "Make sure that changes to UI in SwipeDismissLayout are on UI thread." into cw-e-dev | |
| 9751afc am 26ab6ed3: am 70f998e5: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev | |
| 8e63bbf am efa4dee1: am 977d421a: am f0e5501e: Merge "Fix issue #22989030: Separate battery whitelists" into mnc-dev | |
| 8a148a3 Make sure that changes to UI in SwipeDismissLayout are on UI thread. | |
| efa4dee am 977d421a: am f0e5501e: Merge "Fix issue #22989030: Separate battery whitelists" into mnc-dev | |
| b64f25a am 253f2c33: am 2327dd3f: am 9d929558: Merge "Correctly skip files that are excluded from restore" into mnc-dev | |
| 253f2c3 am 2327dd3f: am 9d929558: Merge "Correctly skip files that are excluded from restore" into mnc-dev | |
| 558f103 am 74f93f9a: am d7408469: am 027e3b7f: Merge "Fix check for caller being the active network scorer" into mnc-dev | |
| 74f93f9 am d7408469: am 027e3b7f: Merge "Fix check for caller being the active network scorer" into mnc-dev | |
| 2c661d5 am ed73021b: am 543fd8be: am 288e82f8: Merge "Keep intent verification status of system apps when uninstalling them." into mnc-dev | |
| ed73021 am 543fd8be: am 288e82f8: Merge "Keep intent verification status of system apps when uninstalling them." into mnc-dev | |
| 3d66338 am 51e2a467: am 04b96145: am 9dc4d50b: Merge "Update Navigation bar assets." into mnc-dev | |
| 51e2a46 am 04b96145: am 9dc4d50b: Merge "Update Navigation bar assets." into mnc-dev | |
| 635270c am a01965e2: am 69a07d40: am 69ed3308: Merge "Allow system to disable lockscreen" into mnc-dev | |
| a01965e am 69a07d40: am 69ed3308: Merge "Allow system to disable lockscreen" into mnc-dev | |
| d725629 am 3ad53f76: am 85b3d034: am 1fbc1b3b: Merge "Fix partial user cleanup on restart" into mnc-dev | |
| 9427581 am 117f024b: am db0cff71: am c376afb4: Merge "Wait a bit longer for wifi to shut down before rewriting the config" into mnc-dev | |
| 70419f5 am 5096ee81: am 0fe3e455: am 3d06ea03: Merge "Debugging for issue #22556778: Starting under voice control not allowed" into mnc-dev | |
| 4e47ff8 am 1dd818db: am eed29a71: am 53d6cddb: Merge "Fix issue #22846750: Starting Screenie Now On Tap crashes USA Today" into mnc-dev | |
| 3ad53f7 am 85b3d034: am 1fbc1b3b: Merge "Fix partial user cleanup on restart" into mnc-dev | |
| 117f024 am db0cff71: am c376afb4: Merge "Wait a bit longer for wifi to shut down before rewriting the config" into mnc-dev | |
| 5096ee8 am 0fe3e455: am 3d06ea03: Merge "Debugging for issue #22556778: Starting under voice control not allowed" into mnc-dev | |
| 1dd818d am eed29a71: am 53d6cddb: Merge "Fix issue #22846750: Starting Screenie Now On Tap crashes USA Today" into mnc-dev | |
| 1c4c740 am 97e77627: Merge commit \'9dd2663d\' into mm | |
| 97e7762 Merge commit '9dd2663d' into mm | |
| 5ed0338 am 1f514608: am 5a624aad: am 38d30dc5: Merge "Immediately kill a shared user process on a permission revocation." into mnc-dev | |
| 1f51460 am 5a624aad: am 38d30dc5: Merge "Immediately kill a shared user process on a permission revocation." into mnc-dev | |
| 2ba9fc1 am e810b397: am 49541edb: am 77566dd1: Merge "Use BluetoothController for status bar icon status" into mnc-dev | |
| e810b39 am 49541edb: am 77566dd1: Merge "Use BluetoothController for status bar icon status" into mnc-dev | |
| 2fe5137 am 22d20774: am 20de377b: am 1d7c3254: Merge "Correctly propagate permissions when uninstalling updates." into mnc-dev | |
| 22d2077 am 20de377b: am 1d7c3254: Merge "Correctly propagate permissions when uninstalling updates." into mnc-dev | |
| 4aaafab am 10068894: am 60f7eb38: am a0ef49c4: Look for recent tasks in live stacks. | |
| 1006889 am 60f7eb38: am a0ef49c4: Look for recent tasks in live stacks. | |
| c344ac5 am fbdf2032: am cfe5778d: am 8f26616d: Merge "LayoutLib: Switch SimpleDateFormat to icu." into mnc-dev | |
| fbdf203 am cfe5778d: am 8f26616d: Merge "LayoutLib: Switch SimpleDateFormat to icu." into mnc-dev | |
| 6379029 am 2081769f: am 618d96da: am 385ce0a3: Merge "Replace Locale.getDefault with custom impl." into mnc-dev | |
| 2081769 am 618d96da: am 385ce0a3: Merge "Replace Locale.getDefault with custom impl." into mnc-dev | |
| 981c456 am 7ab11e45: am 5fd47543: am 85c73c40: Merge "[UserManager] expose method to retrieve credential owner" into mnc-dev | |
| 7ab11e4 am 5fd47543: am 85c73c40: Merge "[UserManager] expose method to retrieve credential owner" into mnc-dev | |
| 1353b0f am 6bf21c3a: am b762a9a5: am bb55aa1a: Merge "Fixing issue with empty Recents screen." into mnc-dev | |
| 6bf21c3 am b762a9a5: am bb55aa1a: Merge "Fixing issue with empty Recents screen." into mnc-dev | |
| d385c56 am 9bf7f2a4: am be30c10e: am a89e9f6d: Merge "MediaSync: fix API comments." into mnc-dev | |
| 9bf7f2a am be30c10e: am a89e9f6d: Merge "MediaSync: fix API comments." into mnc-dev | |
| 4869733 am 0c2df694: am 7d28ad9b: am cb54ffb2: Merge "Protect runtime storage mount points." into mnc-dev | |
| 0c2df69 am 7d28ad9b: am cb54ffb2: Merge "Protect runtime storage mount points." into mnc-dev | |
| fd18fc8 am 8a38babb: am 062130d9: am 93f3fc87: Merge "add metrics to assistant" into mnc-dev | |
| f7a2eb5 am a17c5bac: am dc89dafa: am 339a9bbf: Merge "Use realActivity as indicator for task locking" into mnc-dev | |
| 37a8bf6 am cee66550: am 8695ec34: am 38c0fbda: Merge "Pregrant unrevokable storage permission to the CertInstaller" into mnc-dev | |
| 8a38bab am 062130d9: am 93f3fc87: Merge "add metrics to assistant" into mnc-dev | |
| a17c5ba am dc89dafa: am 339a9bbf: Merge "Use realActivity as indicator for task locking" into mnc-dev | |
| cee6655 am 8695ec34: am 38c0fbda: Merge "Pregrant unrevokable storage permission to the CertInstaller" into mnc-dev | |
| 97f294f am 5ccd64b4: am 80688be6: am af7748ef: Merge "Consider channel index masks when calculating channel counts." into mnc-dev | |
| 1b8f8ac am 4463053e: am a154b332: am c770b7a5: Merge "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test." into mnc-dev | |
| 5ccd64b am 80688be6: am af7748ef: Merge "Consider channel index masks when calculating channel counts." into mnc-dev | |
| 4463053 am a154b332: am c770b7a5: Merge "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test." into mnc-dev | |
| 3fd4273 am 8a782c9d: am db576e1d: am c7f8133f: Merge "Update anchor background on the correct view in PopupWindow" into mnc-dev | |
| 8a782c9 am db576e1d: am c7f8133f: Merge "Update anchor background on the correct view in PopupWindow" into mnc-dev | |
| aacc797 am 41dfffb3: am db6a6a21: am 6b0f1e78: Merge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev | |
| 41dfffb am db6a6a21: am 6b0f1e78: Merge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev | |
| f7d8577 am 42c70645: am aed2e8ba: am da493aa6: Merge "Avoid changing internal state of shared drawable" into mnc-dev | |
| 42c7064 am aed2e8ba: am da493aa6: Merge "Avoid changing internal state of shared drawable" into mnc-dev | |
| 351c3bd am 54f1ffcd: am 2d1cf627: am 190a88d2: Merge "Update documentation of DevicePolicyManager intents." into mnc-dev | |
| 54f1ffc am 2d1cf627: am 190a88d2: Merge "Update documentation of DevicePolicyManager intents." into mnc-dev | |
| a7b3694 am b9bdde13: am 1663c75f: am d5a6df6d: Merge "Make the NullVibrator really null." into mnc-dev | |
| 0126d45 am 43a95cf1: am 44a14ef7: am eb7e3d7e: Merge "Don\'t dispatch when non-interactive and the display is off." into mnc-dev | |
| b9bdde1 am 1663c75f: am d5a6df6d: Merge "Make the NullVibrator really null." into mnc-dev | |
| 43a95cf am 44a14ef7: am eb7e3d7e: Merge "Don\'t dispatch when non-interactive and the display is off." into mnc-dev | |
| 4b74d66 am 48d146c9: am c694ab32: am a3b5a612: Merge "Store ringer mode on entering DND mode so it can be restored on exit." into mnc-dev | |
| 48d146c am c694ab32: am a3b5a612: Merge "Store ringer mode on entering DND mode so it can be restored on exit." into mnc-dev | |
| ecbd1ce am 511cf5b8: (-s ours) am 227d704f: (-s ours) am 375c792c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev | |
| 511cf5b am 227d704f: (-s ours) am 375c792c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev | |
| 0b09eef am e69acd7a: am 104999b9: am d14c4844: Merge "Pass connection configuration when setting wifi info" into mnc-dev | |
| b7c4199 am e992c927: am 89718b2b: am be948f5a: Merge "Removing tethering overlay for mcc202-mnc05 (VF Greece)." into mnc-dev | |
| 4a66bbf am 5f96eb0c: am 6fdb85d3: am 120fc2c7: Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev | |
| e80dbae am 7be1e286: am cac65feb: am f0affc6d: Merge "Correctly hide setConnectionService" into mnc-dev | |
| 0889fd2 am 0e0d254c: am c34288be: am 2c1a22d9: Merge changes I85106f37,I7db398aa into mnc-dev | |
| e69acd7 am 104999b9: am d14c4844: Merge "Pass connection configuration when setting wifi info" into mnc-dev | |
| e992c92 am 89718b2b: am be948f5a: Merge "Removing tethering overlay for mcc202-mnc05 (VF Greece)." into mnc-dev | |
| 5f96eb0 am 6fdb85d3: am 120fc2c7: Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev | |
| 7be1e28 am cac65feb: am f0affc6d: Merge "Correctly hide setConnectionService" into mnc-dev | |
| 0e0d254 am c34288be: am 2c1a22d9: Merge changes I85106f37,I7db398aa into mnc-dev | |
| 34f4e88 am ffd8889a: am f76806a9: Merge "Add boost to increase the load on newly-forked zygote processes." into mnc-dr-dev | |
| ffd8889 am f76806a9: Merge "Add boost to increase the load on newly-forked zygote processes." into mnc-dr-dev | |
| 29e678b am eda52f0a: am 4d1128b2: am 8eaf18b0: Merge "Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices." into mnc-dev | |
| eda52f0 am 4d1128b2: am 8eaf18b0: Merge "Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices." into mnc-dev | |
| 8d5e35a am 65b33c92: am 7cc0cda1: am 881cd155: Merge "MidiManager: use ConcurrentHashMap" into mnc-dev | |
| 65b33c9 am 7cc0cda1: am 881cd155: Merge "MidiManager: use ConcurrentHashMap" into mnc-dev | |
| 469840a am c3213285: am 072097bd: am 8cc00243: Merge "Keep OverScroller.SplineOverScroller state consistent." into mnc-dev | |
| c321328 am 072097bd: am 8cc00243: Merge "Keep OverScroller.SplineOverScroller state consistent." into mnc-dev | |
| 524e2f9 am 721a1fcd: am a512415e: am db221acc: Merge "Reduce log spam for the ease of debugging Bug 22857361." into mnc-dev | |
| c89da1c am 1820dc06: am 106e4f4c: am cda6e878: Implement Bluetooth settings factory reset (2/5) | |
| 721a1fc am a512415e: am db221acc: Merge "Reduce log spam for the ease of debugging Bug 22857361." into mnc-dev | |
| 1820dc0 am 106e4f4c: am cda6e878: Implement Bluetooth settings factory reset (2/5) | |
| 4bd3b24 am 5082b180: am ffb72473: Merge "Remove EXTRA_CALL_HISTORY_INFO." into mnc-dr-dev | |
| 5082b180 am ffb72473: Merge "Remove EXTRA_CALL_HISTORY_INFO." into mnc-dr-dev | |
| ac96d3a am e7359b09: am ef7deb90: am e72377e1: Merge "Fix app ops regressions introduced by the per UID policy change" into mnc-dev | |
| c439c23 am bf026e68: am b0e9e731: am bce3eb22: Merge "Fix incorrect default wifi power draw values" into mnc-dev | |
| e7359b0 am ef7deb90: am e72377e1: Merge "Fix app ops regressions introduced by the per UID policy change" into mnc-dev | |
| c0ad575 am 6b6b9cd9: am 01496367: am ab868eff: Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into mnc-dev | |
| ff1e7ad am 84c1eb6d: am a29e0501: am 86ee3a57: Merge "READ_SMS allows getLine1Number() [1/3]" into mnc-dev | |
| bf026e6 am b0e9e731: am bce3eb22: Merge "Fix incorrect default wifi power draw values" into mnc-dev | |
| 6b6b9cd am 01496367: am ab868eff: Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into mnc-dev | |
| 84c1eb6 am a29e0501: am 86ee3a57: Merge "READ_SMS allows getLine1Number() [1/3]" into mnc-dev | |
| 3c204b6 am 8e4a16b8: am a02bd53e: am 6bdc4637: Merge "NPE occured when trying to parcel voice features." into mnc-dev | |
| c3e4f31 am 76b07705: am 4d2eec14: am df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev | |
| 8e4a16b am a02bd53e: am 6bdc4637: Merge "NPE occured when trying to parcel voice features." into mnc-dev | |
| 76b0770 am 4d2eec14: am df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev | |
| af0afe8 am c0d2e7a6: (-s ours) am e229337b: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| c0d2e7a am e229337b: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 8ccb29b am 28739294: (-s ours) am 90b69615: (-s ours) Import translations. DO NOT MERGE | |
| 2873929 am 90b69615: (-s ours) Import translations. DO NOT MERGE | |
| 41779e4 am 95297732: am 86e7d135: resolved conflicts for merge of dbc4edcc to mnc-dr-dev | |
| 9529773 am 86e7d135: resolved conflicts for merge of dbc4edcc to mnc-dr-dev | |
| 876b82e am 37b18434: am 815a6b6b: am 519adb50: Merge "Create a special CONSTRAINED font bucket in frameworks." into mnc-dev | |
| 37b1843 am 815a6b6b: am 519adb50: Merge "Create a special CONSTRAINED font bucket in frameworks." into mnc-dev | |
| e757715 am 97b46064: am 3832b13c: am 54cea234: Merge "Boot loop when SSID has non UTF-8 character in the name" into mnc-dev | |
| 97b4606 am 3832b13c: am 54cea234: Merge "Boot loop when SSID has non UTF-8 character in the name" into mnc-dev | |
| 9a7040e am 229347ec: am c632313e: am 2094a702: Merge "Unregister the existing callback when MediaProjection stops" into mnc-dev | |
| 229347e am c632313e: am 2094a702: Merge "Unregister the existing callback when MediaProjection stops" into mnc-dev | |
| 294d1ee am 026457a4: am 64e26348: am 0d616883: Merge "Fix moving of apps into legacy ASEC." into mnc-dev | |
| 026457a4 am 64e26348: am 0d616883: Merge "Fix moving of apps into legacy ASEC." into mnc-dev | |
| 9485856 am c3080d78: am 841d7b75: am 52d3312a: Merge "Make ResourceKey always use non-null configuration override." into mnc-dev | |
| c3080d7 am 841d7b75: am 52d3312a: Merge "Make ResourceKey always use non-null configuration override." into mnc-dev | |
| d9b729c am 992ae880: am e8c888c4: am 385dfd34: Merge "Charge apps for wifi tx time while scanning" into mnc-dev | |
| 992ae88 am e8c888c4: am 385dfd34: Merge "Charge apps for wifi tx time while scanning" into mnc-dev | |
| 9d15a49 am 1c53d91e: am 65b84a16: am 78b8d4aa: Mark missed calls as read in calllog restore(2/2) | |
| 1c53d91 am 65b84a16: am 78b8d4aa: Mark missed calls as read in calllog restore(2/2) | |
| cbda3dc am 0ca9e2df: am 4032c94d: am fc5a4bf0: Merge "AudioService: check for audio device connection success" into mnc-dev | |
| 0ca9e2d am 4032c94d: am fc5a4bf0: Merge "AudioService: check for audio device connection success" into mnc-dev | |
| c397305 am b381d697: am 073bfb9b: am ce68917c: Merge "Ensure per package and per UID state share same package settings." into mnc-dev | |
| f4b8c34 am 9aebdb4c: am d7d14033: am 2d34a8b7: Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev | |
| 94933e4 am 2eafb06f: am b2c71814: am 97b68bbe: Merge "UsbDeviceManager: fix b/21429947 regression (try #2)" into mnc-dev | |
| b381d69 am 073bfb9b: am ce68917c: Merge "Ensure per package and per UID state share same package settings." into mnc-dev | |
| 9aebdb4 am d7d14033: am 2d34a8b7: Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev | |
| 2eafb06 am b2c71814: am 97b68bbe: Merge "UsbDeviceManager: fix b/21429947 regression (try #2)" into mnc-dev | |
| eca3760 am 3adc6671: Merge "Fix doc typo for default wearable notification size." into cw-e-dev | |
| 3adc667 Merge "Fix doc typo for default wearable notification size." into cw-e-dev | |
| 67716c1 am e28c5d62: am a975a844: am 70e5db94: Merge "Fix crash in kModeProcessNoContext" into mnc-dev | |
| e28c5d6 am a975a844: am 70e5db94: Merge "Fix crash in kModeProcessNoContext" into mnc-dev | |
| aa4f4bf Fix doc typo for default wearable notification size. | |
| 572cc8c am 8d45b98d: am 36fc79e2: am 35a1a209: Merge "Include dnd status in bugreports." into mnc-dev | |
| 8d45b98 am 36fc79e2: am 35a1a209: Merge "Include dnd status in bugreports." into mnc-dev | |
| 1dee8d4 am c62598bc: am d5fe5a8f: am fad3c663: Merge "Remove spurious syncmanager wake-ups" into mnc-dev | |
| c62598b am d5fe5a8f: am fad3c663: Merge "Remove spurious syncmanager wake-ups" into mnc-dev | |
| 573e92f am 8a4465e8: am 682e0237: am 845d14db: Revert "Permissions: GET_ACCOUNTS permission cleanup" | |
| 8a4465e am 682e0237: am 845d14db: Revert "Permissions: GET_ACCOUNTS permission cleanup" | |
| a93e7e5 am c170d7de: am ae351ec1: am b2690f38: Merge "Fail silently if a process trys to launch an acitvity for background user" into mnc-dev | |
| c170d7d am ae351ec1: am b2690f38: Merge "Fail silently if a process trys to launch an acitvity for background user" into mnc-dev | |
| 5229149 am 88d616c8: am bbb17765: am 55dbf2d7: Merge "QS: Allow Flashlight Tile to handle reset state" into mnc-dev | |
| 88d616c am bbb17765: am 55dbf2d7: Merge "QS: Allow Flashlight Tile to handle reset state" into mnc-dev | |
| b0ab2d9 am ce3ef9c8: am 4e07468f: am 29b8c4ab: Reset the pointer to the Bluetooth GATT service | |
| ce3ef9c am 4e07468f: am 29b8c4ab: Reset the pointer to the Bluetooth GATT service | |
| 347c885 am 4eb6c10d: am 7608f541: am 59d72c86: Merge "BatteryStats: Add debug logging to find source of b/22716723" into mnc-dev | |
| 4eb6c10 am 7608f541: am 59d72c86: Merge "BatteryStats: Add debug logging to find source of b/22716723" into mnc-dev | |
| 14bafef am 24922798: am b20a8ed9: am d9b0f843: Merge "Fix issue #22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev | |
| 2492279 am b20a8ed9: am d9b0f843: Merge "Fix issue #22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev | |
| fca292a am 54c7ddbc: am 482ba343: am 04e2cf6b: Merge "Make default selection for contact sharing to "Checked"." into mnc-dev | |
| 025432e am 26e11906: am ce8921c3: am 911bd0d3: Merge "Set broadcast nextReceiver correctly when package is disabled" into mnc-dev | |
| 0429246 am 0c9ec1f2: am 2e529712: am c03ab87a: Merge "Disable skipping frames on empty damage" into mnc-dev | |
| 5290bf5 am db67d5b7: am ba6cdbfd: am ac8c9861: Merge "Notify settings URI change without a lock held" into mnc-dev | |
| 35c68de am 5dd9ef04: am b0bc8368: am 3011f645: Merge "Fix issue #22912704: "android.process.acore has stopped" dialog keeps popping up" into mnc-dev | |
| 96160de am 8e645d58: am 649c3c44: am 7290d93d: Merge "Yell loudly about undefined behind in Bitmap, but work anyway" into mnc-dev | |
| c773a68 am cdd4cfb9: am d4842c37: am 0faca96f: Merge "Avoid deadlock by broadcasting outside lock." into mnc-dev | |
| 54c7ddb am 482ba343: am 04e2cf6b: Merge "Make default selection for contact sharing to "Checked"." into mnc-dev | |
| 26e1190 am ce8921c3: am 911bd0d3: Merge "Set broadcast nextReceiver correctly when package is disabled" into mnc-dev | |
| 0c9ec1f am 2e529712: am c03ab87a: Merge "Disable skipping frames on empty damage" into mnc-dev | |
| db67d5b am ba6cdbfd: am ac8c9861: Merge "Notify settings URI change without a lock held" into mnc-dev | |
| 5dd9ef0 am b0bc8368: am 3011f645: Merge "Fix issue #22912704: "android.process.acore has stopped" dialog keeps popping up" into mnc-dev | |
| 8e645d5 am 649c3c44: am 7290d93d: Merge "Yell loudly about undefined behind in Bitmap, but work anyway" into mnc-dev | |
| cdd4cfb am d4842c37: am 0faca96f: Merge "Avoid deadlock by broadcasting outside lock." into mnc-dev | |
| 5e4dd3e Add action for notifying custom components of missed calls. | |
| daacad4 am 616ae85e: am 126973d4: am 405eceb2: Merge "Restore session params "no decoration" flag" into mnc-dev | |
| e92b264 am 33bdfe75: am df776b76: am d985e3b6: Merge changes Ib5f53f3b,I7debf3ee,Ic494ee7f,Ia8d223ae,Iff7dbbf6 into mnc-dev | |
| 616ae85 am 126973d4: am 405eceb2: Merge "Restore session params "no decoration" flag" into mnc-dev | |
| 33bdfe7 am df776b76: am d985e3b6: Merge changes Ib5f53f3b,I7debf3ee,Ic494ee7f,Ia8d223ae,Iff7dbbf6 into mnc-dev | |
| c30d732 am b1e54abd: am 591ab090: am 3ba2bfa7: Merge "Expand ringtone titles to support OGG and FLAC." into mnc-dev | |
| b1e54ab am 591ab090: am 3ba2bfa7: Merge "Expand ringtone titles to support OGG and FLAC." into mnc-dev | |
| c9fac78 am fa4c9f7a: am 5e4be98e: am f8576979: Merge "Also consider task intent when trimming recent tasks" into mnc-dev | |
| 5cbc7cc am 66dd6ee9: am e0d8a6ff: am 7b4170fa: Merge "Update Material link text to be colorAccent" into mnc-dev | |
| 59128d8 am d14fa9b4: am 3f9b9f2b: am 45fcaa54: Merge "Don\'t wipe device because of short PIN, patterns or passwords" into mnc-dev | |
| fa4c9f7 am 5e4be98e: am f8576979: Merge "Also consider task intent when trimming recent tasks" into mnc-dev | |
| 1d5837c am 5c8a5d0f: am ce337493: am ef3f58e5: Merge "Make ResolverDrawerLayout look like a ScrollView to accessibility" into mnc-dev | |
| 6851c61 am a2db7e68: am 42c9b35f: am e76bf46a: Merge "Add badge content description to TargetInfo, use in ResolverActivity" into mnc-dev | |
| 66dd6ee am e0d8a6ff: am 7b4170fa: Merge "Update Material link text to be colorAccent" into mnc-dev | |
| d14fa9b am 3f9b9f2b: am 45fcaa54: Merge "Don\'t wipe device because of short PIN, patterns or passwords" into mnc-dev | |
| 5c8a5d0 am ce337493: am ef3f58e5: Merge "Make ResolverDrawerLayout look like a ScrollView to accessibility" into mnc-dev | |
| a2db7e6 am 42c9b35f: am e76bf46a: Merge "Add badge content description to TargetInfo, use in ResolverActivity" into mnc-dev | |
| 0e7b342 am 8b095b1c: am f83e8526: am 5680f9f6: Merge "Bug: 22879202 App compatibility with WRITE_SETTINGS failing" into mnc-dev | |
| 8b095b1 am f83e8526: am 5680f9f6: Merge "Bug: 22879202 App compatibility with WRITE_SETTINGS failing" into mnc-dev | |
| dfb50d5 am 9fdf4e1b: am 688efe5d: am 87920455: Merge "Fix NPE in AppOpsService" into mnc-dev | |
| 3d74558 am a459294e: am c2003e1e: am 0855357c: Merge "User correct category for finding headless sync adapters" into mnc-dev | |
| 9fdf4e1 am 688efe5d: am 87920455: Merge "Fix NPE in AppOpsService" into mnc-dev | |
| a459294 am c2003e1e: am 0855357c: Merge "User correct category for finding headless sync adapters" into mnc-dev | |
| 1e89139 am 02159cf3: am 2f501cc0: am 0ca1e98f: Merge "media: Clarify MediaCodec and CodecCapabilities documentation" into mnc-dev | |
| 02159cf am 2f501cc0: am 0ca1e98f: Merge "media: Clarify MediaCodec and CodecCapabilities documentation" into mnc-dev | |
| d36380c am 7e1c227e: (-s ours) am 91ddd4ad: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 7e1c227 am 91ddd4ad: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| a9b4ed9 am 20733ba9: am b1286a7a: am 7469060e: Merge "Make vendor keys visible in Camera2 java APIs." into mnc-dev | |
| 20733ba am b1286a7a: am 7469060e: Merge "Make vendor keys visible in Camera2 java APIs." into mnc-dev | |
| 2b8d674 am 38820a04: am 819df4f8: am 66845a36: Add more dump info about emergency calls state | |
| 38820a0 am 819df4f8: am 66845a36: Add more dump info about emergency calls state | |
| b2befd5 am 9d3ae041: (-s ours) am 32caf077: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| b6ae409 am 530ebc10: (-s ours) am db76ee0a: (-s ours) Import translations. DO NOT MERGE | |
| 9d3ae04 am 32caf077: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 530ebc1 am db76ee0a: (-s ours) Import translations. DO NOT MERGE | |
| 6afc398 am 9bc4bdea: (-s ours) am 1491492a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| ed133f9 am b2323582: (-s ours) am 335ffd32: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 8455d01 am 5114a0ec: (-s ours) am 8fbed3d1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 4bdf81a am 4f3d5c75: am 1eb06eaa: am 8dbd4848: Merge "Add per UID control to app ops." into mnc-dev | |
| 835e085 am 0e9e089b: am 4fcbabb2: am cb9c0940: Merge "Added logging in a few error paths for wifi config installation." into mnc-dev | |
| 090eecb am 33d2b3a3: am fcc33738: Merge "Suppress camera launch gesture until setup is complete Bug: 22792563" into mnc-dr-dev | |
| a757636 am b35152cb: am ca3a3650: am 6e75e7dd: Merge "Instrument printing service for metrics collection." into mnc-dev | |
| 7f507c1 am 44b3a009: am e681aed1: am f92a1fdb: Fixed a bug where notifications shadows were blinking out | |
| fe0260f am 6e7b9135: am 3249330c: am 00ab3578: Merge "Make enter reveal animation be zorder top." into mnc-dev | |
| 44ffe9c am cba2c596: am 6aa0843e: am fb68b0ad: Merge "Fix issue #21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties" into mnc-dev | |
| aff9c63 am 4bdc3179: am de680550: am ffbdb8ad: Merge "Fix that shutter sound does not play after ringer mode changes to vibrator" into mnc-dev | |
| dbb79ae am 4cf97c91: am 7bfe7b5b: am 5cca30a4: Merge "Revert two changes to LinearLayout measurement" into mnc-dev | |
| 41343c0 am 6550e461: am 0568a230: am 9d8a230f: Revert "View measurement optimization" | |
| cd158b4 am ac3a70db: am c8222f40: am c35e670d: Moving removeTask to separate thread. | |
| 08e714c am afa039c9: am 183b589f: am 92e0c86f: Merge "Ensuring that we don\'t try to use and propagate null activity labels." into mnc-dev | |
| 2535171 am 92a59d8e: am 92385030: am e836a229: Fix build. | |
| 1e93d7e am 0e0be5c7: am 88cf6d62: am f7e00dbd: Merge "Fixed issue with artifacts during scale-up transition animation" into mnc-dev | |
| e1f1937 am e7b37bc2: am 5c8072df: am ebbc891a: Merge "Fix build." into mnc-dev | |
| a2f5ed7 am 4dffe462: am 22057e06: am 37f559be: Merge "Improve getTimestamp documentation" into mnc-dev | |
| 62f05df am 55a23950: am e8d3b394: am 692a244b: Fix build. | |
| bc2a884 am b97c5ddd: am 9b36f526: am c1836bb0: Merge "Change MNC codename to just M." into mnc-dev | |
| 0a7844d am 703dc46e: am f1518da4: Fix fingerprint icon screen on animation | |
| 9bc4bde am 1491492a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| b232358 am 335ffd32: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 5114a0e am 8fbed3d1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | |
| 4f3d5c7 am 1eb06eaa: am 8dbd4848: Merge "Add per UID control to app ops." into mnc-dev | |
| 0e9e089 am 4fcbabb2: am cb9c0940: Merge "Added logging in a few error paths for wifi config installation." into mnc-dev | |
| 33d2b3a am fcc33738: Merge "Suppress camera launch gesture until setup is complete Bug: 22792563" into mnc-dr-dev | |
| b35152c am ca3a3650: am 6e75e7dd: Merge "Instrument printing service for metrics collection." into mnc-dev | |
| 44b3a00 am e681aed1: am f92a1fdb: Fixed a bug where notifications shadows were blinking out | |
| 6e7b913 am 3249330c: am 00ab3578: Merge "Make enter reveal animation be zorder top." into mnc-dev | |
| cba2c59 am 6aa0843e: am fb68b0ad: Merge "Fix issue #21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties" into mnc-dev | |
| 4bdc317 am de680550: am ffbdb8ad: Merge "Fix that shutter sound does not play after ringer mode changes to vibrator" into mnc-dev | |
| 4cf97c9 am 7bfe7b5b: am 5cca30a4: Merge "Revert two changes to LinearLayout measurement" into mnc-dev | |
| 6550e46 am 0568a230: am 9d8a230f: Revert "View measurement optimization" | |
| ac3a70d am c8222f40: am c35e670d: Moving removeTask to separate thread. | |
| afa039c am 183b589f: am 92e0c86f: Merge "Ensuring that we don\'t try to use and propagate null activity labels." into mnc-dev | |
| 92a59d8 am 92385030: am e836a229: Fix build. | |
| 0e0be5c am 88cf6d62: am f7e00dbd: Merge "Fixed issue with artifacts during scale-up transition animation" into mnc-dev | |
| e7b37bc am 5c8072df: am ebbc891a: Merge "Fix build." into mnc-dev | |
| 4dffe46 am 22057e06: am 37f559be: Merge "Improve getTimestamp documentation" into mnc-dev | |
| 55a2395 am e8d3b394: am 692a244b: Fix build. | |
| b97c5dd am 9b36f526: am c1836bb0: Merge "Change MNC codename to just M." into mnc-dev | |
| 703dc46 am f1518da4: Fix fingerprint icon screen on animation | |
| 4cfe2a8 am f26ec92d: am a21b2e30: resolved conflicts for merge of d0694da4 to mnc-dr-dev | |
| f26ec92 am a21b2e30: resolved conflicts for merge of d0694da4 to mnc-dr-dev | |
| 8ceb118 am e787bfa2: am 9bc94698: am 5d6a2d38: Merge "Fix SysUI crash on device boot." into mnc-dev | |
| e787bfa am 9bc94698: am 5d6a2d38: Merge "Fix SysUI crash on device boot." into mnc-dev | |
| 3eaf7d2 am 6501720c: am 489043d4: am 9a81a182: Merge "Don\'t always transfer device owner status to other users." into mnc-dev | |
| 6501720 am 489043d4: am 9a81a182: Merge "Don\'t always transfer device owner status to other users." into mnc-dev | |
| 54aed52 am 93d45d1c: am 982daf87: am d692fcf1: Merge "Add missing return statement" into mnc-dev | |
| 93d45d1 am 982daf87: am d692fcf1: Merge "Add missing return statement" into mnc-dev | |
| 3b03916 am c7a86e90: am c70348c1: am 496a9d26: Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev | |
| c7a86e9 am c70348c1: am 496a9d26: Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev | |
| 2e802ca am 72dcb47d: am b880a036: am 02565c36: Merge changes from topic \'fix-notification-inflation-2\' into mnc-dev | |
| 4581ca5 am 7b2b74e1: am 135c3791: am 410abcdb: Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev | |
| 72dcb47 am b880a036: am 02565c36: Merge changes from topic \'fix-notification-inflation-2\' into mnc-dev | |
| 7b2b74e am 135c3791: am 410abcdb: Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev | |
| 9bd5d8a am 50265fc2: (-s ours) am 44718c4b: (-s ours) am bbb47d88: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev | |
| 6be373d am fc1bcc37: am 0278f2bf: am e8b7febd: Merge "media: use blocks number to find closest size" into mnc-dev | |
| f4d2a6a am 9eb20882: (-s ours) am 84ddee2e: (-s ours) Import translations. DO NOT MERGE | |
| 50265fc am 44718c4b: (-s ours) am bbb47d88: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev | |
| fc1bcc3 am 0278f2bf: am e8b7febd: Merge "media: use blocks number to find closest size" into mnc-dev | |
| 9eb2088 am 84ddee2e: (-s ours) Import translations. DO NOT MERGE | |
| 1882e15 am e7477002: am 0eaadbc2: am 5db4cc8f: Merge "Handle volumes without visible paths." into mnc-dev | |
| e747700 am 0eaadbc2: am 5db4cc8f: Merge "Handle volumes without visible paths." into mnc-dev | |
| 7fa83d2 am b9904daa: am 15724ffc: am e3b0119f: Merge "AAPT: Fix resource versioning" into mnc-dev | |
| b9904da am 15724ffc: am e3b0119f: Merge "AAPT: Fix resource versioning" into mnc-dev | |
| 6cb78ad am 73168821: am 5b5d9129: am b9f30b26: Merge "The heads up now correctly dissapears when clicking" into mnc-dev | |
| 7316882 am 5b5d9129: am b9f30b26: Merge "The heads up now correctly dissapears when clicking" into mnc-dev | |
| 57a9920 am d247d8b4: am 135e2ce5: am 53c75014: Merge "Add OrSelf to privileged permission check." into mnc-dev | |
| c8c3539 am eec946aa: am ee6046ad: am 00f7cb92: Merge "BatteryStats: include mobile radio active count and unknown time in checkin" into mnc-dev | |
| 4c5ac9e am 7ab51f50: am 7b3f6d56: am 3bf1ac54: Bluetooth: Don\'t call beginBroadcast() while in a broadcast | |
| d247d8b am 135e2ce5: am 53c75014: Merge "Add OrSelf to privileged permission check." into mnc-dev | |
| eec946a am ee6046ad: am 00f7cb92: Merge "BatteryStats: include mobile radio active count and unknown time in checkin" into mnc-dev | |
| 7ab51f5 am 7b3f6d56: am 3bf1ac54: Bluetooth: Don\'t call beginBroadcast() while in a broadcast | |
| 880ad00 am f725a702: am e195d179: am 26ae600b: Merge "Permissions: GET_ACCOUNTS permission cleanup" into mnc-dev | |
| c62b9bd am 24578570: am 3991bea8: am 7676e403: Merge changes I4c215676,Ib476302c,I0aede288,I9241dec7,Ibe7167a6, ... into mnc-dev | |
| f725a70 am e195d179: am 26ae600b: Merge "Permissions: GET_ACCOUNTS permission cleanup" into mnc-dev | |
| 2457857 am 3991bea8: am 7676e403: Merge changes I4c215676,Ib476302c,I0aede288,I9241dec7,Ibe7167a6, ... into mnc-dev | |
| 1b2bd2e am 7d1a4b63: am fb2f9c02: am 20a5d331: Merge "Fixed a heads up crash" into mnc-dev | |
| 7d1a4b6 am fb2f9c02: am 20a5d331: Merge "Fixed a heads up crash" into mnc-dev | |
| 3882997 am ed839f59: am e2823cb3: am 8f5228af: Merge "UsbMidiDevice: add timestamps for input events" into mnc-dev | |
| 91eb05e am 42d2aaa0: am 3eb45836: am 2f1a08e6: Merge "MIDI docs BTLE: how to open BTLE MIDI devices" into mnc-dev | |
| d1261ec am de6272a7: am 9d4fad24: am fdcd8216: Merge "MIDI package doc: add hasSystemFeature() call" into mnc-dev | |
| 854829d am 4f84e648: am 6bf9b8ca: am 559a2420: Merge "MidiDevice: document that opens can return nulls" into mnc-dev | |
| fc0b2e9 am df961732: am f9fdb08c: am 4988378c: Merge "Introduced android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev | |
| e01a4af am e025f4d9: am ccaf066d: Merge "Call getInstanceForPackage instead of creating a new SensorManager instance." into mnc-dr-dev | |
| ed839f5 am e2823cb3: am 8f5228af: Merge "UsbMidiDevice: add timestamps for input events" into mnc-dev | |
| 42d2aaa am 3eb45836: am 2f1a08e6: Merge "MIDI docs BTLE: how to open BTLE MIDI devices" into mnc-dev | |
| de6272a am 9d4fad24: am fdcd8216: Merge "MIDI package doc: add hasSystemFeature() call" into mnc-dev | |
| 4f84e64 am 6bf9b8ca: am 559a2420: Merge "MidiDevice: document that opens can return nulls" into mnc-dev | |
| df96173 am f9fdb08c: am 4988378c: Merge "Introduced android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev | |
| e025f4d am ccaf066d: Merge "Call getInstanceForPackage instead of creating a new SensorManager instance." into mnc-dr-dev | |
| 85ee088 am ee13f45c: am 8e0c9bef: am 75e51ec0: Merge "Raw RSA Cipher relies on keymaster for padding and range checks." into mnc-dev | |
| ee13f45 am 8e0c9bef: am 75e51ec0: Merge "Raw RSA Cipher relies on keymaster for padding and range checks." into mnc-dev | |
| 9c45814 am 3d208671: am 7dfb1d99: am 730c0f65: Merge "Fix stencil mask usage in HWUI" into mnc-dev | |
| 3d20867 am 7dfb1d99: am 730c0f65: Merge "Fix stencil mask usage in HWUI" into mnc-dev | |
| 124eb8d am 6635ccce: am f9dee583: am 8d1d8fda: Merge "Add SMS permissions for Carrier app." into mnc-dev | |
| 6635ccc am f9dee583: am 8d1d8fda: Merge "Add SMS permissions for Carrier app." into mnc-dev | |
| e5b2591 am e625b631: am 4de7b0ff: am 74a0744e: Merge "Fix issues around process teardown after full-data restore" into mnc-dev | |
| e625b63 am 4de7b0ff: am 74a0744e: Merge "Fix issues around process teardown after full-data restore" into mnc-dev | |
| 9903333 am b6af87ca: am e5bf7064: am 964a4121: Merge "[Improve docs for AccountManager] Currently, the docs for AccountManager are somewhat misleading and may cause developer errors. To avoid them, we are properly documenting it." into mnc-dev | |
| 3827152 am 82c14e68: am 92360585: am 559daf7a: Merge "Include non-zero dimension views in excess space calculation" into mnc-dev | |
| b6af87c am e5bf7064: am 964a4121: Merge "[Improve docs for AccountManager] Currently, the docs for AccountManager are somewhat misle |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment