OSDN Git Service
Dianne Hackborn [Sat, 2 Sep 2017 02:15:10 +0000 (02:15 +0000)]
Merge "Fix issue #
65259946: APR: runtime restart: at com.android.server.am.ActivityManagerService" into oc-mr1-dev
am:
27207c9be8
Change-Id: I2faffd66d1ab5629edece991ed6566c0541d8a3a
Jeff Sharkey [Sat, 2 Sep 2017 02:07:25 +0000 (02:07 +0000)]
Merge "Gracefully handle integer overflows." into oc-mr1-dev
am:
4d2a8d7203
Change-Id: I6ed70a40ad3e6df55e7669fedfe5b34faf95bd9f
TreeHugger Robot [Sat, 2 Sep 2017 01:55:29 +0000 (01:55 +0000)]
Merge "Fix issue #
65259946: APR: runtime restart: at com.android.server.am.ActivityManagerService" into oc-mr1-dev
TreeHugger Robot [Sat, 2 Sep 2017 01:54:58 +0000 (01:54 +0000)]
Merge "Gracefully handle integer overflows." into oc-mr1-dev
Winson Chung [Sat, 2 Sep 2017 01:02:57 +0000 (01:02 +0000)]
Merge "Fix issue with PiP menu activity disallowing touches" into oc-mr1-dev
am:
7affe01609
Change-Id: I3f683b510b23eaf2f07ea835b6823bfcfc423fde
Ajay Panicker [Sat, 2 Sep 2017 00:55:50 +0000 (00:55 +0000)]
Merge "Bluetooth: Add AVRCP 1.3 as a developer option for AVRCP version (1/2)" into oc-mr1-dev
am:
12b5100c37
Change-Id: If5462d50fece1e5244f6041f9c8e51ab6f14807a
Chris Craik [Sat, 2 Sep 2017 00:47:20 +0000 (00:47 +0000)]
Merge "Add test for first draw blend behavior in HWUI pipeline" into oc-mr1-dev
am:
8f50f52eb2
Change-Id: Iefa8ffe5b27c2499fe03575056ba5c6f6de0ebf6
TreeHugger Robot [Sat, 2 Sep 2017 00:33:23 +0000 (00:33 +0000)]
Merge "Fix issue with PiP menu activity disallowing touches" into oc-mr1-dev
TreeHugger Robot [Sat, 2 Sep 2017 00:32:32 +0000 (00:32 +0000)]
Merge "Bluetooth: Add AVRCP 1.3 as a developer option for AVRCP version (1/2)" into oc-mr1-dev
Andrii Kulian [Sat, 2 Sep 2017 00:31:22 +0000 (00:31 +0000)]
Merge "Fix NPE in ActivityView on surface destruction" into oc-mr1-dev
am:
9352329ee1
Change-Id: I51c19df8f9ad2832102a126778fbc5927d61f094
Ajay Panicker [Fri, 1 Sep 2017 18:58:38 +0000 (11:58 -0700)]
Bluetooth: Add AVRCP 1.3 as a developer option for AVRCP version (1/2)
This is requied for the 2012 Mazda 3 carkit as the carkit refuses to send
AVRCP commands other than passthrough commands when the version is anything
else. AVRCP 1.3 is compatible with most carkits on the market and can be
used to get most carkits working at the cost of losing many features.
Bug:
37943083
Test: Set AVRCP 1.3 in developer options and see that SDP and the AVRCP
capabilites have updated to reflect this.
TestTracker: 105915/3975
Change-Id: I637b695e5cd8baa5f054ca0dda81372080a96269
TreeHugger Robot [Sat, 2 Sep 2017 00:24:16 +0000 (00:24 +0000)]
Merge "Add test for first draw blend behavior in HWUI pipeline" into oc-mr1-dev
TreeHugger Robot [Sat, 2 Sep 2017 00:16:48 +0000 (00:16 +0000)]
Merge "Fix NPE in ActivityView on surface destruction" into oc-mr1-dev
fionaxu [Fri, 1 Sep 2017 23:51:47 +0000 (23:51 +0000)]
Merge "use simOperator name in the notification" into oc-mr1-dev
am:
277689d81c
Change-Id: I7463fb65b5553772d57b4538ed1aba614a4f47bf
TreeHugger Robot [Fri, 1 Sep 2017 23:35:20 +0000 (23:35 +0000)]
Merge "use simOperator name in the notification" into oc-mr1-dev
Dianne Hackborn [Fri, 1 Sep 2017 23:18:15 +0000 (16:18 -0700)]
Fix issue #
65259946: APR: runtime restart: at com.android.server.am.ActivityManagerService
Catch security exception as well.
Bug:
65259946
Test: manual
Change-Id: Icffccb7d28ef2cf01955173f7dc5adbb81ed0caa
Jeff Sharkey [Fri, 1 Sep 2017 18:51:51 +0000 (12:51 -0600)]
Gracefully handle integer overflows.
Try sticking with integer-based math as much as possible for speed,
but switch to double-based math if we detect that we'd end up
causing an overflow.
New tests to verify.
Test: bit FrameworksNetTests:com.android.server.net.NetworkStatsCollectionTest
Bug:
65257769
Change-Id: I1ae35599be134f81850c0a3d86928b057fba1eff
Amit Mahajan [Fri, 1 Sep 2017 22:36:59 +0000 (22:36 +0000)]
Merge "Remove config_tether_apndata for Telstra." into oc-mr1-dev
am:
233cc70914
Change-Id: I80c9e2a283a33e70410ac755207d1dba0e22896a
Christopher Tate [Fri, 1 Sep 2017 22:30:49 +0000 (22:30 +0000)]
Merge "Properly clean up broadcast-receiver ANR" into oc-mr1-dev
am:
9f9ee61cf6
Change-Id: I07387dbbdf90138d06eaf7c14705946dd4ab2fc5
TreeHugger Robot [Fri, 1 Sep 2017 22:18:15 +0000 (22:18 +0000)]
Merge "Remove config_tether_apndata for Telstra." into oc-mr1-dev
TreeHugger Robot [Fri, 1 Sep 2017 22:11:48 +0000 (22:11 +0000)]
Merge "Properly clean up broadcast-receiver ANR" into oc-mr1-dev
Brad Ebinger [Fri, 1 Sep 2017 22:11:40 +0000 (22:11 +0000)]
Merge "Adds ERROR state to ImsConfig" am:
6391598412 am:
7b01ee5cda
am:
ec14bc71e2 -s ours
Change-Id: I254f6d797da1fed9585ae70612a5b4ad7d53223e
Android Build Merger (Role) [Fri, 1 Sep 2017 22:07:30 +0000 (22:07 +0000)]
Merge "Merge "Remove PIN/PUK keyguard when SIM is removed/ready" am:
43f9f0290c am:
434ccc8700 am:
f22c1d153b -s ours" into oc-mr1-dev-plus-aosp
Jeff Sharkey [Fri, 1 Sep 2017 22:03:47 +0000 (22:03 +0000)]
Merge "Don't over-acquire NPMS locks." into oc-mr1-dev
am:
4576171c33
Change-Id: I2d23f8b238b8386958c0fd7348542713abb355dd
Brad Ebinger [Fri, 1 Sep 2017 22:02:27 +0000 (22:02 +0000)]
Merge "Remove PIN/PUK keyguard when SIM is removed/ready" am:
43f9f0290c am:
434ccc8700
am:
f22c1d153b -s ours
Change-Id: Ifc77226ac149727ab0242044f3d9353c37035bf6
Brad Ebinger [Fri, 1 Sep 2017 21:54:47 +0000 (21:54 +0000)]
Merge "Adds ERROR state to ImsConfig" am:
6391598412
am:
7b01ee5cda
Change-Id: Ibe07686d7e24c86d4011fc4ef8a137c887ba1362
Eric Schwarzenbach [Fri, 1 Sep 2017 21:53:38 +0000 (21:53 +0000)]
Merge "Change AccessPointPreference key generation to match AccessPoint." into oc-mr1-dev
am:
c3fbddd712
Change-Id: I3e380512b599891f93a23201813279cfa625f5d6
Brad Ebinger [Fri, 1 Sep 2017 21:43:46 +0000 (21:43 +0000)]
Merge "Remove PIN/PUK keyguard when SIM is removed/ready" am:
43f9f0290c
am:
434ccc8700
Change-Id: I1100fd308158f2bb369ed7043a84b79b4d36e204
Hansong Zhang [Fri, 1 Sep 2017 21:43:15 +0000 (21:43 +0000)]
Merge "Fixed default values for Bluetooth energy calculations" am:
7c45962abd am:
3f49d1dcef
am:
3b23d171eb
Change-Id: I19c20b9d16b7f07e0ccf45e007d7e8c40d191cb8
Chris Craik [Fri, 1 Sep 2017 21:39:18 +0000 (14:39 -0700)]
Add test for first draw blend behavior in HWUI pipeline
Bug:
65077146
Test: BakedOpRendererTests
Change-Id: Ia3139a01fe25344a19f2b947069bd686303b9fd5
Brad Ebinger [Fri, 1 Sep 2017 21:37:49 +0000 (21:37 +0000)]
Merge "Adds ERROR state to ImsConfig"
am:
6391598412
Change-Id: I612aae570b12b1106f515d32bd8caa3843a3953e
TreeHugger Robot [Fri, 1 Sep 2017 21:34:22 +0000 (21:34 +0000)]
Merge "Don't over-acquire NPMS locks." into oc-mr1-dev
Hansong Zhang [Fri, 1 Sep 2017 21:32:44 +0000 (21:32 +0000)]
Merge "Fixed default values for Bluetooth energy calculations" am:
7c45962abd
am:
3f49d1dcef
Change-Id: Idfe642323575c80b40313007328012be1f3b03a9
Brad Ebinger [Fri, 1 Sep 2017 21:31:19 +0000 (21:31 +0000)]
Merge "Remove PIN/PUK keyguard when SIM is removed/ready"
am:
43f9f0290c
Change-Id: I9e28e3975331a7af11747065761632a0566deb56
Andrii Kulian [Sat, 22 Jul 2017 21:59:51 +0000 (14:59 -0700)]
Fix NPE in ActivityView on surface destruction
Instance variable mSurface in ActivityView was not updated after surface
destroy/create cycle, which lead to NPE when we were trying to release
it again after second destroy callback.
Bug:
63338670
Test: Create app with activityView, cause activity restart.
Change-Id: I96447ebe77d175050565641ba94b748d2b633d99
TreeHugger Robot [Fri, 1 Sep 2017 21:29:41 +0000 (21:29 +0000)]
Merge "Change AccessPointPreference key generation to match AccessPoint." into oc-mr1-dev
Hansong Zhang [Fri, 1 Sep 2017 21:15:27 +0000 (21:15 +0000)]
Merge "Fixed default values for Bluetooth energy calculations"
am:
7c45962abd
Change-Id: I44390a58e2328a4bee47d6454492c76184f7098d
Winson Chung [Fri, 1 Sep 2017 18:33:47 +0000 (11:33 -0700)]
Fix issue with PiP menu activity disallowing touches
- On devices where the expanded bounds are the same as the collapsed
bounds, there is no task stack animation and no subsequent animation
end callback, which means that touch state is not reset. Skip
disallowing touches in this state.
- Also fix race causing the PiP menu to ignore touches due to the pinned
animation end callback happening before the menu is first shown.
Bug:
65168767
Test: Tap menu on Ryu, rotate, and try and drag the PiP before the menu
times out
Change-Id: I0b264678aa3300fd4d4e9da5ef3d48a590232ae1
fionaxu [Fri, 1 Sep 2017 20:39:55 +0000 (13:39 -0700)]
use simOperator name in the notification
today we are using getNetworkOperator for carrier's name in the
notification which might be misleading in cases users romaing on
different network.
as today there is no reliable way to get carrier's name, we will use
getSimOperator and if that returns empty string, fallback to
networkOperatorName. In the long term, we can use better wording if
simOperatorName is unknown.
Bug:
65251050
Test: Manual
Change-Id: I6ffc37f8cc8e686d2e884283be2006cf704e8c64
Brad Ebinger [Fri, 1 Sep 2017 21:06:55 +0000 (21:06 +0000)]
Merge "Adds ERROR state to ImsConfig"
Brad Ebinger [Fri, 1 Sep 2017 21:06:27 +0000 (21:06 +0000)]
Merge "Remove PIN/PUK keyguard when SIM is removed/ready"
Treehugger Robot [Fri, 1 Sep 2017 20:58:49 +0000 (20:58 +0000)]
Merge "Fixed default values for Bluetooth energy calculations"
Mehdi Alizadeh [Fri, 1 Sep 2017 20:32:23 +0000 (20:32 +0000)]
Merge "Adds PnoScanMetrics to wifi.proto" into oc-mr1-dev
am:
63c5cd7fb0
Change-Id: I9b349268177e9059268a3131467cccd59efac7b0
Dianne Hackborn [Fri, 1 Sep 2017 20:22:22 +0000 (20:22 +0000)]
Merge "Add ability to include messages in oom reports." into oc-mr1-dev
am:
6243c21bd2
Change-Id: I69003995256fa664e05c6e8748b3104dad205a13
Mehdi Alizadeh [Fri, 1 Sep 2017 20:14:55 +0000 (20:14 +0000)]
Merge "Adds PnoScanMetrics to wifi.proto" into oc-mr1-dev
TreeHugger Robot [Fri, 1 Sep 2017 20:07:59 +0000 (20:07 +0000)]
Merge "Add ability to include messages in oom reports." into oc-mr1-dev
Michael Plass [Fri, 1 Sep 2017 19:25:00 +0000 (19:25 +0000)]
DO NOT MERGE ANYWHERE: [AsyncChannel] Fix race in handling of sync result am:
02d802e71e -s ours am:
b5ee561702 -s ours am:
7391bedf87 -s ours am:
8597268bc2 -s ours
am:
56b7e56890 -s ours
Change-Id: Ie6e9e39c63d9340de659ae428ee5bf79148aa95c
Michael Plass [Fri, 1 Sep 2017 19:15:42 +0000 (19:15 +0000)]
DO NOT MERGE ANYWHERE: [AsyncChannel] Fix race in handling of sync result am:
02d802e71e -s ours am:
b5ee561702 -s ours am:
7391bedf87 -s ours am:
8597268bc2 -s ours
am:
8f33b0bd96 -s ours
Change-Id: Icd6c2ff79f3d697cf308ca4e94d0e6fb0ce9dff4
Hansong Zhang [Fri, 18 Aug 2017 22:03:56 +0000 (15:03 -0700)]
Fixed default values for Bluetooth energy calculations
There are values used for Bluetooth energy calculations in the
configuration file. The values were set to 1, 2, 3, 4 and ends up giving
some very wrong energy calculations. They are now set to 0 by default.
Bug:
64662990
Test: manual
Change-Id: I2be2a19f50e2e56d7dadb9ff23b9827520d4d1ea
(cherry picked from commit
3e6eb50e35f4d0fb8db774bed17a46effbc65671)
fionaxu [Fri, 1 Sep 2017 19:06:16 +0000 (19:06 +0000)]
Merge "reloading the current page on Network lost->avail" into oc-mr1-dev
am:
3f9faf6df4
Change-Id: I64d4590fdd983885d8ad2f66178e40724c5235c8
Michael Plass [Fri, 1 Sep 2017 19:04:25 +0000 (19:04 +0000)]
DO NOT MERGE ANYWHERE: [AsyncChannel] Fix race in handling of sync result am:
02d802e71e -s ours am:
b5ee561702 -s ours am:
7391bedf87 -s ours
am:
8597268bc2 -s ours
Change-Id: I57d0fa2972f5f93ca0c12455873ce05356d6ebf4
Michael Plass [Fri, 1 Sep 2017 19:04:25 +0000 (19:04 +0000)]
DO NOT MERGE ANYWHERE: [AsyncChannel] Fix race in handling of sync result am:
02d802e71e -s ours am:
b5ee561702 -s ours am:
7391bedf87 -s ours
am:
8597268bc2 -s ours
Change-Id: I8e3be756aba1fc571d214e730d84a9f7a4da3f88
TreeHugger Robot [Fri, 1 Sep 2017 18:54:49 +0000 (18:54 +0000)]
Merge "reloading the current page on Network lost->avail" into oc-mr1-dev
Michael Plass [Fri, 1 Sep 2017 18:50:10 +0000 (18:50 +0000)]
DO NOT MERGE ANYWHERE: [AsyncChannel] Fix race in handling of sync result am:
02d802e71e -s ours am:
b5ee561702 -s ours
am:
7391bedf87 -s ours
Change-Id: Ia4ed82872d97187158a8f958b44e68814b2c5356
Christopher Tate [Fri, 1 Sep 2017 18:41:39 +0000 (11:41 -0700)]
Properly clean up broadcast-receiver ANR
Specifically, if the only receiver component was disabled while the
broadcast was in flight *and* the app ANRed, we were failing to properly
abandon the broadcast and wound up stuck waiting for delivery completion
that would never happen.
Bug:
64854337
Test: manual
Change-Id: I9181830eca17981bf1ca403ac36f88c84c548360
Jeff Sharkey [Fri, 1 Sep 2017 17:27:13 +0000 (11:27 -0600)]
Don't over-acquire NPMS locks.
We only need to hold mNetworkPoliciesSecondLock when working with
subscription plans; before this CL we could end up acquiring the two
NPMS locks out of order, resulting in a deadlock.
Also annotate objects in NSS that require mStatsLock to be held.
Test: builds, boots
Bug:
65268076
Change-Id: I06497564424316ef895dc8dceba72ae784781dc3
Michael Plass [Fri, 1 Sep 2017 18:35:54 +0000 (18:35 +0000)]
DO NOT MERGE ANYWHERE: [AsyncChannel] Fix race in handling of sync result am:
02d802e71e -s ours
am:
b5ee561702 -s ours
Change-Id: I64e924948b9cd7934d41e2261af73e2232bbaf80
Michael Plass [Fri, 1 Sep 2017 18:11:19 +0000 (18:11 +0000)]
DO NOT MERGE ANYWHERE: [AsyncChannel] Fix race in handling of sync result
am:
02d802e71e -s ours
Change-Id: If1a7766ec46207280183c7eb08e036e526a12a34
Bin Chen [Fri, 1 Sep 2017 17:54:56 +0000 (17:54 +0000)]
Merge "Fix typo in CarrierConfigManager javadoc." am:
ea598a4f14 am:
3a443cd347
am:
c08cbb31cc
Change-Id: Ifd1728d99c72644854e0161fefa4ac13bcc2bbee
Fyodor Kupolov [Fri, 1 Sep 2017 17:45:27 +0000 (17:45 +0000)]
Merge "Do not close idle connections by default" into oc-mr1-dev
am:
6f8afdc501
Change-Id: Icda0c6495682077725849f96855421f395cd8ff5
Bin Chen [Fri, 1 Sep 2017 17:38:50 +0000 (17:38 +0000)]
Merge "Fix typo in CarrierConfigManager javadoc." am:
ea598a4f14
am:
3a443cd347
Change-Id: I861ab8f591597e4e13e5c2bcf81546a5692b519a
Fyodor Kupolov [Fri, 1 Sep 2017 17:34:41 +0000 (17:34 +0000)]
Merge "Do not close idle connections by default" into oc-mr1-dev
Bin Chen [Fri, 1 Sep 2017 17:25:07 +0000 (17:25 +0000)]
Merge "Fix typo in CarrierConfigManager javadoc."
am:
ea598a4f14
Change-Id: I663aab8773193681760b6ac0a241fde913e5d585
Jason Monk [Fri, 1 Sep 2017 17:20:46 +0000 (17:20 +0000)]
Merge "Fix home button size" into oc-mr1-dev
am:
e27dab87ed
Change-Id: I827bba9c6f17728fe605066de925484fc04276b5
Brad Ebinger [Fri, 25 Aug 2017 21:53:30 +0000 (14:53 -0700)]
Adds ERROR state to ImsConfig
Adds the ERROR return state for bool provisioning values
so that we can throw an Exception in some cases.
Bug:
64540800
Test: Manual
Merged-In: Id412c0be939da6240a66a942730fd18badabb6c6
Change-Id: I0b79837c694d245999031ec65783857e114b7c75
Treehugger Robot [Fri, 1 Sep 2017 17:11:26 +0000 (17:11 +0000)]
Merge "Fix typo in CarrierConfigManager javadoc."
TreeHugger Robot [Fri, 1 Sep 2017 17:09:37 +0000 (17:09 +0000)]
Merge "Fix home button size" into oc-mr1-dev
Brad Ebinger [Mon, 21 Aug 2017 21:58:52 +0000 (14:58 -0700)]
Remove PIN/PUK keyguard when SIM is removed/ready
1) If the PIN/PUK keyguard comes up for a locked
SIM, it can not be removed by removing the
affected SIM. It can only be removed by
rebooting the device or entering a bogus PIN.
This change automatically clears the keyguard
when when the locked SIM is removed. It will
be shown again if the locked SIM is re-entered.
2) If the device is PUK locked and the code
**05*PUK*new pin* new Pin# is entered in the
emergency dialer, it will unlock the SIM.
By listening to the READY state, we can remove
the keyguard when the SIM is unlocked by
other means.
Bug:
64469515
Bug:
64044132
Test: Manual
Merged-In: I7b576ee7e38f141075cae094e3d1f74b7145d53f
Change-Id: I9507f80edcd4c04dfa0cc3b48a25e619aafa9eb3
Michael Plass [Thu, 13 Jul 2017 17:09:07 +0000 (10:09 -0700)]
DO NOT MERGE ANYWHERE: [AsyncChannel] Fix race in handling of sync result
Bug:
62866191
Bug:
63074860
Bug:
65267749
Test: wifi unit tests
Change-Id: I1d59eb8d599de9d9041e0b9b7d731363675a40c9
(cherry picked from commit
56e46134d364f7f293158979765336721a6c752c)
(cherry picked from commit
9c1d56576e01060f40de74a4c0e35e95064351be)
Amit Mahajan [Thu, 31 Aug 2017 20:49:28 +0000 (13:49 -0700)]
Remove config_tether_apndata for Telstra.
Test: manual
Bug:
63564491
Change-Id: Iaca29bfd474b7df6489b1daeaeea182ebf8d81ae
Jason Monk [Fri, 1 Sep 2017 13:36:19 +0000 (09:36 -0400)]
resolve merge conflicts of
e30e3430f936 to oc-mr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9d1a10dbad49680a25a64a7a6b3eadca91f9bc7d
Jason Monk [Fri, 1 Sep 2017 13:20:42 +0000 (13:20 +0000)]
Merge "Fix animation of settings button in RTL layout case" am:
cc3525748e
am:
f4017acb4a
Change-Id: I8c43bf3742f2de724e9f0441396b9b5cd1255e90
Jason Monk [Fri, 1 Sep 2017 13:10:36 +0000 (13:10 +0000)]
Merge "Fix animation of settings button in RTL layout case"
am:
cc3525748e
Change-Id: I112d770b8cf520755128d4fabd973762b2c5c4b1
Jason Monk [Fri, 1 Sep 2017 12:56:56 +0000 (12:56 +0000)]
Merge "Fix animation of settings button in RTL layout case"
Bin Chen [Fri, 1 Sep 2017 10:12:53 +0000 (18:12 +0800)]
Fix typo in CarrierConfigManager javadoc.
Change-Id: Ie9d2f7aa705b7895777dcfa27e6826babff64e29
Yohei Yukawa [Fri, 1 Sep 2017 07:57:43 +0000 (07:57 +0000)]
Merge "Print correct timeout messages in JobServiceContext" into oc-mr1-dev
am:
70f7bc45cd
Change-Id: Icf28aa5823d1de410d728c3e360e39d13aaabd07
TreeHugger Robot [Fri, 1 Sep 2017 07:48:56 +0000 (07:48 +0000)]
Merge "Print correct timeout messages in JobServiceContext" into oc-mr1-dev
Ahmed ElArabawy [Fri, 1 Sep 2017 07:15:05 +0000 (07:15 +0000)]
Merge "Add APF black list for ether-type" am:
c6b2e356b6 am:
b7cabe7b59
am:
1c1d81493e
Change-Id: I6302b93b8fcd40f6689f5cfe2faf580776a669d6
Ahmed ElArabawy [Fri, 1 Sep 2017 06:43:37 +0000 (06:43 +0000)]
Merge "Add APF black list for ether-type" am:
c6b2e356b6
am:
b7cabe7b59
Change-Id: I3aeb9bedd2503a2182995d13b26de0f89e94ce9d
Ahmed ElArabawy [Fri, 1 Sep 2017 06:28:51 +0000 (06:28 +0000)]
Merge "Add APF black list for ether-type"
am:
c6b2e356b6
Change-Id: I2aca562191119dc26eb7bc5293956061e5f44827
Treehugger Robot [Fri, 1 Sep 2017 06:19:11 +0000 (06:19 +0000)]
Merge "Add APF black list for ether-type"
Ahmed ElArabawy [Wed, 2 Aug 2017 20:31:05 +0000 (13:31 -0700)]
Add APF black list for ether-type
Add a configurable black for protocols which packets are to be dropped
by APF. This enales an OEM to configure the APF to filter out un-needed
packets from reaching the host
Bug:
62415182
Test: runtest frameworks-net
Merged-In: I86335a0f854d5e83a2b2767978cd69b2cc25c2f8
Signed-off-by: Ahmed ElArabawy <arabawy@google.com>
(cherry picked from commit
caffbe127726c6a9ab5dd023a9b09cfa43eac617)
Change-Id: I15a758d18464d73d24ba8364a867904bb3cd3b34
Chris Craik [Fri, 1 Sep 2017 04:11:02 +0000 (04:11 +0000)]
Merge "Fix blending behavior with first draw op" into oc-mr1-dev
am:
da910e805b
Change-Id: I167213959eac6ba72a1e8ca32fcd4e536e56aeee
TreeHugger Robot [Fri, 1 Sep 2017 04:05:02 +0000 (04:05 +0000)]
Merge "Fix blending behavior with first draw op" into oc-mr1-dev
Hugo Benichi [Fri, 1 Sep 2017 03:01:59 +0000 (03:01 +0000)]
Merge "Revert "Nat464Xlat: interface notification handler on ConnectivityService"" into oc-mr1-dev
am:
8768b99cbe
Change-Id: If2b714c7e74d95d4fad610772e3d74ab13b923e8
Hugo Benichi [Fri, 1 Sep 2017 02:49:17 +0000 (02:49 +0000)]
Merge "Revert "Nat464Xlat: interface notification handler on ConnectivityService"" into oc-mr1-dev
Michael Wright [Fri, 1 Sep 2017 02:41:39 +0000 (02:41 +0000)]
Merge "Don't vibrate on un-tuned devices when opening notification shade." into oc-mr1-dev
am:
fbc5d5d7c5
Change-Id: Ib1f111b87878abe4c2fd4d800e950feb6a45d7be
Bryan Eyler [Fri, 1 Sep 2017 02:34:16 +0000 (02:34 +0000)]
Merge "Darken car status bar." into oc-mr1-dev
am:
d1b4848d2e
Change-Id: I6c7823369750a66395d2af85ef1841b5818ba2c7
TreeHugger Robot [Fri, 1 Sep 2017 02:29:53 +0000 (02:29 +0000)]
Merge "Don't vibrate on un-tuned devices when opening notification shade." into oc-mr1-dev
Akira Oshimi [Thu, 3 Aug 2017 02:02:34 +0000 (11:02 +0900)]
Fix animation of settings button in RTL layout case
The settings button overlaps with the expand indicator
in RTL layout case when rotating the device to landscape mode.
To fix this issue, the animation of settings button
in RTL layout case should be changed.
Fixes:
65228478
Test: manual - set a BiDi language and open Notification panel.
Change-Id: I008b33ebcdf074639a291e7d30d3343654a2ea37
TreeHugger Robot [Fri, 1 Sep 2017 02:18:10 +0000 (02:18 +0000)]
Merge "Darken car status bar." into oc-mr1-dev
Sungsoo Lim [Fri, 1 Sep 2017 02:01:58 +0000 (02:01 +0000)]
Merge "Track the global setting of BT A2DP on/off" into oc-mr1-dev
am:
cc2478f90c
Change-Id: Iacf556474e361882d4928750a71add65af0180d9
TreeHugger Robot [Fri, 1 Sep 2017 01:53:14 +0000 (01:53 +0000)]
Merge "Track the global setting of BT A2DP on/off" into oc-mr1-dev
Matthew Ng [Fri, 1 Sep 2017 01:46:24 +0000 (01:46 +0000)]
Merge "Fixes TaskStackLayoutAlgorithm log errors when window rect is empty" into oc-mr1-dev
am:
7673a55f3e
Change-Id: Ic89dad11832a55111b8be425ab3a1b53c8ebafa3
TreeHugger Robot [Fri, 1 Sep 2017 01:34:48 +0000 (01:34 +0000)]
Merge "Fixes TaskStackLayoutAlgorithm log errors when window rect is empty" into oc-mr1-dev
Lei Yu [Fri, 1 Sep 2017 01:01:47 +0000 (01:01 +0000)]
Merge "Hook up AOD knobs to Settings.Global" into oc-mr1-dev
am:
67594c6f54
Change-Id: Ifbb83939c2c2c30048fe43b2092b2afe4c3b234c
Lei Yu [Fri, 1 Sep 2017 00:54:01 +0000 (00:54 +0000)]
Merge "Hook up AOD knobs to Settings.Global" into oc-mr1-dev
Chris Craik [Fri, 1 Sep 2017 00:28:20 +0000 (17:28 -0700)]
Fix blending behavior with first draw op
Bug:
65077146
Test: Manual - uirendering tests don't allow test draw content
to be displayed first.
It's not always valid to disable blending on the first draw to the framebuffer,
since some blend modes affect the framebuffer in different ways. We now only
disable blending if the op is SRC_OVER to be safe.
For example:
canvas.drawColor(0xfeff0000, PorterDuff.Mode.CLEAR);
canvas.drawColor(Color.BLUE, PorterDuff.Mode.DST_OVER);
The BLUE should always be seen - the other draw should just clear the buffer.
Prior to this fix, the above code (put in a window background) would draw black.
In addition, this removes the disable behavior in drawRects(), since that should
never benefit from the optimization - that decoration is always drawn at the end
of a frame.
Change-Id: I34e8d9d62d6e1dfa00e9301f44c277475f2940a8
Jason Monk [Fri, 1 Sep 2017 00:38:35 +0000 (00:38 +0000)]
Merge "Hide battery percentage from accessibility." into oc-mr1-dev
am:
f4311433a8
Change-Id: If3a0b173905140a4498f0bcb0a925614301b078a
Dianne Hackborn [Fri, 1 Sep 2017 00:15:00 +0000 (00:15 +0000)]
Merge "Fix issue #
63971747: Audio is not heard first time when played after a long pause" into oc-mr1-dev
am:
d9d208a6d4
Change-Id: I98836388ee501bb44c1ed60925d8846dbbe7d4ae