OSDN Git Service
zhouzhijie [Thu, 18 May 2017 02:02:59 +0000 (10:02 +0800)]
Creat a new notification to avoid the mTetheredNotificationBuilder changed
Now the method NotificationBuilder.build() is different with m.
it is not creat new notification. But here it need to creat a
new notification to avoid the mTetheredNotificationBuilder
changed. So we use buildInto to replace build
Change-Id: I274ec833de4ade4a778e1937a09d1e6242d92a7f
Signed-off-by: zhouzhijie <zhouzhijie@xiaomi.com>
Hugo Benichi [Thu, 18 May 2017 02:01:39 +0000 (02:01 +0000)]
Merge "Move NetworkNotificationManagerTest to tests/net"
Erik Kline [Fri, 12 May 2017 07:52:48 +0000 (16:52 +0900)]
Expand logging capabilities of Tethering subsystem
Introduce a SharedLog that can be shared among all Tethering
components. All log entries go to the same log, and each includes
its subsystem name. Additionally, all entries emitted to the
system log shared the same tag, so can easily be watched.
More subsystems can inherit a SharedLog, but to minimize cherry-pick
conflicts we limit ourselves to these changes only.
Test: as follows
- built
- flashed
- booted
- log output observed via dumpsys
- runtest frameworks-net passes
Bug:
32163131
Bug:
36988090
Bug:
38218697
Change-Id: I1229d4c55987402d84b0d4a2c8a595e0c829aa3e
Hugo Benichi [Thu, 18 May 2017 00:37:40 +0000 (00:37 +0000)]
Merge "Finish moving NetworkStats tests to tests/net" am:
1ae1b6b960
am:
cd821b231a
Change-Id: Ic9f06631a7f937a0f3730b167e5db7d8c0dcf775
Hugo Benichi [Thu, 18 May 2017 00:27:06 +0000 (00:27 +0000)]
Merge "Finish moving NetworkStats tests to tests/net"
am:
1ae1b6b960
Change-Id: If85e483d5b44872c10e42ef55ddaf209601c7cfa
Hugo Benichi [Thu, 18 May 2017 00:09:53 +0000 (00:09 +0000)]
Merge "Finish moving NetworkStats tests to tests/net"
Colin Cross [Wed, 17 May 2017 21:55:19 +0000 (21:55 +0000)]
Merge "Convert libsoundpool to Android.bp" am:
dde9ee9edd
am:
e9ffa404ae
Change-Id: I792b4f48d57181b4ee55b2a73c597272826844e2
Colin Cross [Wed, 17 May 2017 21:45:33 +0000 (21:45 +0000)]
Merge "Convert libsoundpool to Android.bp"
am:
dde9ee9edd
Change-Id: Ia7bb54b658031c68036ee2a218e5b229d32b1d25
Treehugger Robot [Wed, 17 May 2017 21:31:16 +0000 (21:31 +0000)]
Merge "Convert libsoundpool to Android.bp"
Colin Cross [Tue, 16 May 2017 20:08:19 +0000 (13:08 -0700)]
Convert libsoundpool to Android.bp
See build/soong/README.md for more information.
Test: m -j checkbuild
Change-Id: If0b7cb1e2c86ff1be41c00d98fd9ddec31287a53
Merged-In: If0b7cb1e2c86ff1be41c00d98fd9ddec31287a53
(cherry picked from commit
98c127f8cc652d1179871ad47cac99d15ea1a5a0)
Ram Periathiruvadi [Wed, 17 May 2017 17:41:05 +0000 (17:41 +0000)]
Merge "Fix for Bluetooth not restarting on User Switch" am:
196b72aae5
am:
543261753a
Change-Id: I008ff84f3d3eb0b7c51993d213a9d3a590cd93a6
Ram Periathiruvadi [Wed, 17 May 2017 17:33:28 +0000 (17:33 +0000)]
Merge "Fix for Bluetooth not restarting on User Switch"
am:
196b72aae5
Change-Id: Id0ef82b93b047f13683f7538740f0544549b0eca
Treehugger Robot [Wed, 17 May 2017 17:24:02 +0000 (17:24 +0000)]
Merge "Fix for Bluetooth not restarting on User Switch"
Lorenzo Colitti [Tue, 16 May 2017 16:28:09 +0000 (01:28 +0900)]
Add test coverage for explicitlySelected networks.
Also, make all tests start with mobile data always on disabled.
This is because some tests only pass when mobile data always on
is disabled. This doesn't cause any problems when running all
the tests in the file, because these tests are always run after
one or more calls to tearDown, which disables mobile data always
on. However, it does cause issues when those tests are run alone.
Test: new test passes 50 times in a row
Test: ConnectivityServiceTest passes
Change-Id: I1eef5d7f5ec5464e0f9a1d7f1130d9ba6dea4557
Colin Cross [Wed, 17 May 2017 15:36:06 +0000 (15:36 +0000)]
Merge "Convert libmedia_jni to Android.bp" am:
85faffa7ef
am:
162d19f590
Change-Id: Iac2f159014051604d36f61dd253fa4e83127030a
Colin Cross [Wed, 17 May 2017 15:29:29 +0000 (15:29 +0000)]
Merge "Convert libmedia_jni to Android.bp"
am:
85faffa7ef
Change-Id: I7afbf6dda3dab6a3c36576e2c118b1accdcc2a17
Colin Cross [Wed, 17 May 2017 15:19:25 +0000 (15:19 +0000)]
Merge "Convert libmedia_jni to Android.bp"
Hugo Benichi [Tue, 16 May 2017 01:56:46 +0000 (10:56 +0900)]
Move NetworkNotificationManagerTest to tests/net
Bug:
32561414
Test: no functional change
Change-Id: Iad17e3336a4a589da5cf88fd6359323e34b747e1
Hugo Benichi [Mon, 15 May 2017 00:53:44 +0000 (09:53 +0900)]
Finish moving NetworkStats tests to tests/net
Follow-up of commit
c86013be936f36c61fa0cdfad95141f6de3c6ef7.
Also add @SmallTest annotation to classes moved to tests/net.
Test: no functional change
Bug:
32561414
Change-Id: I0a0e8865d37ba7bae06ce352d3fc385989adc300
Hugo Benichi [Wed, 17 May 2017 01:30:40 +0000 (10:30 +0900)]
Captive portals: reinspect http result after fallback probe
When DNS queries that precede the http and https probe take a long time
to complete, it is possible that the fallback probe fires earlier than
either the http and https probes.
This causes the detection logic to ignore the result of the http probe,
which may cause the system to miss captive portals advertising
themselves on the url used by the http probe but not on the url used by
the fallback probe.
This patch fixes that issue by forcing the detection to wait on the
result of the http probe if the fallback probe does not find a portal.
Bug:
38259299
Bug:
36532213
Test: manually tested with nearby captive portal networks
Change-Id: I07ea23a2b5f694c5ada9633169af98409efedff1
Hugo Benichi [Mon, 15 May 2017 06:15:33 +0000 (15:15 +0900)]
Address ConnectivityManager API comments.
This patch is a cherry pick of the two following commits:
-
15fd4395e13b4662a262ee67a5f75f5c521c62ef which addresses several
issues in the public api of ConnectivityManager.
-
e2d48ff57c5529b32a9cd7bfdcf21d29df539f73 which fixes the documentation
of several methods in ConnectivityManager public api.
Because the first commit change the public api that is referenced in
the documentation fixed by the second commit, it is not possible to one
without the other. In both cases trying to cherry pick only one of them
results in a build error.
The first commit was submitted successfully on an internal branch before
the checks done in the built got stricter.
Bug:
36370941
Test: marlin builds and boots
Change-Id: I86dcf056e6b165e527c3ee88dbabc2764ac09a08
Merged-In: I693ee5270bf186c88c7c5056293519f7237504ff
(cherry picked from commit
15fd4395e13b4662a262ee67a5f75f5c521c62ef)
Erik Kline [Wed, 17 May 2017 07:26:25 +0000 (07:26 +0000)]
Merge "Add tethering offload HAL call via JNI" am:
8f65e470b0
am:
f421d60824
Change-Id: I49a81e240cfd5d6ad58bb3af50fbcb9a410eb0d8
Erik Kline [Wed, 17 May 2017 07:18:51 +0000 (07:18 +0000)]
Merge "Add tethering offload HAL call via JNI"
am:
8f65e470b0
Change-Id: Ib8403f685371b44f0fdad6d15ae372787d457d13
Treehugger Robot [Wed, 17 May 2017 07:09:13 +0000 (07:09 +0000)]
Merge "Add tethering offload HAL call via JNI"
Colin Cross [Tue, 16 May 2017 01:10:40 +0000 (18:10 -0700)]
Convert libmedia_jni to Android.bp
See build/soong/README.md for more information.
Test: m -j checkbuild
Change-Id: I1817c75ee45537ca0d5fc40a035f94a3dfeccc11
Merged-In: I1817c75ee45537ca0d5fc40a035f94a3dfeccc11
(cherry picked from commit
76de4f6b4d09423b3a5d3603527ce79acae4ed32)
Erik Kline [Sun, 30 Apr 2017 10:36:15 +0000 (19:36 +0900)]
Add tethering offload HAL call via JNI
Additionally, try to locate java Control interface.
Test: as follows
- built
- flashed
- booted
- OffloadController log messages observed, but only ever
"not enabled" messages (needs a supporting implementation)
Bug:
29337859
Bug:
32163131
Bug:
34361337
Merged-In: I5251d05f2d2fd732a33a8955a6c346b3a2401e46
Change-Id: I5251d05f2d2fd732a33a8955a6c346b3a2401e46
(cherry picked from commit
58ed1b051bdffd239d92919170a0bb41a4cc197c)
Ying Xu [Tue, 16 May 2017 23:21:40 +0000 (23:21 +0000)]
Merge "Add the new RIL requests and NetworkScanResult." am:
0727abc423
am:
a37b511b67
Change-Id: If49a2d8139863f0322d73a90bd1d70cc1965bece
Ying Xu [Tue, 16 May 2017 23:11:24 +0000 (23:11 +0000)]
Merge "Add the new RIL requests and NetworkScanResult."
am:
0727abc423
Change-Id: I41560f522b3c46de4fe1a7a8377a6f2b7af04534
Ying Xu [Tue, 16 May 2017 23:04:39 +0000 (23:04 +0000)]
Merge "Add the new RIL requests and NetworkScanResult."
Andreas Gampe [Tue, 16 May 2017 21:09:51 +0000 (21:09 +0000)]
Merge "Zygote: Allow arbitrary-length wrap property names" am:
11780f1ad3
am:
c942ae61e9
Change-Id: I06a030f61b15aae3bb971c5f5666c940592f48e0
Andreas Gampe [Tue, 16 May 2017 21:03:04 +0000 (21:03 +0000)]
Merge "Zygote: Allow arbitrary-length wrap property names"
am:
11780f1ad3
Change-Id: Id1454ecd597347d5fca5f06a17df26e7303c59db
Treehugger Robot [Tue, 16 May 2017 20:49:54 +0000 (20:49 +0000)]
Merge "Zygote: Allow arbitrary-length wrap property names"
Jakub Pawlowski [Tue, 16 May 2017 20:40:58 +0000 (20:40 +0000)]
Merge "Discover primary service by UUID for PTS tests (4/4)" am:
abb732fc40
am:
7e80b882b7
Change-Id: I048c7b1ca915744da1e06e0280be125e7da2b796
yinxu [Thu, 20 Apr 2017 22:33:57 +0000 (15:33 -0700)]
Add the new RIL requests and NetworkScanResult.
Those new RIL requests will be used to start and stop network scan, and
the scan result will be returned from RIL in the format of
NetworkScanResult.
Test: Telephony sanity tests
Bug:
30954762
Change-Id: I2bfd0fb8cbb3815cc62ec4385594dec9c5e4d279
(cherry picked from commit
b36a4cb40222e1c0a61b13c1eca601ba761bd26e)
Jakub Pawlowski [Tue, 16 May 2017 20:29:08 +0000 (20:29 +0000)]
Merge "Discover primary service by UUID for PTS tests (4/4)"
am:
abb732fc40
Change-Id: I09534a5b9b961f1ac1ecf93172e1ae5c33cf5df1
Treehugger Robot [Tue, 16 May 2017 20:20:16 +0000 (20:20 +0000)]
Merge "Discover primary service by UUID for PTS tests (4/4)"
Hall Liu [Tue, 16 May 2017 19:58:20 +0000 (19:58 +0000)]
Merge "startStreaming for MBMS apis" am:
4b3c44be55
am:
0a4740ec5c
Change-Id: I9548b8211501358fc59570ba88f1bc1fa9731b1f
Hall Liu [Tue, 16 May 2017 19:52:26 +0000 (19:52 +0000)]
Merge "startStreaming for MBMS apis"
am:
4b3c44be55
Change-Id: Id0e2e95387300147ba32ec3a418605901fdb241b
Grace Chen [Tue, 16 May 2017 19:50:40 +0000 (19:50 +0000)]
Merge "Support different SIM power states" am:
0517b719bc
am:
1bbe5b21f3
Change-Id: I04e071b461a6ccecc46f9fbdc2f4ce6aeb311cb2
Hall Liu [Tue, 16 May 2017 19:45:10 +0000 (19:45 +0000)]
Merge "startStreaming for MBMS apis"
Grace Chen [Tue, 16 May 2017 19:42:42 +0000 (19:42 +0000)]
Merge "Support different SIM power states"
am:
0517b719bc
Change-Id: Icb6db4d805b4aea701a803eaaec716954f2ebf2a
Grace Chen [Tue, 16 May 2017 19:30:25 +0000 (19:30 +0000)]
Merge "Support different SIM power states"
Calin Juravle [Tue, 16 May 2017 03:20:50 +0000 (20:20 -0700)]
Also pin vdex file for camera
Test: device boots
Bug:
33168521
Change-Id: I157e9684f9b8d64950b96c07e35b6101eccd4045
Jakub Pawlowski [Tue, 16 May 2017 17:56:35 +0000 (10:56 -0700)]
Discover primary service by UUID for PTS tests (4/4)
Bug:
38123054
Test: manual
Change-Id: I89e088e60f4325f1ece59d22efda0c907a3b716a
Grace Chen [Tue, 9 May 2017 17:44:42 +0000 (10:44 -0700)]
Support different SIM power states
Test: Verify SIM power states
Bug:
35844036
Merged-In: I968269e88eec40af6e3ca71cbb805a77e016da0f
Change-Id: I968269e88eec40af6e3ca71cbb805a77e016da0f
Christopher Ferris [Tue, 16 May 2017 14:18:57 +0000 (14:18 +0000)]
Merge "Set the decay timer for all forked apps." am:
232ce7868d
am:
241fb2fc53
Change-Id: I1e27ac03777f99cc3e71935fcdfb7ea10d5bfbf4
Christopher Ferris [Tue, 16 May 2017 14:10:18 +0000 (14:10 +0000)]
Merge "Set the decay timer for all forked apps."
am:
232ce7868d
Change-Id: Ia6e16a2f6b8e551a48d6f3ab4472d097284436f4
Christopher Ferris [Tue, 16 May 2017 14:02:51 +0000 (14:02 +0000)]
Merge "Set the decay timer for all forked apps."
Hugo Benichi [Tue, 16 May 2017 13:18:33 +0000 (13:18 +0000)]
Merge "Remove unused import in ConnectivityManager" am:
db6fc1afe8
am:
fe098f8207
Change-Id: I64a2a607769d7194161e7728465c38cabbfa9345
Hugo Benichi [Tue, 16 May 2017 13:11:58 +0000 (13:11 +0000)]
Merge "Remove unused import in ConnectivityManager"
am:
db6fc1afe8
Change-Id: I1a7ce964c66e0204bfcc69948f7bed23ab498c81
Treehugger Robot [Tue, 16 May 2017 13:04:36 +0000 (13:04 +0000)]
Merge "Remove unused import in ConnectivityManager"
Erik Kline [Tue, 16 May 2017 08:13:14 +0000 (08:13 +0000)]
Merge "Fix broken DUN evaluation logic" am:
b0daeeb879
am:
dd76dd1eea
Change-Id: I7e194d1c17df7770706e3c80e587ce296f1e40f8
Erik Kline [Tue, 16 May 2017 08:06:42 +0000 (08:06 +0000)]
Merge "Fix broken DUN evaluation logic"
am:
b0daeeb879
Change-Id: Iae7450ef21485c5a13f45fab570bf658b2da8f28
Treehugger Robot [Tue, 16 May 2017 07:58:00 +0000 (07:58 +0000)]
Merge "Fix broken DUN evaluation logic"
Erik Kline [Mon, 15 May 2017 12:11:47 +0000 (21:11 +0900)]
Fix broken DUN evaluation logic
Test: as follows
- built
- booted
- flashed
- runtest frameworks-net passes
Bug:
32163131
Bug:
38152109
Bug:
38186915
Change-Id: Id4803504e825290d62c0b51a2b9bd664dcef30b1
Andreas Gampe [Thu, 11 May 2017 01:53:02 +0000 (18:53 -0700)]
Zygote: Allow arbitrary-length wrap property names
The restriction on system property key length has been lifted.
Update the invoke-with code to first check the full-length property.
Then fall back to the truncated version for backwards-compatibility.
Test: m
Test: manual with long package name (Maps)
Change-Id: I9f714af093a6017307cfef18c84de769f0de7c3e
Hugo Benichi [Tue, 16 May 2017 02:39:08 +0000 (11:39 +0900)]
Remove unused import in ConnectivityManager
This makes the pre-upload verification pass.
Test: no functional change.
Change-Id: I6beccea10ccfcb39d975cb8f6f34fc9d79f1e170
Ram Periathiruvadi [Thu, 4 May 2017 02:11:20 +0000 (19:11 -0700)]
Fix for Bluetooth not restarting on User Switch
The flag that keeps track of the Bluetooth adapter status(mEnable) is
not guarded correctly and could go out of sync with the adapter status.
This causes User Switch handling to not function correctly since it
checks for the status of the mEnable flag before restarting Bluetooth.
This fix queries the Bluetooth Adapter for the status instead of using
the mEnable flag.
Bug: b/
37648701
Test: Tested switching users multiple times in both phone and carkit.
Also tested pairing and connection for sanity.
Change-Id: I17facecf8e1de90df11c11d5b0a184f48a0356e4
Christopher Ferris [Mon, 15 May 2017 23:50:29 +0000 (16:50 -0700)]
Set the decay timer for all forked apps.
This will cause native memory frees to be less expensive, but it will cost
a bit of PSS that might hang around.
Bug:
36401135
Test: Built and booted bullhead.
Test: Ran jemalloc unit tests.
Test: Ran bionic unit tests.
Test: Ran a test that allocated and free'd a large piece of memory,
Test: and verified that after changing the parameter, the PSS
Test: sticks around (decay timer set to 1), the PSS is purged (decay
Test: timer set to 0).
Change-Id: I140b26986f3f81fddd5b9ed9c9e4f2d4977b819b
Hall Liu [Thu, 11 May 2017 20:32:32 +0000 (13:32 -0700)]
startStreaming for MBMS apis
Clean up MBMS APIs a bit and make things functional for the
startStreaming/getPlaybackUri APIs.
Test: testapps
Change-Id: I141a4114cc912b98ae22aefb760346061e286f1a
Hall Liu [Mon, 15 May 2017 22:25:34 +0000 (22:25 +0000)]
Merge "Change signalStrength to int." am:
73818566d6
am:
762e0c1162
Change-Id: I5cf3c07071c57c362847133c8858227d58662ce8
Hall Liu [Mon, 15 May 2017 22:14:59 +0000 (22:14 +0000)]
Merge "Change signalStrength to int."
am:
73818566d6
Change-Id: I8a9afddc749afc216dc1dc16f0465df1d0dab24f
Hall Liu [Mon, 15 May 2017 22:01:20 +0000 (22:01 +0000)]
Merge "Change signalStrength to int."
Hall Liu [Mon, 15 May 2017 20:54:30 +0000 (20:54 +0000)]
Merge "Remove switchStreams API." am:
f465d84ebe
am:
48941f5d90
Change-Id: I739d0f707c60167cf99e1ca5126621a899e607d7
Hall Liu [Mon, 15 May 2017 20:41:45 +0000 (20:41 +0000)]
Merge "Remove switchStreams API."
am:
f465d84ebe
Change-Id: Ia2cd7338087ee5283d2241ec260d0649ccd3f2b2
Hall Liu [Mon, 15 May 2017 20:22:55 +0000 (20:22 +0000)]
Merge "Remove switchStreams API."
Paul Duffin [Mon, 15 May 2017 19:19:30 +0000 (19:19 +0000)]
Merge "Moved c.a.i.u.Predicate[s] into legacy-test" am:
e476a30575
am:
3215c85de9
Change-Id: Ib64efa0332d5f5bdbab99f3271bc058c54bfaa35
Paul Duffin [Mon, 15 May 2017 19:11:08 +0000 (19:11 +0000)]
Merge "Moved c.a.i.u.Predicate[s] into legacy-test"
am:
e476a30575
Change-Id: Ia0b3ebd30e045fe2b26fe9a78b2de665bf960b0c
Paul Duffin [Mon, 15 May 2017 18:58:45 +0000 (18:58 +0000)]
Merge "Moved c.a.i.u.Predicate[s] into legacy-test"
Ying Xu [Mon, 15 May 2017 17:12:59 +0000 (17:12 +0000)]
Merge "Add API to support async network scans." am:
625d5a9dd9
am:
8d692eb811
Change-Id: I0aef12a6d1617b594cd1ed050ed0a02043ae5aba
Ying Xu [Mon, 15 May 2017 17:04:43 +0000 (17:04 +0000)]
Merge "Add API to support async network scans."
am:
625d5a9dd9
Change-Id: Iac369e26f707e59095ae7a89bfb11324e12634dc
Ying Xu [Mon, 15 May 2017 16:57:04 +0000 (16:57 +0000)]
Merge "Add API to support async network scans."
Paul Duffin [Tue, 9 May 2017 14:52:46 +0000 (15:52 +0100)]
Moved c.a.i.u.Predicate[s] into legacy-test
These classes are only used by android.test classes that are
being removed. As their name suggests they should not be in the
Android API at all so it makes sense to remove them. Especially
as there is java.lang.function.Predicate available now.
It appears as though Predicate was only added in to the API
because it was used by a method in the API as the directory in
which it and Predicates live was not on the list of classes to
explicitly index. Moving it into legacy-test meant that they are
now being indexed explicitly which means that Predicates needs
to be hidden.
Keeps running the tests as part of the existing target.
At runtime apps targeted at the API version before these are
removed will have the legacy-test library automatically added
to their classpath so they should see no effect. Apps that
target a later API will have to include those classes from the
android.legacy.test.jar which will contain all the android.test
classes that depend on it as well.
Bug:
30188076
Test: make checkbuild
Change-Id: Ia8502ec77ac11f85e078d70b68df214a9435eee7
Merged-In: I6f6f5f16fe93bd80227a450c6254166632fc6813
zhoulei [Mon, 15 May 2017 11:30:45 +0000 (11:30 +0000)]
Merge "update time while network is connected" am:
465f8527dd
am:
56ebd7daeb
Change-Id: Ia9287a828d40696f180599d58fbf1b4f0aea5449
zhoulei [Mon, 15 May 2017 11:22:45 +0000 (11:22 +0000)]
Merge "update time while network is connected"
am:
465f8527dd
Change-Id: I863c775015079a21098efd32b570acf8a8b53efa
Treehugger Robot [Mon, 15 May 2017 11:14:42 +0000 (11:14 +0000)]
Merge "update time while network is connected"
Hugo Benichi [Mon, 15 May 2017 06:08:28 +0000 (06:08 +0000)]
Merge "ConnectivityService: minor formatting change" am:
4c949ee07c
am:
9374e0b598
Change-Id: Iddfb8c44b1fc539039dd0b32daa64ac538cb285f
Hugo Benichi [Mon, 15 May 2017 06:00:59 +0000 (06:00 +0000)]
Merge "ConnectivityService: minor formatting change"
am:
4c949ee07c
Change-Id: Icb420ee636270ca07553de64958b04759986d11f
Hugo Benichi [Mon, 15 May 2017 05:50:35 +0000 (05:50 +0000)]
Merge "ConnectivityService: minor formatting change"
Hugo Benichi [Mon, 15 May 2017 02:26:44 +0000 (02:26 +0000)]
Merge "CaptivePortal: login activity UI improvements" am:
cb570ec50a
am:
95e0e08f61
Change-Id: I59a4d6daa591e577b6fd8e421c4f8fa5e26224d3
Hugo Benichi [Mon, 15 May 2017 02:18:47 +0000 (02:18 +0000)]
Merge "CaptivePortal: login activity UI improvements"
am:
cb570ec50a
Change-Id: I5ee0a2dbbb36e66822f4539f6b186df23a7438da
Hugo Benichi [Mon, 15 May 2017 02:08:46 +0000 (02:08 +0000)]
Merge "CaptivePortal: login activity UI improvements"
Hugo Benichi [Wed, 26 Apr 2017 05:53:28 +0000 (14:53 +0900)]
ConnectivityService: minor formatting change
This patch adds a space character between "synchronized" and
"(mTheLockVariable)" so that all synchronized block have a consistent
syntax. Basic stats shows that "synchronized (" is x10 time more likely
than "synchronized(".
This facilitates finding all locked sections by grepping.
Test: no semantics changes
Bug:
37119619
Change-Id: Id860700efa85ffebafed11af3a2997bc115d9c03
Robert Greenwalt [Fri, 12 May 2017 23:02:01 +0000 (16:02 -0700)]
Change signalStrength to int.
Broadcast signal strength is calculated differently than unicast
so the SignalStrength class used for unicast doesn't make sense.
Also added a -1 constant for unavailable which is mainly used
when the service is delivered via unicast.
Also rename signalStrengthUpdated to broadcastSignalStrengthUpdated.
Test: builds
Change-Id: Ia2680370d4cb8cd838341f58b41d02cdc78d4fc1
Naveen Kalla [Fri, 12 May 2017 22:40:24 +0000 (22:40 +0000)]
Merge "Add RIL_UNSOL_MODEM_RESTART message" am:
85e188585e
am:
e174804841
Change-Id: If2ba09241a05d0765c23cf5831e957efe3c1ef77
Naveen Kalla [Fri, 12 May 2017 22:32:53 +0000 (22:32 +0000)]
Merge "Add RIL_UNSOL_MODEM_RESTART message"
am:
85e188585e
Change-Id: I33dd05658ad8c9eed74e42ab27fa248a5942b688
Treehugger Robot [Fri, 12 May 2017 22:25:25 +0000 (22:25 +0000)]
Merge "Add RIL_UNSOL_MODEM_RESTART message"
Robert Greenwalt [Fri, 12 May 2017 22:04:04 +0000 (15:04 -0700)]
Remove switchStreams API.
After discussion about how best this could fit in the API we
discovered many disagreements that we couldn't resolve in the
time available. Pulling the feature from the API until we
can resolve issues.
Test: builds
Change-Id: I6d36a1dea8ce9816fad497b992a347188d3ac88e
yinxu [Wed, 12 Apr 2017 23:09:54 +0000 (16:09 -0700)]
Add API to support async network scans.
This CL includes the new Java API that supports async network scans.
Applications could get faster network scan results with this new API.
The long-term goal is to support Subsecond Switching which is separate
from what this CL is doing.
Bug:
30954762
Test: Unit test, run runtest -x NetworkScanRequestTest.java
Change-Id: I78cadaf838dee8439fe7417ef39f689990bf5705
(cherry picked from commit
fdfb6f4d2f6db943d648adec6cc96530f2f70fe6)
Naveen Kalla [Wed, 14 Sep 2016 20:53:54 +0000 (13:53 -0700)]
Add RIL_UNSOL_MODEM_RESTART message
RIL_UNSOL_MODEM_RESTART will be sent by vendor RILs when it detects
a modem restart along with the reason for restart which could be a
crash signature if the modem restarted due to a crash or a some
other string such as a user-initiated restart or AT command
initiated restart.
Test: Manual
Merged-In: Idf08e20a49e82d40f6aa0854d23384c35c2efc3a
Change-Id: Idf08e20a49e82d40f6aa0854d23384c35c2efc3a
Paul Duffin [Fri, 12 May 2017 12:57:58 +0000 (12:57 +0000)]
Merge changes I4c0e7fdd,I9ea3827a am:
c876eece68
am:
557996e1d0
Change-Id: I5b69ec04dbb80c826f43bd288e68cd74d1b99242
Paul Duffin [Fri, 12 May 2017 12:51:25 +0000 (12:51 +0000)]
Merge changes I4c0e7fdd,I9ea3827a
am:
c876eece68
Change-Id: Idf7bfe0bf3d9a770772bd364b9c6d1a9db6d9cdf
Paul Duffin [Fri, 12 May 2017 12:41:24 +0000 (12:41 +0000)]
Merge changes I4c0e7fdd,I9ea3827a
* changes:
Remove dependency on internal FileUtils class
Remove dependency on com.google.android.collect classes
zhoulei [Wed, 10 May 2017 10:09:50 +0000 (18:09 +0800)]
update time while network is connected
NTP update time from network while the network is not OK, so it should not
be excuted the network is disconnected to be for low power consumption
Test: as follows
- built
- flashed
- booted
Change-Id: I17f2a9463551e254284ee8a9f894a95e983eee19
Signed-off-by: zhoulei <zhoulei5@xiaomi.com>
Hugo Benichi [Thu, 11 May 2017 00:58:14 +0000 (09:58 +0900)]
CaptivePortal: login activity UI improvements
Similarly to commit
2e0915f14384901f25a41d698b39ef0add201550 for the
carrier portal login, this patch changes the default settings of the
webview used for the system captive portal login activity to allow
better user experience on "wide" login pages designed for desktop.
Differently from commit
2e0915f14384901f25a41d698b39ef0add201550, the
zooming buttons are not displayed (i.e zooming is possible only with
gesture).
Test: manually tested with captive portals.
Bug:
31813936,
19228946,
36532213
Change-Id: I2579994da37f3b0f4c08e24e59c81f31835ab832
Hall Liu [Fri, 12 May 2017 02:12:34 +0000 (02:12 +0000)]
Merge "getStreamingServices for embms" am:
b73fe9a751
am:
1d274ca5ec
Change-Id: Iabec728e0525a0c8d4cf0b8a2627e9198fa0f5c5
Hall Liu [Fri, 12 May 2017 01:52:29 +0000 (01:52 +0000)]
Merge "getStreamingServices for embms"
am:
b73fe9a751
Change-Id: I391004c1ee0e5815147349f488b537ed4d645e73
nharold [Fri, 12 May 2017 01:50:29 +0000 (01:50 +0000)]
Merge "Add hidden APIs to get the cached SignalStrength from SST" am:
5b8a9c873f
am:
cca5fbe779
Change-Id: I960302ca13d4dd9373186745ee2c72de348bceb8
Hall Liu [Fri, 12 May 2017 01:00:25 +0000 (01:00 +0000)]
Merge "getStreamingServices for embms"
Svetoslav Ganov [Fri, 12 May 2017 00:22:00 +0000 (00:22 +0000)]
Merge "Init MemoryIntArray#mFd with -1" am:
d6eaa80590
am:
a3f14a1531
Change-Id: Ieba327ed8b18c66906746e34e857e774c181fcf0