OSDN Git Service
Lorenzo Colitti [Tue, 5 Sep 2017 10:03:34 +0000 (10:03 +0000)]
Merge "Switch tethering stats from the unix socket to binder." am:
cbe8f09817 am:
6c05f1a03d
am:
d8a037ad5e
Change-Id: I4308d9d73974d784999521c36c8ead26de3f7b8b
Lorenzo Colitti [Tue, 5 Sep 2017 09:49:28 +0000 (09:49 +0000)]
Merge "Switch tethering stats from the unix socket to binder." am:
cbe8f09817
am:
6c05f1a03d
Change-Id: Idc67abffd19db1cd03568918084b7ef86e17f801
Lorenzo Colitti [Tue, 5 Sep 2017 09:26:26 +0000 (09:26 +0000)]
Merge "Switch tethering stats from the unix socket to binder."
am:
cbe8f09817
Change-Id: If1c8db9447cd066c9800b68c8255ee248125b536
Treehugger Robot [Tue, 5 Sep 2017 09:17:46 +0000 (09:17 +0000)]
Merge "Switch tethering stats from the unix socket to binder."
Hugo Benichi [Tue, 5 Sep 2017 08:16:21 +0000 (08:16 +0000)]
Merge "ConnectivityService: improve wakelock logging" into oc-mr1-dev
am:
2dac2cce5a
Change-Id: I93c0eb7c8add966378647400e11e33765d952345
TreeHugger Robot [Tue, 5 Sep 2017 07:57:00 +0000 (07:57 +0000)]
Merge "ConnectivityService: improve wakelock logging" into oc-mr1-dev
Hugo Benichi [Tue, 5 Sep 2017 04:25:07 +0000 (13:25 +0900)]
ConnectivityService: improve wakelock logging
This patch adds the following wakelock related counters to connectivity
service dumps included in bug reports:
- total number of wakelok acquisitions and releases
- total cumulative wakelock duration
- longest time the lock was held
Bug:
65085354
Test: runtest frameworks-net, also manually dumped connectivity service
and check new logging
Change-Id: I8f67750c2eea73abf3d44f7f6df484427a8ea3f9
Erik Kline [Tue, 5 Sep 2017 02:09:06 +0000 (02:09 +0000)]
Merge "Refactor interface IP code into InterfaceController" am:
9465abf8af am:
6a718fc858
am:
6fa8caab73
Change-Id: I1882be43dce90cac8a2a6fcf34dc534c64bd4e7d
Lorenzo Colitti [Fri, 1 Sep 2017 08:12:34 +0000 (17:12 +0900)]
Switch tethering stats from the unix socket to binder.
Bug:
32163131
Bug:
64995262
Test: builds
Change-Id: I673d76a8b0981302b5f6a14e97999cd7676d83ed
Erik Kline [Tue, 5 Sep 2017 01:50:30 +0000 (01:50 +0000)]
Merge "Refactor interface IP code into InterfaceController" am:
9465abf8af
am:
6a718fc858
Change-Id: Ief793ba94226d007c53601fe081e483622148b77
Erik Kline [Tue, 5 Sep 2017 01:33:06 +0000 (01:33 +0000)]
Merge "Refactor interface IP code into InterfaceController"
am:
9465abf8af
Change-Id: I2e5245a4c765eaf6ab81b06b3b7081743951c259
Treehugger Robot [Tue, 5 Sep 2017 01:14:17 +0000 (01:14 +0000)]
Merge "Refactor interface IP code into InterfaceController"
Adrian Roos [Mon, 4 Sep 2017 15:51:48 +0000 (15:51 +0000)]
Merge "AOD: Keep brightness sensor registered while covered" into oc-mr1-dev
am:
10070c6356
Change-Id: Iee0d80e8cecc173be272137f342ac7731df58371
Adrian Roos [Mon, 4 Sep 2017 15:37:36 +0000 (15:37 +0000)]
Merge "AOD: Keep brightness sensor registered while covered" into oc-mr1-dev
Hugo Benichi [Mon, 4 Sep 2017 12:42:56 +0000 (12:42 +0000)]
Merge "Network Service Discovery test: properly release resources" am:
c9d24d203d am:
80e0daa870
am:
f467db29f9
Change-Id: Id9be284a16112f999d752751a7972fd735573cda
Hugo Benichi [Mon, 4 Sep 2017 12:25:10 +0000 (12:25 +0000)]
Merge "Network Service Discovery test: properly release resources" am:
c9d24d203d
am:
80e0daa870
Change-Id: I03c0cff6dfdcd8dfc94de8399161ceab0f7a901a
Hugo Benichi [Mon, 4 Sep 2017 12:14:11 +0000 (12:14 +0000)]
Merge "Network Service Discovery test: properly release resources"
am:
c9d24d203d
Change-Id: If34b3770a5c0fef65d124201e0ca1374cc6b1eca
Hugo Benichi [Mon, 4 Sep 2017 11:50:58 +0000 (11:50 +0000)]
Merge "Network Service Discovery test: properly release resources"
Christopher Tate [Mon, 4 Sep 2017 11:00:59 +0000 (11:00 +0000)]
Merge "Set flags on the correct Intent, please" into oc-mr1-dev
am:
33894b2998
Change-Id: I27e90c362abd23746e4b854308cf14b46abe9293
TreeHugger Robot [Mon, 4 Sep 2017 10:47:42 +0000 (10:47 +0000)]
Merge "Set flags on the correct Intent, please" into oc-mr1-dev
Hugo Benichi [Mon, 4 Sep 2017 05:46:54 +0000 (05:46 +0000)]
Merge "Fix some broken tests in frameworks-net with native dependencies" am:
1fd2eb6276 am:
72a20c3959
am:
c08dcf6af7
Change-Id: Ibcc47204869e8debc031bf12851c233a14a9e535
Hugo Benichi [Mon, 4 Sep 2017 05:30:25 +0000 (05:30 +0000)]
Merge "Fix some broken tests in frameworks-net with native dependencies" am:
1fd2eb6276
am:
72a20c3959
Change-Id: I3f8be95e56a05215265e96e542508792e7458e10
Hugo Benichi [Mon, 4 Sep 2017 05:13:43 +0000 (05:13 +0000)]
Merge "Fix some broken tests in frameworks-net with native dependencies"
am:
1fd2eb6276
Change-Id: I628ee4ac71a762c02f9fe0440db08125693efd3c
Treehugger Robot [Mon, 4 Sep 2017 04:58:16 +0000 (04:58 +0000)]
Merge "Fix some broken tests in frameworks-net with native dependencies"
Hugo Benichi [Mon, 4 Sep 2017 04:31:25 +0000 (04:31 +0000)]
Merge "DO NOT MERGE: Fix ApfTest" am:
05f0bfe33e -s ours am:
8887059b00 -s ours
am:
d3a16793de -s ours
Change-Id: I70ecdee234a0949c586abed1529811bd4b9f2831
Hugo Benichi [Mon, 4 Sep 2017 04:14:38 +0000 (04:14 +0000)]
Merge "DO NOT MERGE: Fix ApfTest" am:
05f0bfe33e -s ours
am:
8887059b00 -s ours
Change-Id: I4d5fe729d56096f0aad725ff74e55d8db347f1f2
Hugo Benichi [Mon, 4 Sep 2017 03:57:37 +0000 (03:57 +0000)]
Merge "DO NOT MERGE: Fix ApfTest"
am:
05f0bfe33e -s ours
Change-Id: If9eb248254cafc6ec4ce10fb5a402282b7e3512c
Treehugger Robot [Mon, 4 Sep 2017 03:39:59 +0000 (03:39 +0000)]
Merge "DO NOT MERGE: Fix ApfTest"
Erik Kline [Mon, 4 Sep 2017 02:58:52 +0000 (02:58 +0000)]
Merge "Record even more stats even more often" am:
72a708d623 am:
3204e5fc63
am:
b9b62ed512 -s ours
Change-Id: I390cd1f15092038517820f2ed1dde7ed09f6216c
Erik Kline [Mon, 4 Sep 2017 02:42:17 +0000 (02:42 +0000)]
Merge "Record even more stats even more often" am:
72a708d623
am:
3204e5fc63
Change-Id: I3e9134c0750117bc7145975b51d3b19d2f11b668
Erik Kline [Mon, 4 Sep 2017 02:25:48 +0000 (02:25 +0000)]
Merge "Record even more stats even more often"
am:
72a708d623
Change-Id: I6a662cce3cf5394d392f7ff816f5eb6a71131484
Treehugger Robot [Mon, 4 Sep 2017 02:11:47 +0000 (02:11 +0000)]
Merge "Record even more stats even more often"
Hugo Benichi [Fri, 4 Aug 2017 03:12:25 +0000 (12:12 +0900)]
Fix some broken tests in frameworks-net with native dependencies
Exempt-From-Owner-Approval: Android.mk uses per-file permission to let
the build team modify it without dependeing on us. However because this
rule overrides the directory default owners, Android core networking is
not owner anymore. This exemption is necessary to let Android core
networking team fix their build file.
Test: All tests in runtest frameworks-net pass.
Merged-In: Ie0b8baa38ca39e92fbd698ebcead86dac0a67708
(cherry picked from commit
99e8ab6e46eec5dbd1b059b3732672d537b3cf34)
Change-Id: I4471a5cd7f20852645f3d94684cc5aeef3324162
Hugo Benichi [Thu, 1 Jun 2017 06:54:59 +0000 (15:54 +0900)]
DO NOT MERGE: Fix ApfTest
libutils is now depending on libvndksupport. So any client that
statically links to libutils needs to link against libvndksupport as
well.
Bug:
32561414
Test: ApfTest works
Merged-In: Id99792baa1c0a7a61c4056f83f33d25e0bea143e
(cherry picked from commit
9a2041ee836be925e93dd820f11686aa378dd92d)
Change-Id: I8808e668230ff7076403ff29cf48c12cbc36f78a
Erik Kline [Thu, 31 Aug 2017 12:09:45 +0000 (21:09 +0900)]
Record even more stats even more often
Like kale, one can never have enough stats. =)
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
29337859
Bug:
32163131
Merged-In: I5d40eae488cab685be6a44849181c0286fe28fdb
Merged-In: I759e97f9a72d15a84036c3a56451b872143539c6
Change-Id: Ieb47c3beed50f21c2c858fe57438afd48cfdc662
(cherry picked from commit
1199a352fcb938a8dc7a34a2853c4fde7f5656f1)
Erik Kline [Sun, 3 Sep 2017 22:44:54 +0000 (22:44 +0000)]
Record even more stats even more often
am:
1199a352fc
Change-Id: I5d40eae488cab685be6a44849181c0286fe28fdb
Erik Kline [Sun, 3 Sep 2017 11:38:29 +0000 (20:38 +0900)]
Refactor interface IP code into InterfaceController
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
(except for UidRange and APF tests that are missing libvndk)
- regular WiFi STA mode attach works for IPv4-only, dualstack,
and IPv6-only networks
- tethering works with dualstack upstream and downstream
Bug:
62476366
Change-Id: Id807b3091b0b2935b01aeb3644245034312b4183
Erik Kline [Thu, 31 Aug 2017 12:09:45 +0000 (21:09 +0900)]
Record even more stats even more often
Like kale, one can never have enough stats. =)
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
29337859
Bug:
32163131
Change-Id: Ieb47c3beed50f21c2c858fe57438afd48cfdc662
Hugo Benichi [Mon, 31 Jul 2017 11:35:58 +0000 (20:35 +0900)]
Network Service Discovery test: properly release resources
Bug:
32561414
Bug:
62918393
Bug:
62044295
Test: runtest frameworks-net
Change-Id: If23993b5e391947ecbdc01677f0a643144794b2b
Daniel Nishi [Sat, 2 Sep 2017 03:39:42 +0000 (03:39 +0000)]
Merge "Add a photos app filter and a metric for using it." into oc-mr1-dev
am:
55cd5e185a
Change-Id: I66618c70782cae85036185e14e9a20b8568f90ec
TreeHugger Robot [Sat, 2 Sep 2017 03:29:51 +0000 (03:29 +0000)]
Merge "Add a photos app filter and a metric for using it." into oc-mr1-dev
Matthew Ng [Sat, 2 Sep 2017 02:28:55 +0000 (02:28 +0000)]
Merge "Low ram devices now use 60% reduction for task snap shots" into oc-mr1-dev
am:
bba03022d5
Change-Id: I32dc4579ad58592084b68a19228a6d2842a29649
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 02:01:56 +0000 (02:01 +0000)]
Merge "Low ram devices now use 60% reduction for task snap shots" into oc-mr1-dev
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
Matthew Ng [Fri, 1 Sep 2017 21:20:24 +0000 (14:20 -0700)]
Low ram devices now use 60% reduction for task snap shots
On low ram devices, it will now use a reduce scale of 0.6f.
Test: manual - launch apps, launch recents see the bitmap on task
Change-Id: I016b896e9e43d4d0a549a47aa69e7b5541aa5dbc
Fixes:
65163822
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"
Christopher Tate [Fri, 1 Sep 2017 20:37:22 +0000 (13:37 -0700)]
Set flags on the correct Intent, please
Bug:
65115426
Test: passes CTS backup suite
Change-Id: I497d077f563fef7b0800df626d15651c721d4ca7
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