OSDN Git Service
Wale Ogunwale [Fri, 9 Jun 2017 13:15:38 +0000 (13:15 +0000)]
Merge "Fix deadlock when create alert window notification" into oc-dev
am:
678477b383
Change-Id: If4da36399c68f7a91c0ab87d398eb3cdb70f2215
Wale Ogunwale [Fri, 9 Jun 2017 13:07:13 +0000 (13:07 +0000)]
Merge "Fix deadlock when create alert window notification" into oc-dev
Hugo Benichi [Fri, 9 Jun 2017 11:47:25 +0000 (11:47 +0000)]
Merge "Revert "Instrument captive portal login activity"" am:
2921320517
am:
bbddbfc451
Change-Id: I0271fa4138ac9c4f1ddfea648c003a79909214df
Hugo Benichi [Fri, 9 Jun 2017 11:40:01 +0000 (11:40 +0000)]
Merge "Revert "Instrument captive portal login activity""
am:
2921320517
Change-Id: Iacae406a0998bb91c84b73a66ff383dfa8038665
Hugo Benichi [Fri, 9 Jun 2017 11:31:21 +0000 (11:31 +0000)]
Merge "Revert "Instrument captive portal login activity""
Hugo Benichi [Fri, 9 Jun 2017 11:30:05 +0000 (11:30 +0000)]
Revert "Instrument captive portal login activity"
This reverts commit
f867da14eaa194cb53b0726b50e570268e70f1d7.
Change-Id: Ic900c91ed87c2d65c151f8386954bd7b74128348
Bryce Lee [Fri, 9 Jun 2017 11:17:58 +0000 (11:17 +0000)]
Merge "Prioritize reused activity's stack over computed stack." into oc-dev
am:
ac56b8adde
Change-Id: Ib4fd790e9ee235b25ddde40d839c01e7685a2f12
Bryce Lee [Fri, 9 Jun 2017 11:11:12 +0000 (11:11 +0000)]
Merge "Prioritize reused activity's stack over computed stack." into oc-dev
Erik Kline [Fri, 9 Jun 2017 09:23:37 +0000 (09:23 +0000)]
Merge "Convert IControlsTethering from interface into callback" am:
5b9d362b60
am:
ad3fd82f8b
Change-Id: Ib1f41df1200378191c0722a280939ccbde539920
Erik Kline [Fri, 9 Jun 2017 09:16:01 +0000 (09:16 +0000)]
Merge "Convert IControlsTethering from interface into callback"
am:
5b9d362b60
Change-Id: I911548e994761778cf5434b2513d433eeaccd4f3
Erik Kline [Fri, 9 Jun 2017 09:06:39 +0000 (09:06 +0000)]
Merge "Convert IControlsTethering from interface into callback"
Hugo Benichi [Fri, 9 Jun 2017 07:11:46 +0000 (07:11 +0000)]
Merge "Instrument captive portal login activity" am:
b213053def
am:
30b7dfb526
Change-Id: Iec106e30ce9dbb38189fe3888f6111be92816891
Hugo Benichi [Fri, 9 Jun 2017 07:08:25 +0000 (07:08 +0000)]
Merge "New Metrics constants for captive portal related UI" am:
aac9aff5dc
am:
75792d4299 -s ours
Change-Id: Ic7a559a6a5759dc0528e2a2d167d999b208225dd
Hugo Benichi [Fri, 9 Jun 2017 06:50:52 +0000 (06:50 +0000)]
Merge "Instrument captive portal login activity"
am:
b213053def
Change-Id: Ic8205b609f8c6e0bc04eac17c3bcbe7df0508207
Hugo Benichi [Fri, 9 Jun 2017 06:47:47 +0000 (06:47 +0000)]
Merge "New Metrics constants for captive portal related UI"
am:
aac9aff5dc
Change-Id: Ib55742148a08ae21f01539939e41699cdb581ca2
Hugo Benichi [Fri, 9 Jun 2017 06:39:19 +0000 (06:39 +0000)]
Merge "Instrument captive portal login activity"
Hugo Benichi [Fri, 9 Jun 2017 06:38:09 +0000 (06:38 +0000)]
Merge "New Metrics constants for captive portal related UI"
Hugo Benichi [Mon, 5 Jun 2017 05:52:24 +0000 (14:52 +0900)]
Instrument captive portal login activity
Also add CAPTIVE_PORTAL_LOGIN_ACTIVITY_SSL_ERROR constants to
metrics_constants.proto for counting ssl error pages shown by the
captive portal login activity.
Bug:
36203355
Bug:
34901696
Bug:
36532213
Test: manually tested with captive portal testing setup while watching
event logs: adb logcat -b events | grep captiveportallogin
06-08 16:25:20.279 21558 21558 I sysui_action: [1004,com.android.captiveportallogin]
06-08 17:01:04.052 21558 21558 I sysui_action: [1007,com.android.captiveportallogin]
Merged-In: Ia05853506d424ad4cb2c11770ae7718fbef3f01c
(cherry picked from commit
c61dc92fc0619d101c4b789f6305012701cc47a0)
Change-Id: I9184f6263a003c2be28f41a550c6164c8d6ee907
Selim Cinek [Fri, 9 Jun 2017 04:38:10 +0000 (04:38 +0000)]
Merge "Fixed an issue where the notification could stay userlocked" into oc-dev
am:
dc66506f0a
Change-Id: I541a5d64c0111057b709ca7179ff439da02bed29
Selim Cinek [Fri, 9 Jun 2017 04:30:51 +0000 (04:30 +0000)]
Merge "Fixed a bug where systemui could crash while cloning" into oc-dev
am:
b9eb205bd7
Change-Id: I5b1ff4ba5708c7d470940fd46074aefe9c210b83
Selim Cinek [Fri, 9 Jun 2017 04:25:36 +0000 (04:25 +0000)]
Merge "Fixed an issue where the notification could stay userlocked" into oc-dev
Selim Cinek [Fri, 9 Jun 2017 04:21:59 +0000 (04:21 +0000)]
Merge "Fixed a bug where systemui could crash while cloning" into oc-dev
Jorim Jaggi [Fri, 9 Jun 2017 04:16:28 +0000 (04:16 +0000)]
Merge "Properly run window animations at vsync-sf (1/2)" into oc-dev
am:
d1f55f6302
Change-Id: Ibc28f6019637dbc9696c62f1ad1ce4679954fbd5
Jorim Jaggi [Fri, 9 Jun 2017 04:11:29 +0000 (04:11 +0000)]
Merge "Boost android.anim and wm lock sections to -10 during transition" into oc-dev
am:
713ad88afe
Change-Id: Idd18d8e092b1628eb0a08d579d6a6a488ce01026
Jorim Jaggi [Fri, 9 Jun 2017 04:06:38 +0000 (04:06 +0000)]
Merge "Properly run window animations at vsync-sf (1/2)" into oc-dev
Jorim Jaggi [Fri, 9 Jun 2017 04:05:31 +0000 (04:05 +0000)]
Merge "Boost android.anim and wm lock sections to -10 during transition" into oc-dev
Jorim Jaggi [Thu, 8 Jun 2017 22:40:38 +0000 (15:40 -0700)]
Properly run window animations at vsync-sf (1/2)
- Add new Choreographer instance that runs on vsync-sf
- Use this new Choreographer for WindowAnimator, and remove all
the hacks around it
Test: Open apps and close apps, notice no stutter
Test: Screen zoom animations
Test: go/wm-smoke
Bug:
36631902
Change-Id: I988ae25645effc3ac20efa7cb9b68f23444da0d0
Jakub Pawlowski [Fri, 9 Jun 2017 00:01:44 +0000 (00:01 +0000)]
Merge "Bluetooth: fix connectGatt overload invocations" into oc-dev
am:
556b10a4e6
Change-Id: I92c46f849d80794d6c658b4ec0cfd071bf89a7bf
Wale Ogunwale [Thu, 8 Jun 2017 23:51:48 +0000 (16:51 -0700)]
Fix deadlock when create alert window notification
Don't hold WM lock when calling into notification manager which
can call into activity manager.
Test: Make sure alert window notification is displayed
Change-Id: Id8831878093f8079f815a830ff8acdfad99d48cb
Fixes:
62458061
Jakub Pawlowski [Thu, 8 Jun 2017 23:51:21 +0000 (23:51 +0000)]
Merge "Bluetooth: fix connectGatt overload invocations" into oc-dev
Android Build Merger (Role) [Thu, 8 Jun 2017 23:44:38 +0000 (23:44 +0000)]
Merge "Merge "Fixes the animation and state when docking a task by drag" into oc-dev am:
008e620153" into oc-dev-plus-aosp
Matthew Ng [Thu, 8 Jun 2017 23:43:49 +0000 (23:43 +0000)]
Merge "Fixes the animation and state when docking a task by drag" into oc-dev
am:
008e620153
Change-Id: If6a7101ba7055e23562b87195f35f1e068048389
Matthew Ng [Thu, 8 Jun 2017 23:31:02 +0000 (23:31 +0000)]
Merge "Fixes the animation and state when docking a task by drag" into oc-dev
am:
008e620153
Change-Id: If1947aac627b92213202b22b721a397492173508
Bill Yi [Thu, 8 Jun 2017 23:23:02 +0000 (23:23 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
dd5886bc5b -s ours
Change-Id: I99f7800bccdd03503185c593f86c1daab328c7f5
TreeHugger Robot [Thu, 8 Jun 2017 23:21:05 +0000 (23:21 +0000)]
Merge "Fixes the animation and state when docking a task by drag" into oc-dev
Bill Yi [Thu, 8 Jun 2017 23:14:52 +0000 (23:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
67a947b636 -s ours
Change-Id: I87e77b18f173d20154743daf5e735bf72bfc685f
Bill Yi [Thu, 8 Jun 2017 23:04:51 +0000 (23:04 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Thu, 8 Jun 2017 23:03:52 +0000 (23:03 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Jorim Jaggi [Wed, 7 Jun 2017 21:33:04 +0000 (14:33 -0700)]
Boost android.anim and wm lock sections to -10 during transition
-4 is not enough if we have to compete against RT and main thread
from top app that have -10. Boost it more during app transitions
Test: Inspect systrace, make sure priorities are right, including
getting reset after the transition.
Test: Open Chrome 100x
Test: go/wm-smoke
Change-Id: Id6b060b8aafded67b4bae61b6e8960e37976b096
Fixes:
36631902
Bill Yi [Thu, 8 Jun 2017 22:45:15 +0000 (22:45 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
75b5199e9d -s ours
Change-Id: I3393f85819b8ed0fec35cfa0cbea0899141d73dc
Bill Yi [Thu, 8 Jun 2017 22:34:26 +0000 (22:34 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Mathieu Chartier [Thu, 8 Jun 2017 22:00:09 +0000 (22:00 +0000)]
Merge "Add system property for hot startup method threshold" am:
a370159592
am:
187b15bbd5
Change-Id: Id56adbe39e8a81ef12c4b9d8fdcf65c94a316d6f
Mathieu Chartier [Thu, 8 Jun 2017 21:54:22 +0000 (21:54 +0000)]
Merge "Add system property for hot startup method threshold"
am:
a370159592
Change-Id: I271cf74364b7b9c2d16282ef6a9ab24b6d243e1e
Mathieu Chartier [Thu, 8 Jun 2017 21:44:06 +0000 (21:44 +0000)]
Merge "Add system property for hot startup method threshold"
Android Build Merger (Role) [Thu, 8 Jun 2017 21:23:30 +0000 (21:23 +0000)]
Merge "Merge "Revert "always adjust per-user application info"" into oc-dev am:
887544e100" into oc-dev-plus-aosp
Adam Lesinski [Thu, 8 Jun 2017 21:22:21 +0000 (21:22 +0000)]
Merge "Revert "always adjust per-user application info"" into oc-dev
am:
887544e100
Change-Id: I944c449954876353c7e597fca19ac5fe00e62906
Jakub Pawlowski [Thu, 8 Jun 2017 21:20:27 +0000 (21:20 +0000)]
Merge "Bluetooth: fix connectGatt overload invocations" am:
404e9f209f
am:
c0fed83b84
Change-Id: I871bc30dcd7aeb5c4a6f6c15d84b43dee84994f2
Adam Lesinski [Thu, 8 Jun 2017 21:14:02 +0000 (21:14 +0000)]
Merge "Revert "always adjust per-user application info"" into oc-dev
Jakub Pawlowski [Thu, 8 Jun 2017 21:12:26 +0000 (21:12 +0000)]
Merge "Bluetooth: fix connectGatt overload invocations"
am:
404e9f209f
Change-Id: I01699795f733fbf46af10ba25afd8cb3feecc9ea
Adam Lesinski [Thu, 8 Jun 2017 20:16:39 +0000 (20:16 +0000)]
Revert "always adjust per-user application info"
This reverts commit
e0046cecb079ec4d063444cee64795a6b734e6e7.
Reason for revert: Regresses UI theme
Bug:
62445682
Bug:
36561125
Change-Id: I9b60bd8e4eb89129368d38e83c0036ab459a524e
Jakub Pawlowski [Wed, 7 Jun 2017 20:45:33 +0000 (13:45 -0700)]
Bluetooth: fix connectGatt overload invocations
Merged-In: I726252e85e78bff2c9585332d2748a0d92a9f6d3
Test: sl4a GattOverBrEdrTest
Bug:
62387078
Change-Id: I5bfb87683e25f8862587e8000eb4c9bb6ff14f99
Jakub Pawlowski [Thu, 8 Jun 2017 20:59:33 +0000 (20:59 +0000)]
Merge "Bluetooth: fix connectGatt overload invocations"
Selim Cinek [Thu, 8 Jun 2017 20:20:08 +0000 (13:20 -0700)]
Fixed a bug where systemui could crash while cloning
Because cloning wasn't synchronized, the notification
could become a non-root temporarily which in turn could
lead to a crash.
1. We're now properly synchronizing the cloning, such that
this can't happen anymore
2. We're now only cloning the old statusbar notification lightly
instead of heavily to avoid this altogether
Test: manual, update decoratedcustomview notifications really fast
Change-Id: Ia6525eec64ad9a26956ca2198e20198f55b2173c
Fixes:
62181033
Tyler Gunn [Thu, 8 Jun 2017 20:15:58 +0000 (20:15 +0000)]
Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev
am:
980582e555
Change-Id: I50666f5d3c4e224221a07a170598a5ea25d5f5ef
Tyler Gunn [Thu, 8 Jun 2017 20:06:52 +0000 (20:06 +0000)]
Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev
Daichi Hirono [Thu, 8 Jun 2017 18:30:15 +0000 (18:30 +0000)]
Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev
am:
ebb6e998d5
Change-Id: I8973b62b103f4f40275bc5681f54b5957385ecb1
TreeHugger Robot [Thu, 8 Jun 2017 18:25:24 +0000 (18:25 +0000)]
Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev
Jakub Pawlowski [Wed, 7 Jun 2017 20:45:33 +0000 (13:45 -0700)]
Bluetooth: fix connectGatt overload invocations
Test: sl4a GattOverBrEdrTest
Bug:
62387078
Change-Id: I5bfb87683e25f8862587e8000eb4c9bb6ff14f99
Mady Mellor [Thu, 8 Jun 2017 17:46:14 +0000 (17:46 +0000)]
Merge "Ensure the menu items are properly recreated after a density change" into oc-dev
am:
f574869c11
Change-Id: I9794ac492099f5a359a25652a49e94ef933e4e0c
Winson Chung [Thu, 8 Jun 2017 17:43:12 +0000 (17:43 +0000)]
Merge "Fix crash when deleting task" into oc-dev
am:
c6fa8ee018
Change-Id: Icb2d14ee8f7d5646e248aa010bcf731b6f1ff60f
TreeHugger Robot [Thu, 8 Jun 2017 17:39:37 +0000 (17:39 +0000)]
Merge "Ensure the menu items are properly recreated after a density change" into oc-dev
Winson Chung [Thu, 8 Jun 2017 17:37:53 +0000 (17:37 +0000)]
Merge "Fix crash when deleting task" into oc-dev
Selim Cinek [Thu, 8 Jun 2017 16:54:58 +0000 (09:54 -0700)]
Fixed an issue where the notification could stay userlocked
When collapsing the shade while draging down (using fingerprint)
notifications would stay userlocked and would appear in a small
height instead of their regular size.
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarWindowViewTest.java
Change-Id: Ibd97a6ce063bc2fcd76f11e010e781a61bd76b5f
Fixes:
36469584
Jason Monk [Thu, 8 Jun 2017 16:41:05 +0000 (16:41 +0000)]
Merge "Move QS cell indicator back into mobile data tile" into oc-dev
am:
a5b457b3bf
Change-Id: I09bcb45a8931b8fedae967b1d88ab594164a9dc7
Jason Monk [Thu, 8 Jun 2017 16:35:21 +0000 (16:35 +0000)]
Merge "Move QS cell indicator back into mobile data tile" into oc-dev
Bill Yi [Thu, 8 Jun 2017 16:13:11 +0000 (09:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia22276dc15f3b81471bb4061fc9080c1a117fa8a
Auto-generated-cl: translation import
Svetoslav Ganov [Thu, 8 Jun 2017 16:04:17 +0000 (16:04 +0000)]
Merge "Ensure only test print services enabled - framework" into oc-dev
am:
053fb9120e
Change-Id: I70220ead15eabfe58727ab5c3b0a9c92e8c508a8
Bill Yi [Thu, 8 Jun 2017 16:03:09 +0000 (09:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: If81fd2fdf1a8be8da0741c76a166466bf6680a4b
Auto-generated-cl: translation import
Jesse Hall [Thu, 8 Jun 2017 15:56:17 +0000 (15:56 +0000)]
Merge "Allow disabling GL preload even if gfxdriver isn't updatable" am:
9cf8c281d2
am:
00c6c3be77
Change-Id: I15b4288df07fe2f1fb5d0b4f6404708c116149ff
TreeHugger Robot [Thu, 8 Jun 2017 15:55:05 +0000 (15:55 +0000)]
Merge "Ensure only test print services enabled - framework" into oc-dev
Jesse Hall [Thu, 8 Jun 2017 15:41:46 +0000 (15:41 +0000)]
Merge "Allow disabling GL preload even if gfxdriver isn't updatable"
am:
9cf8c281d2
Change-Id: I025787589009c11bd5477777105b2a5ab2c5f592
Jesse Hall [Thu, 8 Jun 2017 15:34:42 +0000 (15:34 +0000)]
Merge "Allow disabling GL preload even if gfxdriver isn't updatable"
Bill Yi [Thu, 8 Jun 2017 14:49:22 +0000 (07:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I425ed8791fdbbe1047353b9dae225080bbee78d8
Auto-generated-cl: translation import
Andrei Stingaceanu [Thu, 8 Jun 2017 14:44:55 +0000 (14:44 +0000)]
Merge "Fix unexpected DatePicker validation" into oc-dev
am:
cd603221e1
Change-Id: Id06c3a8d76954f40c99673db034342c9023cc408
Wale Ogunwale [Thu, 8 Jun 2017 14:41:31 +0000 (14:41 +0000)]
Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev
am:
13059cc2ad
Change-Id: Iccf433dd506f42ae07531fe9cd0fa239882d4cf2
TreeHugger Robot [Thu, 8 Jun 2017 14:36:07 +0000 (14:36 +0000)]
Merge "Fix unexpected DatePicker validation" into oc-dev
Wale Ogunwale [Thu, 8 Jun 2017 14:33:03 +0000 (14:33 +0000)]
Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev
Selim Cinek [Thu, 8 Jun 2017 14:15:33 +0000 (14:15 +0000)]
Merge "Fixed a bug where the navigation notification would flicker" into oc-dev
am:
b18f65a168
Change-Id: I53abb4f31f8dc660ba9b140475bbd121df524613
Selim Cinek [Thu, 8 Jun 2017 14:07:14 +0000 (14:07 +0000)]
Merge "Fixed a bug where the navigation notification would flicker" into oc-dev
Erik Kline [Thu, 8 Jun 2017 13:32:53 +0000 (13:32 +0000)]
Delete legacy "wifi interface name guessing" behaviour
am:
9e22554068
Change-Id: I25e3814f979dbe65055498c85b34411cf6d3c996
Erik Kline [Tue, 6 Jun 2017 10:24:21 +0000 (19:24 +0900)]
Convert IControlsTethering from interface into callback
Additionally:
- add updateLinkProperties() method to new callback
- skeletally connect LinkProperties updates through
to OffloadController
TODOs liberally sprinkled through out.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
29337859
Bug:
32163131
Change-Id: I631d17b26be153534551a1615931fc98b598b953
Erik Kline [Thu, 8 Jun 2017 12:20:31 +0000 (12:20 +0000)]
Merge "Move findPreferredUpstreamType into UNM" am:
32703994fe
am:
8bc87070f9
Change-Id: Ia215e55b69b856f5511e5d4f852e39fa6c11462e
Erik Kline [Thu, 8 Jun 2017 12:11:59 +0000 (12:11 +0000)]
Merge "Move findPreferredUpstreamType into UNM"
am:
32703994fe
Change-Id: I20e90906e72bc8bba9f0f535d54ba430f96191ff
Treehugger Robot [Thu, 8 Jun 2017 12:02:59 +0000 (12:02 +0000)]
Merge "Move findPreferredUpstreamType into UNM"
Erik Kline [Thu, 8 Jun 2017 08:48:48 +0000 (17:48 +0900)]
Delete legacy "wifi interface name guessing" behaviour
Now that Wi-Fi always passes us the AP interface name (and mode)
we no longer need to guess which interface on which we're supposed
to be starting IP serving (either tethering or local-only hotspot).
Test: as follows
- built
- flashed
- booted
- TetheringTest passes
Bug:
32163131
Bug:
62343300
Change-Id: I6019410ee5adff4929690d35ba09294765fcd6a4
Erik Kline [Mon, 5 Jun 2017 07:02:02 +0000 (16:02 +0900)]
Move findPreferredUpstreamType into UNM
This changes the way in which available networks are found. Previously
Tethering asked ConnectivityService for NetworkInfo and checked for
whether or not it was in state CONNECTED.
Here we use the fact that ConnectivityService will not call UNM's
callbacks' onAvailable() methods until the networks in question have
become connected.
Test: as follows
- built
- flashed
- booted
- runtest framework-net passed
Bug:
32163131
Change-Id: I97abe225fdd3accb38bd9168f545445b761a90d8
Felipe Leme [Thu, 8 Jun 2017 05:25:17 +0000 (05:25 +0000)]
Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev
am:
9be8c96918
Change-Id: I5cb2eb64772ea9f3fc189f629be0ddcd29fbe4d9
Felipe Leme [Thu, 8 Jun 2017 05:21:02 +0000 (05:21 +0000)]
Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev
Mark Rathjen [Thu, 8 Jun 2017 04:50:16 +0000 (04:50 +0000)]
Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev
am:
3492ed4376
Change-Id: I424396abf3e403abd1eec8a529b0b322019b7a01
Mark Rathjen [Thu, 8 Jun 2017 04:43:56 +0000 (04:43 +0000)]
Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev
Yuchen He [Thu, 8 Jun 2017 04:38:16 +0000 (04:38 +0000)]
Merge "Fix AeModeAndLock test cases. Bug:
36103813" into oc-dev
am:
3671e9249b
Change-Id: I2ebc01dc54f654d60e03696490c681a656a7b958
Yuchen He [Thu, 8 Jun 2017 04:32:31 +0000 (04:32 +0000)]
Merge "Fix AeModeAndLock test cases. Bug:
36103813" into oc-dev
Andreas Gampe [Thu, 8 Jun 2017 03:22:23 +0000 (03:22 +0000)]
Merge "Framework: Remove SamplingProfiler" am:
d2ecee2506
am:
3ea0309e39 -s ours
Change-Id: I41f6a58ee13d3b07298d41d9dfea330e91547b9b
Andreas Gampe [Thu, 8 Jun 2017 03:16:54 +0000 (03:16 +0000)]
Merge "Framework: Remove SamplingProfiler"
am:
d2ecee2506
Change-Id: Iccba75c67041593131bec64e518a1bd968cb1bb0
Treehugger Robot [Thu, 8 Jun 2017 03:05:57 +0000 (03:05 +0000)]
Merge "Framework: Remove SamplingProfiler"
Adam Bookatz [Thu, 8 Jun 2017 02:48:32 +0000 (02:48 +0000)]
Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev
am:
6029bce3b4
Change-Id: I67da5b543fc839031d3d2544f3723b730edaa1a8
Adam Bookatz [Thu, 8 Jun 2017 02:43:14 +0000 (02:43 +0000)]
Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev
Svetoslav Ganov [Thu, 8 Jun 2017 01:50:02 +0000 (18:50 -0700)]
Ensure only test print services enabled - framework
Test: cts-tradefed run cts-dev -m CtsPrintTestCas
bug:
62232727
Change-Id: I1050272586d1c03dc1b1dfdb8b10e258912a249b
Todd Kennedy [Thu, 8 Jun 2017 01:49:03 +0000 (01:49 +0000)]
Merge changes Iea24e5a1,If71385bc into oc-dev
am:
3834421c96
Change-Id: I6ed4a41dbd9af3a97b774e7d2854fea1c66cc582
Phil Weaver [Thu, 8 Jun 2017 01:45:56 +0000 (01:45 +0000)]
Merge "Confirm a11y shortcut service for correct user" into oc-dev
am:
03a5b3a509
Change-Id: I99dbc13b0456e05f42d47b887e999931658f101d
OSDN Git Service
