Brad Ebinger
ec14bc71e2
Merge "Adds ERROR state to ImsConfig" am: 6391598412
...
am: 7b01ee5cda
2017-09-01 21:54:47 +00:00
Brad Ebinger
f22c1d153b
Merge "Remove PIN/PUK keyguard when SIM is removed/ready" am: 43f9f0290c
...
am: 434ccc8700
2017-09-01 21:43:46 +00:00
Brad Ebinger
7b01ee5cda
Merge "Adds ERROR state to ImsConfig"
...
am: 6391598412
2017-09-01 21:37:49 +00:00
Hansong Zhang
3b23d171eb
Merge "Fixed default values for Bluetooth energy calculations" am: 7c45962abd
...
am: 3f49d1dcef
2017-09-01 21:32:44 +00:00
Brad Ebinger
434ccc8700
Merge "Remove PIN/PUK keyguard when SIM is removed/ready"
...
am: 43f9f0290c
2017-09-01 21:31:19 +00:00
Hansong Zhang
3f49d1dcef
Merge "Fixed default values for Bluetooth energy calculations"
...
am: 7c45962abd
2017-09-01 21:15:27 +00:00
Brad Ebinger
6391598412
Merge "Adds ERROR state to ImsConfig"
2017-09-01 21:06:55 +00:00
Brad Ebinger
43f9f0290c
Merge "Remove PIN/PUK keyguard when SIM is removed/ready"
2017-09-01 21:06:27 +00:00
Treehugger Robot
7c45962abd
Merge "Fixed default values for Bluetooth energy calculations"
2017-09-01 20:58:49 +00:00
Hansong Zhang
aeff6bf056
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)
2017-09-01 19:13:28 +00:00
Michael Plass
8f33b0bd96
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
2017-09-01 19:04:25 +00:00
Michael Plass
8597268bc2
DO NOT MERGE ANYWHERE: [AsyncChannel] Fix race in handling of sync result am: 02d802e71e -s ours am: b5ee561702 -s ours
...
am: 7391bedf87
2017-09-01 18:50:10 +00:00
Michael Plass
7391bedf87
DO NOT MERGE ANYWHERE: [AsyncChannel] Fix race in handling of sync result am: 02d802e71e -s ours
...
am: b5ee561702
2017-09-01 18:35:54 +00:00
Michael Plass
b5ee561702
DO NOT MERGE ANYWHERE: [AsyncChannel] Fix race in handling of sync result
...
am: 02d802e71e
2017-09-01 18:11:19 +00:00
Bin Chen
c08cbb31cc
Merge "Fix typo in CarrierConfigManager javadoc." am: ea598a4f14
...
am: 3a443cd347
2017-09-01 17:38:50 +00:00
Bin Chen
3a443cd347
Merge "Fix typo in CarrierConfigManager javadoc."
...
am: ea598a4f14
2017-09-01 17:25:07 +00:00
Brad Ebinger
df99d59284
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
2017-09-01 10:16:26 -07:00
Treehugger Robot
ea598a4f14
Merge "Fix typo in CarrierConfigManager javadoc."
2017-09-01 17:11:26 +00:00
Brad Ebinger
4cd3bdcfa3
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
2017-09-01 10:04:37 -07:00
Michael Plass
02d802e71e
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 56e46134d39c1d56576e
2017-09-01 09:42:27 -07:00
Jason Monk
e30e3430f9
Merge "Fix animation of settings button in RTL layout case" am: cc3525748e
...
am: f4017acb4a
2017-09-01 13:20:42 +00:00
Jason Monk
f4017acb4a
Merge "Fix animation of settings button in RTL layout case"
...
am: cc3525748e
2017-09-01 13:10:36 +00:00
Jason Monk
cc3525748e
Merge "Fix animation of settings button in RTL layout case"
2017-09-01 12:56:56 +00:00
Bin Chen
503513de9e
Fix typo in CarrierConfigManager javadoc.
...
Change-Id: Ie9d2f7aa705b7895777dcfa27e6826babff64e29
2017-09-01 18:20:20 +08:00
Ahmed ElArabawy
1c1d81493e
Merge "Add APF black list for ether-type" am: c6b2e356b6
...
am: b7cabe7b59
2017-09-01 06:43:37 +00:00
Ahmed ElArabawy
b7cabe7b59
Merge "Add APF black list for ether-type"
...
am: c6b2e356b6
2017-09-01 06:28:51 +00:00
Treehugger Robot
c6b2e356b6
Merge "Add APF black list for ether-type"
2017-09-01 06:19:11 +00:00
Ahmed ElArabawy
fd424169a1
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 caffbe1277
2017-09-01 14:03:58 +09:00
Akira Oshimi
5cb7cd1300
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
2017-09-01 02:26:53 +00:00
Mårten Kongstad
5e9775cb59
Merge "Remove unused methods from OMS" am: fd5cdfc924
...
am: 55a2494df3
2017-08-31 22:03:09 +00:00
Mårten Kongstad
38f0f5687f
Merge changes I7218f17a,I96b7340a am: 111c955d1d
...
am: 96e763fe71
2017-08-31 21:53:08 +00:00
Mårten Kongstad
55a2494df3
Merge "Remove unused methods from OMS"
...
am: fd5cdfc924
2017-08-31 21:51:02 +00:00
Mårten Kongstad
96e763fe71
Merge changes I7218f17a,I96b7340a
...
am: 111c955d1d
2017-08-31 21:44:25 +00:00
Treehugger Robot
fd5cdfc924
Merge "Remove unused methods from OMS"
2017-08-31 21:31:31 +00:00
Treehugger Robot
111c955d1d
Merge changes I7218f17a,I96b7340a
...
* changes:
ResourcesManager: correct @NonNull -> @Nullable
AAPT2: Allow <overlay> in AndroidManifest.xml
2017-08-31 21:27:42 +00:00
Mårten Kongstad
b361ec15e4
Merge "OMS: fix listener callbacks triggered by changes to target package" am: 637dbcbb6c
...
am: c2351d1d40
2017-08-31 21:14:06 +00:00
Mårten Kongstad
c2351d1d40
Merge "OMS: fix listener callbacks triggered by changes to target package"
...
am: 637dbcbb6c
2017-08-31 21:03:40 +00:00
Treehugger Robot
637dbcbb6c
Merge "OMS: fix listener callbacks triggered by changes to target package"
2017-08-31 20:51:38 +00:00
lingjunl
bc198d8808
Merge "Whitelist free sms shortcode 76551 in Mexico for constlletion." am: 4bddd5c44b
...
am: 2e1c643919
2017-08-31 20:07:28 +00:00
lingjunl
2e1c643919
Merge "Whitelist free sms shortcode 76551 in Mexico for constlletion."
...
am: 4bddd5c44b
2017-08-31 19:57:19 +00:00
lingjunl
4bddd5c44b
Merge "Whitelist free sms shortcode 76551 in Mexico for constlletion."
2017-08-31 19:46:39 +00:00
Zheng Zhang
604c1704de
Merge changes I30e39943,I4b5fb782,I8fe0ddbd into cw-f-dev am: 1c0dba5014 am: 80a0f290f6 am: e274cd7ae9
...
am: a8441ebf84
2017-08-31 17:48:47 +00:00
Zheng Zhang
96c836846c
DO NOT MERGE ANYWHERE: Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider am: 03c0f16f37 -s ours am: d877297ad4 -s ours am: 6f94a3740a -s ours
...
am: 2a540e9970
2017-08-31 17:47:22 +00:00
Zheng Zhang
a8441ebf84
Merge changes I30e39943,I4b5fb782,I8fe0ddbd into cw-f-dev am: 1c0dba5014 am: 80a0f290f6
...
am: e274cd7ae9
2017-08-31 17:37:44 +00:00
Zheng Zhang
2a540e9970
DO NOT MERGE ANYWHERE: Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider am: 03c0f16f37 -s ours am: d877297ad4 -s ours
...
am: 6f94a3740a
2017-08-31 17:36:50 +00:00
wuliang
8ad2dc3615
Merge "Test: Drag on the divider line." am: 1fa3a60f05
...
am: 290bfff7d0
2017-08-31 17:04:19 +00:00
wuliang
290bfff7d0
Merge "Test: Drag on the divider line."
...
am: 1fa3a60f05
2017-08-31 16:54:54 +00:00
Treehugger Robot
1fa3a60f05
Merge "Test: Drag on the divider line."
2017-08-31 16:43:44 +00:00
Andreas Gampe
30348a8abb
Merge changes I49057737,I68e3096d am: 50cf621704
...
am: f5dcc28b0c
2017-08-31 15:27:52 +00:00
Andreas Gampe
f5dcc28b0c
Merge changes I49057737,I68e3096d
...
am: 50cf621704
2017-08-31 15:15:31 +00:00
