OSDN Git Service
Etan Cohen [Thu, 27 Jul 2017 18:26:44 +0000 (18:26 +0000)]
Merge "[RTT] Add a binder to the AIDL to enable cleanup" into oc-mr1-dev
am:
df33967d19
Change-Id: I9cd1dd0827c0228b1e82970d1c1444f020a98154
Etan Cohen [Thu, 27 Jul 2017 18:16:49 +0000 (18:16 +0000)]
Merge "[P2P][AsyncChannel] Revert client registering for service death" into oc-mr1-dev
am:
5b81cfe83c
Change-Id: I45c2d0818657a5c4e8cc35f6ad09f2e7d7f77cea
Etan Cohen [Thu, 27 Jul 2017 18:11:36 +0000 (18:11 +0000)]
Merge "[RTT] Add a binder to the AIDL to enable cleanup" into oc-mr1-dev
TreeHugger Robot [Thu, 27 Jul 2017 18:07:19 +0000 (18:07 +0000)]
Merge "[P2P][AsyncChannel] Revert client registering for service death" into oc-mr1-dev
Android Build Merger (Role) [Thu, 27 Jul 2017 17:45:21 +0000 (17:45 +0000)]
Merge "Merge "Lock down IME switcher notification handling" into oc-mr1-dev am:
37f2e48697" into oc-mr1-dev-plus-aosp
Steven Moreland [Thu, 27 Jul 2017 17:41:38 +0000 (17:41 +0000)]
Merge "ActivityManagerService: fix nativehelper includes" am:
c372715beb -s ours am:
4d28662818 -s ours am:
b6c4ccb724 -s ours
am:
5738af9abc -s ours
Change-Id: Idc5e97bcf1290adbcf6b0a89a077596d03916dc2
Yohei Yukawa [Thu, 27 Jul 2017 17:41:12 +0000 (17:41 +0000)]
Merge "Lock down IME switcher notification handling" into oc-mr1-dev
am:
37f2e48697
Change-Id: I1018dff61ef7898f999c6f58ddb82aa41d6f91f6
Android Build Merger (Role) [Thu, 27 Jul 2017 17:38:39 +0000 (17:38 +0000)]
Merge "Merge "AOD: Fix wakeup transition jank" into oc-dr1-dev am:
6efe486397 am:
6a7dc737a5" into oc-mr1-dev-plus-aosp
Adrian Roos [Thu, 27 Jul 2017 17:37:13 +0000 (17:37 +0000)]
Merge "AOD: Fix wakeup transition jank" into oc-dr1-dev am:
6efe486397
am:
6a7dc737a5
Change-Id: Idaf64e69087d813cec9d5982ec5f90e059de748c
Android Build Merger (Role) [Thu, 27 Jul 2017 17:36:05 +0000 (17:36 +0000)]
Merge "Merge "Merge "Tidy up RulesManagerService code" am:
d5517c39e8 am:
ef21b72dd1 am:
c2f58098c1" into oc-dr1-dev-plus-aosp am:
224980cda6" into oc-mr1-dev-plus-aosp
Yohei Yukawa [Thu, 27 Jul 2017 17:33:36 +0000 (17:33 +0000)]
Merge "Lock down IME switcher notification handling" into oc-mr1-dev
Neil Fuller [Thu, 27 Jul 2017 17:33:24 +0000 (17:33 +0000)]
Merge "Merge "Tidy up RulesManagerService code" am:
d5517c39e8 am:
ef21b72dd1 am:
c2f58098c1" into oc-dr1-dev-plus-aosp
am:
224980cda6
Change-Id: I768fa05e22981b6645cced385f0663620f51e04b
Adrian Roos [Thu, 27 Jul 2017 17:33:02 +0000 (17:33 +0000)]
Merge "AOD: Fix wakeup transition jank" into oc-dr1-dev am:
6efe486397
am:
0dbe7df15e
Change-Id: Ifd8ce512455b1c994eda43466af3102c1ced172a
Michael Wright [Thu, 27 Jul 2017 17:27:42 +0000 (17:27 +0000)]
Merge "Report the display is off when the hardware blanks itself." into oc-dr1-dev am:
bf9b1dbb66 -s ours
am:
985fad4d15 -s ours
Change-Id: I50e51154872bfbb548dbc57cf73b0d00dc4f1189
Steven Moreland [Thu, 27 Jul 2017 17:27:31 +0000 (17:27 +0000)]
Merge "ActivityManagerService: fix nativehelper includes" am:
c372715beb -s ours am:
4d28662818 -s ours
am:
b6c4ccb724 -s ours
Change-Id: I451558f083495ff80b44f41f66fd18f1cbe1a6fe
Android Build Merger (Role) [Thu, 27 Jul 2017 17:25:09 +0000 (17:25 +0000)]
Merge "Merge "Report the display is off when the hardware blanks itself." into oc-dr1-dev am:
bf9b1dbb66 am:
22df0a5ae2 -s ours" into oc-mr1-dev-plus-aosp
Adrian Roos [Thu, 27 Jul 2017 17:23:00 +0000 (17:23 +0000)]
Merge "AOD: Fix wakeup transition jank" into oc-dr1-dev
am:
6efe486397
Change-Id: I016efc215fa8fcf66a814f7cdf25a8ae0cc13e75
Michael Wright [Thu, 27 Jul 2017 17:22:02 +0000 (17:22 +0000)]
Merge "Report the display is off when the hardware blanks itself." into oc-dr1-dev am:
bf9b1dbb66
am:
22df0a5ae2 -s ours
Change-Id: I540efcf49dc593654e816fe294b7cea6e9f741a6
Michael Wright [Thu, 27 Jul 2017 17:21:06 +0000 (17:21 +0000)]
Report the display is off when the hardware blanks itself. am:
410fd1b838 -s ours
am:
ef464c498f -s ours
Change-Id: Idd56b9f2f36ccc284c09160c06476aa4b9232b58
Adrian Roos [Thu, 27 Jul 2017 17:20:40 +0000 (17:20 +0000)]
Merge "AOD: Fix wakeup transition jank" into oc-dr1-dev
am:
6efe486397
Change-Id: I9e73507cf6964a7d6747eb1bdea9eb6e8a547d6a
Michael Wright [Thu, 27 Jul 2017 17:20:02 +0000 (17:20 +0000)]
Merge "Report the display is off when the hardware blanks itself." into oc-dr1-dev
am:
bf9b1dbb66 -s ours
Change-Id: I1bf0773df207deb55b8e4b8952919c875591e909
Steven Moreland [Thu, 27 Jul 2017 17:19:56 +0000 (17:19 +0000)]
Merge "ActivityManagerService: fix nativehelper includes" am:
c372715beb -s ours
am:
4d28662818 -s ours
Change-Id: I2a858e502449ace2c9c40ecb53e00dfff6d64dd8
Android Build Merger (Role) [Thu, 27 Jul 2017 17:16:44 +0000 (17:16 +0000)]
Merge "Merge "Tidy up RulesManagerService code" am:
d5517c39e8 am:
ef21b72dd1 am:
c2f58098c1" into oc-dr1-dev-plus-aosp
Neil Fuller [Thu, 27 Jul 2017 17:14:34 +0000 (17:14 +0000)]
Merge "Tidy up RulesManagerService code" am:
d5517c39e8 am:
ef21b72dd1
am:
c2f58098c1
Change-Id: I70c224eb853e41ed216bebf608f9b540d69514a2
Steven Moreland [Thu, 27 Jul 2017 17:13:38 +0000 (17:13 +0000)]
Merge "ActivityManagerService: fix nativehelper includes"
am:
c372715beb -s ours
Change-Id: I57d45557c585238f9e98e0bf81c06058235d7e74
Michael Wright [Thu, 27 Jul 2017 17:12:53 +0000 (17:12 +0000)]
Report the display is off when the hardware blanks itself.
am:
410fd1b838 -s ours
Change-Id: I1af77c81d740876748958664fb78337d9939e136
Michael Wright [Thu, 27 Jul 2017 17:12:26 +0000 (17:12 +0000)]
Merge "Report the display is off when the hardware blanks itself." into oc-dr1-dev
am:
bf9b1dbb66
Change-Id: I6b5a1eeb546e7cd1b15a20d670d65429bfda5c82
TreeHugger Robot [Thu, 27 Jul 2017 17:05:31 +0000 (17:05 +0000)]
Merge "AOD: Fix wakeup transition jank" into oc-dr1-dev
Neil Fuller [Thu, 27 Jul 2017 17:05:27 +0000 (17:05 +0000)]
Merge "Tidy up RulesManagerService code" am:
d5517c39e8
am:
ef21b72dd1
Change-Id: I600ee50f8c5c463853035c2a83e43d2ce0149caa
TreeHugger Robot [Thu, 27 Jul 2017 17:03:17 +0000 (17:03 +0000)]
Merge "Report the display is off when the hardware blanks itself." into oc-dr1-dev
Android Build Merger (Role) [Thu, 27 Jul 2017 17:01:19 +0000 (17:01 +0000)]
Merge "Merge "Add theme variables to SysUI dump" into oc-dr1-dev am:
4451b6ae19 am:
98c63ca9ac" into oc-mr1-dev-plus-aosp
Treehugger Robot [Thu, 27 Jul 2017 17:00:13 +0000 (17:00 +0000)]
Merge "ActivityManagerService: fix nativehelper includes"
Lucas Dupin [Thu, 27 Jul 2017 16:58:43 +0000 (16:58 +0000)]
Merge "Add theme variables to SysUI dump" into oc-dr1-dev am:
4451b6ae19
am:
98c63ca9ac
Change-Id: I2264136dea35f9eb4d08c0a43e591c06d863c2ba
Lucas Dupin [Thu, 27 Jul 2017 16:58:28 +0000 (16:58 +0000)]
Merge "Add theme variables to SysUI dump" into oc-dr1-dev am:
4451b6ae19
am:
3a5550a3be
Change-Id: I18f59c0d2ab20ae38c29bc6135920dfe4e8cc647
Neil Fuller [Thu, 27 Jul 2017 16:58:02 +0000 (16:58 +0000)]
Merge "Tidy up RulesManagerService code"
am:
d5517c39e8
Change-Id: I56afb0031c2768ea5aed0797b64c9ebda91be8e8
Lucas Dupin [Thu, 27 Jul 2017 16:49:50 +0000 (16:49 +0000)]
Merge "Add theme variables to SysUI dump" into oc-dr1-dev
am:
4451b6ae19
Change-Id: Ia176aeafa9c9e2d0b979a472bb444657b4417ab9
Lucas Dupin [Thu, 27 Jul 2017 16:49:49 +0000 (16:49 +0000)]
Merge "Add theme variables to SysUI dump" into oc-dr1-dev
am:
4451b6ae19
Change-Id: I1549a77346b4c7c417ba2fa7a2b77a9b0ea2ea2a
Neil Fuller [Thu, 27 Jul 2017 16:48:58 +0000 (16:48 +0000)]
Merge "Tidy up RulesManagerService code"
Lucas Dupin [Thu, 27 Jul 2017 16:41:12 +0000 (16:41 +0000)]
Merge "Add theme variables to SysUI dump" into oc-dr1-dev
Neil Fuller [Thu, 27 Jul 2017 16:11:51 +0000 (16:11 +0000)]
Merge "Alter condition for starting RulesManagerService" into oc-mr1-dev
am:
1807d585b5
Change-Id: I3614a67ebf3d82f7e9bb8c99bfac02053fe053b9
Neil Fuller [Thu, 27 Jul 2017 16:02:50 +0000 (16:02 +0000)]
Merge "Alter condition for starting RulesManagerService" into oc-mr1-dev
Steven Moreland [Wed, 26 Jul 2017 19:21:58 +0000 (12:21 -0700)]
ActivityManagerService: fix nativehelper includes
Bug:
63762847
Test: none
Merged-In: I9f9497990fbf0697d05445f563ad46a28d6d6eeb
Change-Id: I964c88cb74f0287dfc6634fbfcd3210a7d984213
Felipe Leme [Thu, 27 Jul 2017 15:21:40 +0000 (15:21 +0000)]
Merge "Don't show Save UI when values filled by user belong to a dataset." into oc-mr1-dev
am:
e802d18f49
Change-Id: I1ec79f54c600723b8e0409b26f4cc9ffd01130d8
Android Build Merger (Role) [Thu, 27 Jul 2017 15:16:55 +0000 (15:16 +0000)]
Merge "Merge "AOD: Make sure to update visibilities after instant expanding" into oc-dr1-dev am:
4bb2f8e9fb am:
5106255d4f" into oc-mr1-dev-plus-aosp
Adrian Roos [Thu, 27 Jul 2017 15:14:39 +0000 (15:14 +0000)]
Merge "AOD: Make sure to update visibilities after instant expanding" into oc-dr1-dev am:
4bb2f8e9fb
am:
5106255d4f
Change-Id: I6ebf2cbd3b67e94e2088badddce659a98972f1a0
Adrian Roos [Thu, 27 Jul 2017 15:14:08 +0000 (15:14 +0000)]
Merge "AOD: Make sure to update visibilities after instant expanding" into oc-dr1-dev am:
4bb2f8e9fb
am:
79150c22e6
Change-Id: I8db6e55c7d045df8b9795e375754c57c1e32dfe0
Felipe Leme [Thu, 27 Jul 2017 15:11:22 +0000 (15:11 +0000)]
Merge "Don't show Save UI when values filled by user belong to a dataset." into oc-mr1-dev
Hugo Benichi [Thu, 27 Jul 2017 15:08:19 +0000 (15:08 +0000)]
Merge "NetworkNotificationManager: correctly handle existing notifications" am:
3451fb6156 am:
ef7d6d93c3 am:
5cbf7e2dc8
am:
1609fe7fe3
Change-Id: Ieed9e3e7755e0c5f89dc41ef66f47d4dbf4c66a9
Adrian Roos [Thu, 27 Jul 2017 15:05:39 +0000 (15:05 +0000)]
Merge "AOD: Make sure to update visibilities after instant expanding" into oc-dr1-dev
am:
4bb2f8e9fb
Change-Id: Ica37d75f7e45ad418113196b077fa4244512adc4
Adrian Roos [Thu, 27 Jul 2017 15:05:38 +0000 (15:05 +0000)]
Merge "AOD: Make sure to update visibilities after instant expanding" into oc-dr1-dev
am:
4bb2f8e9fb
Change-Id: I7bc8b27c8c964c280ec78f3e0d2564a62fc39bf9
Adrian Roos [Thu, 27 Jul 2017 14:58:45 +0000 (14:58 +0000)]
Merge "AOD: Make sure to update visibilities after instant expanding" into oc-dr1-dev
Hugo Benichi [Thu, 27 Jul 2017 14:58:32 +0000 (14:58 +0000)]
Merge "NetworkNotificationManager: correctly handle existing notifications" am:
3451fb6156 am:
ef7d6d93c3
am:
5cbf7e2dc8
Change-Id: I73cc879e910d503946facdba498b300337f349fd
Adrian Roos [Tue, 25 Jul 2017 14:29:27 +0000 (16:29 +0200)]
AOD: Make sure to update visibilities after instant expanding
Fixes an issue where disable flags were not applied properly because
they were not recomputed after expanding the PanelBar.
Change-Id: I6933ba4951bf768a15a9d4f58728558939f106ae
Fixes:
64001235
Test: Open camera, put to landscape, press power; Verify time and battery icon are not visible in transition.
Michael Wright [Thu, 27 Jul 2017 14:54:25 +0000 (14:54 +0000)]
Merge changes from topic 'aod-mr1' into oc-mr1-dev
am:
352d099c83
Change-Id: Ia19dcf394ea8eb0350639dcd8e290ec6cd97b6fa
Michael Wright [Thu, 27 Jul 2017 14:53:31 +0000 (14:53 +0000)]
Report the display is off when the hardware blanks itself.
am:
c3e6af8769
Change-Id: I0c6668265b9b762dad80d931113541804d9cc5b0
Hugo Benichi [Thu, 27 Jul 2017 14:50:14 +0000 (14:50 +0000)]
Merge "NetworkNotificationManager: correctly handle existing notifications" am:
3451fb6156
am:
ef7d6d93c3
Change-Id: I74631b0bfd14daf18a1641ed7f2ec323d636ebbf
TreeHugger Robot [Thu, 27 Jul 2017 14:45:53 +0000 (14:45 +0000)]
Merge changes from topic 'aod-mr1' into oc-mr1-dev
* changes:
Add new config to tell us whether brightness is bucketed or continuous
Report the display is off when the hardware blanks itself.
Android Build Merger (Role) [Thu, 27 Jul 2017 14:45:29 +0000 (14:45 +0000)]
Merge "Merge "Check if stream exists on volume changed." into oc-dr1-dev am:
6526347aa7 am:
856b8b9e32" into oc-mr1-dev-plus-aosp
Hugo Benichi [Thu, 27 Jul 2017 14:43:48 +0000 (14:43 +0000)]
Merge "NetworkNotificationManager: correctly handle existing notifications"
am:
3451fb6156
Change-Id: I4432f66067ea1ab02e1d2dfe42530bcdafa52df6
Beverly [Thu, 27 Jul 2017 14:43:37 +0000 (14:43 +0000)]
Merge "Check if stream exists on volume changed." into oc-dr1-dev am:
6526347aa7
am:
856b8b9e32
Change-Id: Idd9d5abf5741b7bc040fbe2817e6cf465cff7386
Beverly [Thu, 27 Jul 2017 14:43:36 +0000 (14:43 +0000)]
Merge "Check if stream exists on volume changed." into oc-dr1-dev am:
6526347aa7
am:
4f36d642a4
Change-Id: Id56843030e465e8df76ac3c0da7e67e7aa55fa2a
Treehugger Robot [Thu, 27 Jul 2017 14:36:47 +0000 (14:36 +0000)]
Merge "NetworkNotificationManager: correctly handle existing notifications"
Beverly [Thu, 27 Jul 2017 14:36:14 +0000 (14:36 +0000)]
Merge "Check if stream exists on volume changed." into oc-dr1-dev
am:
6526347aa7
Change-Id: I73e9b39cd3e8e1be818ff85431e6a22085c8b0e8
Beverly [Thu, 27 Jul 2017 14:36:12 +0000 (14:36 +0000)]
Merge "Check if stream exists on volume changed." into oc-dr1-dev
am:
6526347aa7
Change-Id: I747c3fba988fe1ed159f4b231a641c32de30a11e
Julia Reynolds [Thu, 27 Jul 2017 14:29:17 +0000 (14:29 +0000)]
Merge "Differentiate dnd countdowns/countdowns to an alarm" into oc-mr1-dev
am:
a33b64cea0
Change-Id: Ie60c1cacfc50eb20049569656790ef27367a3c9f
TreeHugger Robot [Thu, 27 Jul 2017 14:27:25 +0000 (14:27 +0000)]
Merge "Check if stream exists on volume changed." into oc-dr1-dev
TreeHugger Robot [Thu, 27 Jul 2017 14:23:03 +0000 (14:23 +0000)]
Merge "Differentiate dnd countdowns/countdowns to an alarm" into oc-mr1-dev
Pavel Grafov [Thu, 27 Jul 2017 14:08:39 +0000 (14:08 +0000)]
Merge "Don't attemp to verify synthetic password from adb." into oc-mr1-dev
am:
b64fef762c
Change-Id: Ib5b6a0c7b35d9dfb43d97c31eceb7e7b7564b294
Pavel Grafov [Thu, 27 Jul 2017 14:01:39 +0000 (14:01 +0000)]
Merge "Don't attemp to verify synthetic password from adb." into oc-mr1-dev
Neil Fuller [Thu, 27 Jul 2017 13:55:17 +0000 (13:55 +0000)]
Merge "Alter condition for starting RulesManagerService" am:
a338679173 am:
3e928af733 am:
4c1ade06b3
am:
a63d879f4c
Change-Id: I84949a5f869d25fd61a5a79b4f0a772582829da5
Neil Fuller [Thu, 27 Jul 2017 13:49:21 +0000 (13:49 +0000)]
Merge "Alter condition for starting RulesManagerService" am:
a338679173 am:
3e928af733
am:
4c1ade06b3
Change-Id: I5e42752fcf6e1bee87db8c78daaa5d6364a15ee5
Neil Fuller [Thu, 27 Jul 2017 13:42:39 +0000 (13:42 +0000)]
Merge "Alter condition for starting RulesManagerService" am:
a338679173
am:
3e928af733
Change-Id: I885b05915d72d284784e1eabe548a9aef048dbc5
Neil Fuller [Thu, 27 Jul 2017 13:35:23 +0000 (13:35 +0000)]
Merge "Alter condition for starting RulesManagerService"
am:
a338679173
Change-Id: I442dd6a30f022f92fb3fd8a0a5cca58d4ec77208
Przemyslaw Szczepaniak [Thu, 27 Jul 2017 13:29:44 +0000 (13:29 +0000)]
Merge "Revert "Default 'persist.sys.timezone' property to GMT if not set on init."" am:
9b9e823096 am:
7dc29d076f am:
18eb3b4ff1
am:
2b923c07a7
Change-Id: I7c1abcb43f062a4055b2f65a19b32d18fe5211cb
Treehugger Robot [Thu, 27 Jul 2017 13:25:49 +0000 (13:25 +0000)]
Merge "Alter condition for starting RulesManagerService"
Przemyslaw Szczepaniak [Thu, 27 Jul 2017 13:24:07 +0000 (13:24 +0000)]
Merge "Revert "Default 'persist.sys.timezone' property to GMT if not set on init."" am:
9b9e823096 am:
7dc29d076f
am:
18eb3b4ff1
Change-Id: Id90d02a05413812df90a3691f1f4b8a99e74669b
Przemyslaw Szczepaniak [Thu, 27 Jul 2017 13:18:06 +0000 (13:18 +0000)]
Merge "Revert "Default 'persist.sys.timezone' property to GMT if not set on init."" am:
9b9e823096
am:
7dc29d076f
Change-Id: I7044177aa99426810c23e2100633d3f2c85d5c8e
Przemyslaw Szczepaniak [Thu, 27 Jul 2017 13:11:44 +0000 (13:11 +0000)]
Merge "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""
am:
9b9e823096
Change-Id: I54b658a7911d604af79916f92c8406472e3c9ccb
Treehugger Robot [Thu, 27 Jul 2017 13:01:05 +0000 (13:01 +0000)]
Merge "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""
Android Build Merger (Role) [Thu, 27 Jul 2017 12:56:00 +0000 (12:56 +0000)]
Merge "Merge "Do not show unreachable APs in QS Wifi Picker." into oc-dr1-dev am:
6628e48a1f am:
701215725e" into oc-mr1-dev-plus-aosp
Sundeep Ghuman [Thu, 27 Jul 2017 12:54:20 +0000 (12:54 +0000)]
Merge "Do not show unreachable APs in QS Wifi Picker." into oc-dr1-dev am:
6628e48a1f
am:
701215725e
Change-Id: I11a48e259985244f1d608b9924c06b1d593b9c3b
Sundeep Ghuman [Thu, 27 Jul 2017 12:54:01 +0000 (12:54 +0000)]
Merge "Do not show unreachable APs in QS Wifi Picker." into oc-dr1-dev am:
6628e48a1f
am:
aca575e988
Change-Id: I755730c24c8837193e01e7b069f3eaa1fb9c55d1
Sundeep Ghuman [Thu, 27 Jul 2017 12:46:37 +0000 (12:46 +0000)]
Merge "Do not show unreachable APs in QS Wifi Picker." into oc-dr1-dev
am:
6628e48a1f
Change-Id: I42646bd34afed594e105ff55217276ead380ece5
Sundeep Ghuman [Thu, 27 Jul 2017 12:46:31 +0000 (12:46 +0000)]
Merge "Do not show unreachable APs in QS Wifi Picker." into oc-dr1-dev
am:
6628e48a1f
Change-Id: I0d3c6b32c40141c6745c2c76c7439834de17fb24
TreeHugger Robot [Thu, 27 Jul 2017 12:40:20 +0000 (12:40 +0000)]
Merge "Do not show unreachable APs in QS Wifi Picker." into oc-dr1-dev
Hugo Benichi [Tue, 25 Jul 2017 12:57:51 +0000 (21:57 +0900)]
NetworkNotificationManager: correctly handle existing notifications
This patch corrects a regression added by commit
fb2609d3eee1 that did
not take into account the case of multiple notifications shown for a
single network id. Given how network notifications are triggered, it can
happen that NO_INTERNET and SIGN_IN notifications are both triggered for
the same network when captive portal detection is slow.
Contrary to the situation before commit
fb2609d3eee1, a notification
priority order is introduced so that SIGN_IN always overrides
NO_INTERNET, and NO_INTERNET is ignored if SIGN_IN is already present.
Bug:
63676954
Bug:
62503737
Test: runtest frameworks-net, added new unit tests
Change-Id: Ib8658601e8d4dc6c41b335ab7dd8caa0cccd9531
Neil Fuller [Wed, 26 Jul 2017 10:59:34 +0000 (11:59 +0100)]
Alter condition for starting RulesManagerService
Modify the condition used for starting RulesManagerService:
use mOnlyCore rather than disableNonCoreServices. mOnlyCore is
important for the secure lock screen and when mOnlyCore is true
the RulesManagerService cannot perform trust checks. Therefore,
disable the RulesManagerService when mOnlyCore == true.
disableNonCoreServices is apparently not used.
Bug:
64057583
Test: Boot device with time zone updates enabled and with a lock
pattern set.
Change-Id: Idd7cb6e11b1a91dfe7394f6c98f8fa3e0eec9dce
(cherry picked from commit
4fbaee8f49691a95a0cbcb75b611e281b7a00093)
Narayan Kamath [Thu, 27 Jul 2017 12:00:10 +0000 (12:00 +0000)]
Merge "Remove CoreTests: HeapTest" am:
c3fd3b8c7d am:
19d39ee384 am:
1cfc324de1
am:
2d82836601
Change-Id: If9a442d49b90a301fe03e3727944f589d02d811a
Adrian Roos [Thu, 27 Jul 2017 11:57:35 +0000 (13:57 +0200)]
AOD: Fix wakeup transition jank
No longer do the upwards animation from AOD1, because there is a fade in instead now.
Also, because the DozeService gets finished when waking up, we were disallowing
animations again. Instead, we now ignore disallowing animations while waking up.
Also don't cancel the NotificationPanelView wakeup animation when another identical
request comes in.
Also adds tracing for various SystemUI states.
Bug:
63531607
Test: Wake up from AOD1. Ensure there is no jank or flicker
Change-Id: I383ffa320f28ac4bf5432e4f4f5c06372717f66f
Narayan Kamath [Thu, 27 Jul 2017 11:52:36 +0000 (11:52 +0000)]
Merge "Remove CoreTests: HeapTest" am:
c3fd3b8c7d am:
19d39ee384
am:
1cfc324de1
Change-Id: I884488795303effda4274978c93e086cee433272
Narayan Kamath [Thu, 27 Jul 2017 11:45:08 +0000 (11:45 +0000)]
Merge "Remove CoreTests: HeapTest" am:
c3fd3b8c7d
am:
19d39ee384
Change-Id: I7ac73bf032ea640bc65c5c85df75330133255052
Narayan Kamath [Thu, 27 Jul 2017 11:37:02 +0000 (11:37 +0000)]
Merge "Remove CoreTests: HeapTest"
am:
c3fd3b8c7d
Change-Id: If6565f8bc8a655d3d7422f57db3dd6160459b092
Narayan Kamath [Thu, 27 Jul 2017 11:26:10 +0000 (11:26 +0000)]
Merge "Remove CoreTests: HeapTest"
Przemyslaw Szczepaniak [Wed, 26 Jul 2017 12:12:43 +0000 (12:12 +0000)]
Revert "Default 'persist.sys.timezone' property to GMT if not set on init."
Telephony code depends on persist.sys.timezone not being set as a signal
to deduce a timezone from sim card information.
This reverts commit
20e020536ebf999c4acb759960ae6e4bfff6ba67.
Bug:
64056758
Change-Id: I8db204bcffbdb960124b1ae0e02d53b27dd310a4
Martijn Coenen [Thu, 27 Jul 2017 10:18:51 +0000 (10:18 +0000)]
Merge "screencap: always exit with _exit()." into oc-mr1-dev
am:
b92375fe9f
Change-Id: Iaab6bc269a226ceaaa217e229c8c19646209f25f
TreeHugger Robot [Thu, 27 Jul 2017 10:10:56 +0000 (10:10 +0000)]
Merge "screencap: always exit with _exit()." into oc-mr1-dev
Lucas Dupin [Thu, 27 Jul 2017 05:09:35 +0000 (05:09 +0000)]
Merge "Fix window insets on keyguard" into oc-dr1-dev am:
6462fe4b95
am:
7ef9f224e4
Change-Id: I54b8ac92106008a1caf617da3683371196d54475
Lucas Dupin [Thu, 27 Jul 2017 05:01:31 +0000 (05:01 +0000)]
Merge "Fix window insets on keyguard" into oc-dr1-dev am:
6462fe4b95
am:
a6ff492941
Change-Id: Ia9a373aafa87f11a23a7119c1c46ef2dd306a368
Lucas Dupin [Thu, 27 Jul 2017 04:54:14 +0000 (04:54 +0000)]
Merge "Fix window insets on keyguard" into oc-dr1-dev
am:
6462fe4b95
Change-Id: I26e59cb96c0560334dcb7501d9e13ec38dc8c9ba
Lucas Dupin [Thu, 27 Jul 2017 04:54:13 +0000 (04:54 +0000)]
Merge "Fix window insets on keyguard" into oc-dr1-dev
am:
6462fe4b95
Change-Id: I358d3544ca50d63a1c7ca4cea1bcc00d5e33512c
OSDN Git Service
