OSDN Git Service
Felipe Leme [Fri, 16 Jun 2017 23:59:46 +0000 (23:59 +0000)]
Merge "Merge "Trim text from autofillvalue when checking for empty." into oc-dev am:
b3b13ff62c am:
2de4d6bce4" into oc-dr1-dev-plus-aosp
am:
28157d4540
Change-Id: Ic75b2ebc577bf950ad8c57e4535dfb00f895c0c0
Felipe Leme [Fri, 16 Jun 2017 23:56:12 +0000 (23:56 +0000)]
Merge "Trim text from autofillvalue when checking for empty." into oc-dev am:
b3b13ff62c am:
1c03d3fcef
am:
9ccb3a86ae
Change-Id: I5a6101d80376a0fd60bd6c49fe6a12f8ec9df12e
Tyler Freeman [Fri, 16 Jun 2017 23:47:09 +0000 (23:47 +0000)]
Merge "DO NOT MERGE ANYWHERE Vibrator: Allow priority vibrations in low-power mode for accessibility. am:
79613777df -s ours am:
cf82b09998 -s ours am:
2c3ca52a91 -s ours am:
24a5477e03 -s ours" into oc-dr1-dev-plus-aosp
am:
b5e0a5bec3 -s ours
Change-Id: I8d9efd6c0ece8fcb1c867d123d1cc6004d57d05b
Tyler Freeman [Fri, 16 Jun 2017 23:23:32 +0000 (23:23 +0000)]
DO NOT MERGE ANYWHERE Vibrator: Allow priority vibrations in low-power mode for accessibility. am:
79613777df -s ours am:
cf82b09998 -s ours am:
2c3ca52a91 -s ours am:
24a5477e03 -s ours
am:
db4175a50d -s ours
Change-Id: I3e3980e4e3584b3b47c93ce52e8e45aebfe79f5f
Tyler Freeman [Fri, 16 Jun 2017 23:14:32 +0000 (23:14 +0000)]
DO NOT MERGE ANYWHERE Vibrator: Allow priority vibrations in low-power mode for accessibility. am:
79613777df -s ours am:
cf82b09998 -s ours am:
2c3ca52a91 -s ours am:
19bb979224 -s ours
am:
f202c1c56e -s ours
Change-Id: If05d7c4d23a96d54dfaf247cad22f7f48470eeda
Android Build Merger (Role) [Fri, 16 Jun 2017 23:09:48 +0000 (23:09 +0000)]
Merge "Merge "Trim text from autofillvalue when checking for empty." into oc-dev am:
b3b13ff62c am:
2de4d6bce4" into oc-dr1-dev-plus-aosp
Felipe Leme [Fri, 16 Jun 2017 23:06:47 +0000 (23:06 +0000)]
Merge "Trim text from autofillvalue when checking for empty." into oc-dev am:
b3b13ff62c
am:
1c03d3fcef
Change-Id: I8f94db3b3b129caca53f3cb0ed0b16b2a4951648
Felipe Leme [Fri, 16 Jun 2017 23:06:46 +0000 (23:06 +0000)]
Merge "Trim text from autofillvalue when checking for empty." into oc-dev am:
b3b13ff62c
am:
2de4d6bce4
Change-Id: I8eb50d5191b2393011c297671bd5d3c65e1beb7e
Android Build Merger (Role) [Fri, 16 Jun 2017 23:03:25 +0000 (23:03 +0000)]
Merge "DO NOT MERGE ANYWHERE Vibrator: Allow priority vibrations in low-power mode for accessibility. am:
79613777df -s ours am:
cf82b09998 -s ours am:
2c3ca52a91 -s ours am:
24a5477e03 -s ours" into oc-dr1-dev-plus-aosp
Wale Ogunwale [Fri, 16 Jun 2017 23:00:57 +0000 (23:00 +0000)]
Merge "Merge "Log last home activity and result we tried to start" into oc-dev am:
e8f1a74361 am:
833ca781fc" into oc-dr1-dev-plus-aosp
am:
1ba4268026
Change-Id: I2993807ff93f39b80b5e18e8e33f5e7ef072ad06
Felipe Leme [Fri, 16 Jun 2017 23:00:14 +0000 (23:00 +0000)]
Merge "Trim text from autofillvalue when checking for empty." into oc-dev
am:
b3b13ff62c
Change-Id: I5a96a3f2613aeaad1f3d146b5ce6a208b1180851
Tyler Freeman [Fri, 16 Jun 2017 22:58:54 +0000 (22:58 +0000)]
DO NOT MERGE ANYWHERE Vibrator: Allow priority vibrations in low-power mode for accessibility. am:
79613777df -s ours am:
cf82b09998 -s ours am:
2c3ca52a91 -s ours
am:
24a5477e03 -s ours
Change-Id: I624498ada7c6fb4705dca185325edb3cd9ac0d77
Tyler Freeman [Fri, 16 Jun 2017 22:58:51 +0000 (22:58 +0000)]
DO NOT MERGE ANYWHERE Vibrator: Allow priority vibrations in low-power mode for accessibility. am:
79613777df -s ours am:
cf82b09998 -s ours am:
2c3ca52a91 -s ours
am:
19bb979224 -s ours
Change-Id: Iabcffdb4bc4ab990a19a6f3a44804b8bc0122a04
Wale Ogunwale [Fri, 16 Jun 2017 22:57:49 +0000 (22:57 +0000)]
Merge "Log last home activity and result we tried to start" into oc-dev am:
e8f1a74361 am:
a7bf2a0ed9
am:
31dc2cb612
Change-Id: I44ff93c850114029c8ce59a2a99a649cd11fc131
Felipe Leme [Fri, 16 Jun 2017 22:57:29 +0000 (22:57 +0000)]
Merge "Trim text from autofillvalue when checking for empty." into oc-dev
am:
b3b13ff62c
Change-Id: I4059509efe6cfa0b2f3acdf8fdfb99b4daeca0bb
Tyler Freeman [Fri, 16 Jun 2017 22:51:31 +0000 (22:51 +0000)]
DO NOT MERGE ANYWHERE Vibrator: Allow priority vibrations in low-power mode for accessibility. am:
79613777df -s ours am:
cf82b09998 -s ours
am:
2c3ca52a91 -s ours
Change-Id: Ia77b2954ecafe93cf01381c0c1fe781612187229
Tyler Freeman [Fri, 16 Jun 2017 22:51:28 +0000 (22:51 +0000)]
DO NOT MERGE ANYWHERE Vibrator: Allow priority vibrations in low-power mode for accessibility. am:
79613777df -s ours am:
cf82b09998 -s ours
am:
2c3ca52a91 -s ours
Change-Id: Iebb31d8ff579fb03e6d814493777ccac96d94eae
TreeHugger Robot [Fri, 16 Jun 2017 22:50:42 +0000 (22:50 +0000)]
Merge "Trim text from autofillvalue when checking for empty." into oc-dev
Tyler Freeman [Fri, 16 Jun 2017 22:43:12 +0000 (22:43 +0000)]
DO NOT MERGE ANYWHERE Vibrator: Allow priority vibrations in low-power mode for accessibility. am:
79613777df -s ours
am:
cf82b09998 -s ours
Change-Id: I128c5a5b07fc2aef5ada9118e3cc491a87970758
Tony Mantler [Fri, 16 Jun 2017 22:39:01 +0000 (22:39 +0000)]
Merge "Merge "Disable notification sounds on TV" into oc-dev am:
b5979092b8 am:
5ddad3b748" into oc-dr1-dev-plus-aosp
am:
f1854c0684
Change-Id: I64f523164c64e88b00c2388153e95d3e3d870afb
Android Build Merger (Role) [Fri, 16 Jun 2017 22:37:42 +0000 (22:37 +0000)]
Merge "Merge "Log last home activity and result we tried to start" into oc-dev am:
e8f1a74361 am:
833ca781fc" into oc-dr1-dev-plus-aosp
Tyler Freeman [Fri, 16 Jun 2017 22:36:26 +0000 (22:36 +0000)]
DO NOT MERGE ANYWHERE Vibrator: Allow priority vibrations in low-power mode for accessibility.
am:
79613777df -s ours
Change-Id: I965bac24a8d62b44b08679bda58b8ba37dbed5b4
Wale Ogunwale [Fri, 16 Jun 2017 22:36:22 +0000 (22:36 +0000)]
Merge "Log last home activity and result we tried to start" into oc-dev am:
e8f1a74361
am:
833ca781fc
Change-Id: I3aa4c01c2df5aa57df3fad27a8a4473d2a42ebc0
Tony Mantler [Fri, 16 Jun 2017 22:35:49 +0000 (22:35 +0000)]
Merge "Disable notification sounds on TV" into oc-dev am:
b5979092b8 am:
d537d3778b
am:
38ce905a3f
Change-Id: I02e69396b1bd8e108a04e562933cd1051a38c927
Wale Ogunwale [Fri, 16 Jun 2017 22:32:37 +0000 (22:32 +0000)]
Merge "Log last home activity and result we tried to start" into oc-dev am:
e8f1a74361
am:
a7bf2a0ed9
Change-Id: I15f45b209c12fc7e70f3bf9b6a2fda9ddf50cc2a
Android Build Merger (Role) [Fri, 16 Jun 2017 22:27:57 +0000 (22:27 +0000)]
Merge "Merge "Disable notification sounds on TV" into oc-dev am:
b5979092b8 am:
5ddad3b748" into oc-dr1-dev-plus-aosp
Felipe Leme [Fri, 16 Jun 2017 22:25:09 +0000 (22:25 +0000)]
Merge "Merge "Use an optimized findViewNodeByAutofillId(id) to get just one node." into oc-dev am:
a89414962d am:
3df52cc28d" into oc-dr1-dev-plus-aosp
am:
496dd9389c
Change-Id: I68d0bdfae6f5f91ab7a578224fdd30712e905f6a
Tony Mantler [Fri, 16 Jun 2017 22:25:03 +0000 (22:25 +0000)]
Merge "Disable notification sounds on TV" into oc-dev am:
b5979092b8
am:
d537d3778b
Change-Id: Iebc6356304bb7a4cd9ff9a3af28bb24343938cd7
Tony Mantler [Fri, 16 Jun 2017 22:24:57 +0000 (22:24 +0000)]
Merge "Disable notification sounds on TV" into oc-dev am:
b5979092b8
am:
5ddad3b748
Change-Id: I577b06fb7b377017b64cea9a590355db033c23bb
Felipe Leme [Fri, 16 Jun 2017 22:22:02 +0000 (22:22 +0000)]
Merge "Use an optimized findViewNodeByAutofillId(id) to get just one node." into oc-dev am:
a89414962d am:
1c5cb925b8
am:
bb4011dcc4
Change-Id: I34016728ae30eb84d336b72ace2ba33ec7b4c46b
Wale Ogunwale [Fri, 16 Jun 2017 22:21:11 +0000 (22:21 +0000)]
Merge "Log last home activity and result we tried to start" into oc-dev
am:
e8f1a74361
Change-Id: I9dc6c865260e783eeba32b7c86d45b31ab49688c
Winson Chung [Fri, 16 Jun 2017 22:19:14 +0000 (22:19 +0000)]
Merge "Merge changes I20bdab1b,Id82f9081 into oc-dev am:
64b044680c am:
09a3325f41" into oc-dr1-dev-plus-aosp
am:
34bdeb3a7e
Change-Id: I2e058bf310d1387a8d86379bdcff02c8a157c2b5
Wale Ogunwale [Fri, 16 Jun 2017 22:15:21 +0000 (22:15 +0000)]
Merge "Log last home activity and result we tried to start" into oc-dev
am:
e8f1a74361
Change-Id: I6c9e5fdd75717b1c4fc0ba723afe3ff8797f3a16
Android Build Merger (Role) [Fri, 16 Jun 2017 22:14:51 +0000 (22:14 +0000)]
Merge "Merge "Use an optimized findViewNodeByAutofillId(id) to get just one node." into oc-dev am:
a89414962d am:
3df52cc28d" into oc-dr1-dev-plus-aosp
Winson Chung [Fri, 16 Jun 2017 22:13:43 +0000 (22:13 +0000)]
Merge changes I20bdab1b,Id82f9081 into oc-dev am:
64b044680c am:
552bdceeaf
am:
60252a2718
Change-Id: Ib580e3d67747a24f85c5d801e8f4129d1c5a7ab6
Felipe Leme [Fri, 16 Jun 2017 22:12:17 +0000 (22:12 +0000)]
Merge "Use an optimized findViewNodeByAutofillId(id) to get just one node." into oc-dev am:
a89414962d
am:
3df52cc28d
Change-Id: I5e3e075b5bad2bd611d949ab247c84aa7386aee8
Tony Mantler [Fri, 16 Jun 2017 22:12:03 +0000 (22:12 +0000)]
Merge "Disable notification sounds on TV" into oc-dev
am:
b5979092b8
Change-Id: Iec7f207648a7df13c2d963be4b48f3286ded2dc2
Tony Mantler [Fri, 16 Jun 2017 22:12:03 +0000 (22:12 +0000)]
Merge "Disable notification sounds on TV" into oc-dev
am:
b5979092b8
Change-Id: I37ec878ac1629e0f145481863b82ad59572c7e73
Felipe Leme [Fri, 16 Jun 2017 22:11:13 +0000 (22:11 +0000)]
Merge "Use an optimized findViewNodeByAutofillId(id) to get just one node." into oc-dev am:
a89414962d
am:
1c5cb925b8
Change-Id: Iddb2da7c24035f9d1280eef667b059c032affa94
Mathieu Chartier [Fri, 16 Jun 2017 22:10:55 +0000 (22:10 +0000)]
Merge "Move from using profile-classes to art-profile"
Steven Thomas [Fri, 16 Jun 2017 22:00:22 +0000 (22:00 +0000)]
Merge "Enable vr mode and persistent vr mode at device boot" into oc-dr1-dev am:
573daaaede
am:
0d782836cf
Change-Id: I11a11776bb83cbf7da5647554248347afd2229fb
Felipe Leme [Fri, 16 Jun 2017 21:59:55 +0000 (21:59 +0000)]
Merge "Use an optimized findViewNodeByAutofillId(id) to get just one node." into oc-dev
am:
a89414962d
Change-Id: I70d76618c929bdfeee715909c70a678fbc5f4a3e
Felipe Leme [Fri, 16 Jun 2017 21:59:45 +0000 (21:59 +0000)]
Merge "Use an optimized findViewNodeByAutofillId(id) to get just one node." into oc-dev
am:
a89414962d
Change-Id: Ie4bebf468d564dcf67ed56b6152f49f2c5f5cda1
Android Build Merger (Role) [Fri, 16 Jun 2017 21:58:05 +0000 (21:58 +0000)]
Merge "Merge changes I20bdab1b,Id82f9081 into oc-dev am:
64b044680c am:
09a3325f41" into oc-dr1-dev-plus-aosp
TreeHugger Robot [Fri, 16 Jun 2017 21:57:20 +0000 (21:57 +0000)]
Merge "Log last home activity and result we tried to start" into oc-dev
Winson Chung [Fri, 16 Jun 2017 21:57:02 +0000 (21:57 +0000)]
Merge changes I20bdab1b,Id82f9081 into oc-dev am:
64b044680c
am:
09a3325f41
Change-Id: Ic30e6938ccb02facf186fbb4526e7e085996d62c
TreeHugger Robot [Fri, 16 Jun 2017 21:55:28 +0000 (21:55 +0000)]
Merge "Disable notification sounds on TV" into oc-dev
Winson Chung [Fri, 16 Jun 2017 21:55:23 +0000 (21:55 +0000)]
Merge changes I20bdab1b,Id82f9081 into oc-dev am:
64b044680c
am:
552bdceeaf
Change-Id: I38941bde24946fcfa1598f71d58c1e9b40316974
Steven Thomas [Fri, 16 Jun 2017 21:47:16 +0000 (21:47 +0000)]
Merge "Enable vr mode and persistent vr mode at device boot" into oc-dr1-dev
am:
573daaaede
Change-Id: I3a8ce7d52c18891c46e0631998c8834d52f31bdf
TreeHugger Robot [Fri, 16 Jun 2017 21:45:39 +0000 (21:45 +0000)]
Merge "Use an optimized findViewNodeByAutofillId(id) to get just one node." into oc-dev
Winson Chung [Fri, 16 Jun 2017 21:44:59 +0000 (21:44 +0000)]
Merge changes I20bdab1b,Id82f9081 into oc-dev
am:
64b044680c
Change-Id: I6a15a1b5a97b34fd18f885a0137a8d674b7b6589
Winson Chung [Fri, 16 Jun 2017 21:41:43 +0000 (21:41 +0000)]
Merge changes I20bdab1b,Id82f9081 into oc-dev
am:
64b044680c
Change-Id: I6bf7127bd9f46855e186e13fc4e06f27535c4916
Tomasz Wasilczyk [Fri, 16 Jun 2017 21:41:01 +0000 (21:41 +0000)]
Merge "Remove EnvWrapper template."
Steven Thomas [Fri, 16 Jun 2017 21:36:51 +0000 (21:36 +0000)]
Merge "Enable vr mode and persistent vr mode at device boot" into oc-dr1-dev
Winson Chung [Fri, 16 Jun 2017 21:32:39 +0000 (21:32 +0000)]
Merge changes I20bdab1b,Id82f9081 into oc-dev
* changes:
Fix backwards flag causing crash.
Fixing issue with PiP aspect ratio being clobbered.
Jeff Davidson [Fri, 16 Jun 2017 21:08:29 +0000 (21:08 +0000)]
Merge "Allow EuiccService IPCs to happen in parallel." into oc-dr1-dev am:
79c7a85d60
am:
71005c5cc9
Change-Id: I17e526d66cfed3029c1cf0511e1a2d743719ea79
Rob Carr [Fri, 16 Jun 2017 21:05:41 +0000 (21:05 +0000)]
Merge "Merge "ViewRootImpl: More null checks for performTraversals." into oc-dev am:
6f87503ed8" into oc-dr1-dev am:
a870c65331
am:
27d4178a2d
Change-Id: I6c0562f256bed94ef74d427afd3bdc02ad53fb29
Jeff Davidson [Fri, 16 Jun 2017 20:58:33 +0000 (20:58 +0000)]
Merge "Allow EuiccService IPCs to happen in parallel." into oc-dr1-dev
am:
79c7a85d60
Change-Id: I38d9099f2e46b550a2d77f089937792379274ecc
Mathieu Chartier [Fri, 16 Jun 2017 16:55:08 +0000 (09:55 -0700)]
Move from using profile-classes to art-profile
art-profile contains methods as well as classes. This will enable
possibly using speed-profile in the future.
Reduces services.art size from 700k -> 233k since it only includes
startup classes now (marlin).
Post boot vdex PSS on marlin goes from 6644k -> 6580k. TODO: Investigate
why this doesn't go down more.
Bug:
62356545
Test: make and flash
Change-Id: I47dcd4e8d799266e348b8d64b0176cc41d91bebc
Alison Cichowlas [Fri, 16 Jun 2017 20:54:41 +0000 (20:54 +0000)]
Merge "Hide power dialog when lockscreen comes and goes." into oc-dr1-dev am:
c05a764e5e
am:
352d1c5721
Change-Id: I7a1ca4361398301b9d80c44bfed57d868790ea37
Fyodor Kupolov [Fri, 16 Jun 2017 20:52:11 +0000 (20:52 +0000)]
Merge "Merge "Always log new user state to event log" into oc-dev am:
6db4406fbd" into oc-dr1-dev am:
111041d62f
am:
cd40b9993e
Change-Id: I3289bd13dfce2de8cf0ae406a56af3eed36d28b5
Jeff Davidson [Fri, 16 Jun 2017 20:50:02 +0000 (20:50 +0000)]
Merge "Allow EuiccService IPCs to happen in parallel." into oc-dr1-dev
Rob Carr [Fri, 16 Jun 2017 20:48:19 +0000 (20:48 +0000)]
Merge "Merge "ViewRootImpl: More null checks for performTraversals." into oc-dev am:
6f87503ed8 am:
c52b16c97d" into oc-dr1-dev-plus-aosp
am:
ffb8035798
Change-Id: Ia47a2b128545b22e9dcbdd7273a2f71b07efa27b
Rob Carr [Fri, 16 Jun 2017 20:43:34 +0000 (20:43 +0000)]
Merge "Merge "ViewRootImpl: More null checks for performTraversals." into oc-dev am:
6f87503ed8" into oc-dr1-dev
am:
a870c65331
Change-Id: Iea78aa8b8bd90c29d22f2a38dd424f0dd4eb1afd
Felipe Leme [Fri, 16 Jun 2017 20:24:32 +0000 (13:24 -0700)]
Trim text from autofillvalue when checking for empty.
Test: VirtualContainerActivityTest#testSaveDialogNotShownWhenBackIsPressed
Fixes:
62667931
Change-Id: I7e673eedd39fff7af89c694d0bfc5a495f14ea26
Alison Cichowlas [Fri, 16 Jun 2017 20:36:12 +0000 (20:36 +0000)]
Merge "Hide power dialog when lockscreen comes and goes." into oc-dr1-dev
am:
c05a764e5e
Change-Id: Id9b37d40c09fd27e405c13977925bf4beb37175f
Lucas Dupin [Fri, 16 Jun 2017 20:33:29 +0000 (20:33 +0000)]
Merge "Merge "WallpaperColors refactor" into oc-dr1-dev am:
04d2ec59e8" into oc-dr1-dev-plus-aosp
am:
fcee629aa6
Change-Id: Idf98ceb1465c1e83de1cc5c0aa46077289ed2f6d
Fyodor Kupolov [Fri, 16 Jun 2017 20:30:14 +0000 (20:30 +0000)]
Merge "Merge "Always log new user state to event log" into oc-dev am:
6db4406fbd" into oc-dr1-dev
am:
111041d62f
Change-Id: I554a0331c43dbb56de220670d92c7796a010b3a9
Fyodor Kupolov [Fri, 16 Jun 2017 20:30:00 +0000 (20:30 +0000)]
Merge "Always log new user state to event log" into oc-dev am:
6db4406fbd am:
62b76a388f
am:
0520d9840d
Change-Id: I0f8f83caa7b858fa44e21c9a7889ddb9447ab5ac
TreeHugger Robot [Fri, 16 Jun 2017 20:28:13 +0000 (20:28 +0000)]
Merge "Add CursorWindow perf tests"
Android Build Merger (Role) [Fri, 16 Jun 2017 20:27:38 +0000 (20:27 +0000)]
Merge "Merge "ViewRootImpl: More null checks for performTraversals." into oc-dev am:
6f87503ed8 am:
c52b16c97d" into oc-dr1-dev-plus-aosp
Rob Carr [Fri, 16 Jun 2017 20:26:29 +0000 (20:26 +0000)]
Merge "ViewRootImpl: More null checks for performTraversals." into oc-dev am:
6f87503ed8
am:
c52b16c97d
Change-Id: I6343246eaffc1943d8748490acf51e682b1c5bee
Android Build Merger (Role) [Fri, 16 Jun 2017 20:24:35 +0000 (20:24 +0000)]
Merge "Merge "WallpaperColors refactor" into oc-dr1-dev am:
04d2ec59e8" into oc-dr1-dev-plus-aosp
Lucas Dupin [Fri, 16 Jun 2017 20:22:50 +0000 (20:22 +0000)]
Merge "WallpaperColors refactor" into oc-dr1-dev
am:
04d2ec59e8
Change-Id: I0c684d8f93c368038c3d0328cac58fab576e021f
Fyodor Kupolov [Fri, 16 Jun 2017 20:20:33 +0000 (20:20 +0000)]
Merge "Always log new user state to event log" into oc-dev am:
6db4406fbd
am:
62b76a388f
Change-Id: Idaa6c938594b49acb233b64f611e050d0e8f5558
Tyler Freeman [Fri, 5 May 2017 00:23:35 +0000 (17:23 -0700)]
DO NOT MERGE ANYWHERE Vibrator: Allow priority vibrations in low-power mode for accessibility.
This is mainly for Wear devices that don't have speakers.
Bug:
37543478
Bug:
37257715
Merged-In: Ia6dffa7e528886e7c84390dbb33b44f298c7afa4
Change-Id: Ia6dffa7e528886e7c84390dbb33b44f298c7afa4
Android Build Merger (Role) [Fri, 16 Jun 2017 20:14:21 +0000 (20:14 +0000)]
Merge "Merge "ViewRootImpl: More null checks for performTraversals." into oc-dev am:
6f87503ed8" into oc-dr1-dev
Alison Cichowlas [Fri, 16 Jun 2017 20:13:06 +0000 (20:13 +0000)]
Merge "Hide power dialog when lockscreen comes and goes." into oc-dr1-dev
Rob Carr [Fri, 16 Jun 2017 20:12:17 +0000 (20:12 +0000)]
Merge "ViewRootImpl: More null checks for performTraversals." into oc-dev
am:
6f87503ed8
Change-Id: I3c951fd2572abbada566494b5954697be098865d
Jeff Davidson [Fri, 16 Jun 2017 20:11:39 +0000 (20:11 +0000)]
Merge "Merge "Define a meta-data attribute for a carrier icon." into oc-dr1-dev am:
963a20772e" into oc-dr1-dev-plus-aosp
am:
3806a1d477
Change-Id: I0af40ca1281103c1b82a8046339a42bb0cf3dc33
Felipe Leme [Fri, 16 Jun 2017 20:09:08 +0000 (20:09 +0000)]
Merge "Merge "Merge "Throw IAE when service add null AutofillIds on SaveInfo methods." into oc-dev am:
6cde68752c" into oc-dr1-dev am:
5a9a7f5916" into oc-dr1-dev-plus-aosp
am:
04576add98
Change-Id: I284ff6fa6bef6122c607d8c036f6b044d3d1bded
Rob Carr [Fri, 16 Jun 2017 20:08:28 +0000 (20:08 +0000)]
Merge "ViewRootImpl: More null checks for performTraversals." into oc-dev
am:
6f87503ed8
Change-Id: I8685f019f33861bffb3b82ef0f494a80a8067d88
Android Build Merger (Role) [Fri, 16 Jun 2017 20:06:22 +0000 (20:06 +0000)]
Merge "Merge "Always log new user state to event log" into oc-dev am:
6db4406fbd" into oc-dr1-dev
Fyodor Kupolov [Fri, 16 Jun 2017 20:05:32 +0000 (20:05 +0000)]
Merge "Always log new user state to event log" into oc-dev
am:
6db4406fbd
Change-Id: I5ed5aacfb054a7c7fef91b0ac51cc89541983818
Fyodor Kupolov [Fri, 16 Jun 2017 20:05:31 +0000 (20:05 +0000)]
Merge "Always log new user state to event log" into oc-dev
am:
6db4406fbd
Change-Id: I975664bc2943ef95340ce8003a1e78d72c7dc2b5
TreeHugger Robot [Fri, 16 Jun 2017 20:04:53 +0000 (20:04 +0000)]
Merge "WallpaperColors refactor" into oc-dr1-dev
Felipe Leme [Fri, 16 Jun 2017 20:04:00 +0000 (20:04 +0000)]
Merge "Merge "Throw IAE when service add null AutofillIds on SaveInfo methods." into oc-dev am:
6cde68752c am:
a0a799f8ed" into oc-dr1-dev-plus-aosp
am:
f6a0dadd94
Change-Id: I1dfbbd1fff5b54b0a63578bb8a9c31f09a560842
Phil Weaver [Fri, 16 Jun 2017 19:59:02 +0000 (19:59 +0000)]
Merge "Stop rounded corners from confusing magnification" into oc-dr1-dev am:
9da5ee9e29
am:
364eb7bbb1
Change-Id: I267bdffd8599daf91dcc6c8a8b707fe3b756eee7
Rob Carr [Fri, 16 Jun 2017 19:55:07 +0000 (19:55 +0000)]
Merge "ViewRootImpl: More null checks for performTraversals." into oc-dev
Android Build Merger (Role) [Fri, 16 Jun 2017 19:52:32 +0000 (19:52 +0000)]
Merge "Merge "Define a meta-data attribute for a carrier icon." into oc-dr1-dev am:
963a20772e" into oc-dr1-dev-plus-aosp
Wale Ogunwale [Fri, 16 Jun 2017 19:42:51 +0000 (12:42 -0700)]
Log last home activity and result we tried to start
To help debug ANR.
Bug:
38121026
Test: manual
Change-Id: I484301810d07dcf7330dfdbab7310eac14638b90
Jeff Davidson [Fri, 16 Jun 2017 19:51:31 +0000 (19:51 +0000)]
Merge "Define a meta-data attribute for a carrier icon." into oc-dr1-dev
am:
963a20772e
Change-Id: Ic64dff49ecec45c4c77486196a8661beec3b142f
Fyodor Kupolov [Fri, 16 Jun 2017 19:51:00 +0000 (19:51 +0000)]
Merge "Always log new user state to event log" into oc-dev
Android Build Merger (Role) [Fri, 16 Jun 2017 19:50:52 +0000 (19:50 +0000)]
Merge "Merge "Merge "Throw IAE when service add null AutofillIds on SaveInfo methods." into oc-dev am:
6cde68752c" into oc-dr1-dev am:
5a9a7f5916" into oc-dr1-dev-plus-aosp
Felipe Leme [Fri, 16 Jun 2017 19:49:50 +0000 (19:49 +0000)]
Merge "Merge "Throw IAE when service add null AutofillIds on SaveInfo methods." into oc-dev am:
6cde68752c" into oc-dr1-dev
am:
5a9a7f5916
Change-Id: Ieaefe0524c98bd58232c5d09b5e163ef6e1a5b7e
Android Build Merger (Role) [Fri, 16 Jun 2017 19:49:33 +0000 (19:49 +0000)]
Merge "Merge "Throw IAE when service add null AutofillIds on SaveInfo methods." into oc-dev am:
6cde68752c am:
a0a799f8ed" into oc-dr1-dev-plus-aosp
Tony Mantler [Fri, 16 Jun 2017 17:50:00 +0000 (10:50 -0700)]
Disable notification sounds on TV
Bug:
38495875
Test: BuzzBeepBlinkTest
Change-Id: Iffebe2063de3d73c1538a3bbbe9edd2233005ba3
Phil Weaver [Fri, 16 Jun 2017 19:46:38 +0000 (19:46 +0000)]
Merge "Stop rounded corners from confusing magnification" into oc-dr1-dev
am:
9da5ee9e29
Change-Id: Iff1167256c76798124abda04240f8e412b39d38a
Felipe Leme [Fri, 16 Jun 2017 19:46:34 +0000 (19:46 +0000)]
Merge "Throw IAE when service add null AutofillIds on SaveInfo methods." into oc-dev am:
6cde68752c
am:
a0a799f8ed
Change-Id: Idb2685e683e6aad64d3c60a9d8a9a61fa203c607
Jeff Davidson [Fri, 16 Jun 2017 19:39:51 +0000 (19:39 +0000)]
Merge "Define a meta-data attribute for a carrier icon." into oc-dr1-dev
OSDN Git Service
