Antoan Angelov
b39d17720a
Merge "Update docs for EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS." into qt-dev am: ab34f61c3b am: 648eb2d3a7
...
am: 2c612c0a17
Change-Id: Ic954327dcaee6a54ffe3723ff0311b05010cab3e
2019-06-21 11:35:50 -07:00
Antoan Angelov
2c612c0a17
Merge "Update docs for EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS." into qt-dev am: ab34f61c3b
...
am: 648eb2d3a7
Change-Id: I0999d5fde028f595864633400e4368a6f5e4f430
2019-06-21 11:27:49 -07:00
Antoan Angelov
648eb2d3a7
Merge "Update docs for EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS." into qt-dev
...
am: ab34f61c3b
Change-Id: I4b0230f1429e5ca278fa6f5c15babddb1a71cda6
2019-06-21 11:15:06 -07:00
Antoan Angelov
ab34f61c3b
Merge "Update docs for EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS." into qt-dev
2019-06-21 18:07:22 +00:00
Robert Snoeberger
c96503773c
Merge "Handle case that settings string is JSON" into qt-r1-dev am: 6060068d5a
...
am: be57a19313
Change-Id: I2a4db0e323272f36c1d8d1b9f50238ca0aa073f0
2019-06-21 10:43:48 -07:00
Robert Snoeberger
be57a19313
Merge "Handle case that settings string is JSON" into qt-r1-dev
...
am: 6060068d5a
Change-Id: I3386b08801beb7356edb37c5485b29188d8a7c3f
2019-06-21 10:07:18 -07:00
TreeHugger Robot
f62b91043c
Merge "Remove @Deprecated && @removed hardware methods."
2019-06-21 00:51:31 +00:00
Neil Fuller
2350886e09
Merge "Switch to a single PacketSocketAddress constructor" am: 2d24f7a39e am: a357696c2f am: 9ec43cc7fe
...
am: dcf7d6e377
Change-Id: I999d61e1086f9a1cfcf9cf38522eb4c2779b607c
2019-06-20 14:42:30 -07:00
Chalard Jean
aa0d4adc2b
Merge "Factorize custom asserts." am: 6c176efa3d am: 99fbb40990 am: f1eab99357
...
am: bef7ff11e2
Change-Id: I1eecc5dd9f8c77287b8cca76f5d647a23a9a2f7a
2019-06-20 14:29:43 -07:00
Neil Fuller
dcf7d6e377
Merge "Switch to a single PacketSocketAddress constructor" am: 2d24f7a39e am: a357696c2f
...
am: 9ec43cc7fe
Change-Id: Id17253fbe7d22117dff5766ce5b50b4e446e5090
2019-06-20 14:19:53 -07:00
Chalard Jean
bef7ff11e2
Merge "Factorize custom asserts." am: 6c176efa3d am: 99fbb40990
...
am: f1eab99357
Change-Id: I8774ea64f004999ddb46223a76a671388687d455
2019-06-20 14:06:58 -07:00
Neil Fuller
9ec43cc7fe
Merge "Switch to a single PacketSocketAddress constructor" am: 2d24f7a39e
...
am: a357696c2f
Change-Id: I7db11188d9dd42e25b0aebd79acc92a9ba2f56a0
2019-06-20 14:06:50 -07:00
Chalard Jean
f1eab99357
Merge "Factorize custom asserts." am: 6c176efa3d
...
am: 99fbb40990
Change-Id: I65ea7497abb8b77ebd10ba622075ef3b6c49b2a8
2019-06-20 14:01:31 -07:00
TreeHugger Robot
e493e60354
Merge "Remove SystemClock.uptimeMillisClock()."
2019-06-20 20:06:53 +00:00
Robert Snoeberger
06d2500944
Handle case that settings string is JSON
...
Settings.Secure string for clock face may be JSON so that it can contain
the timestamp that it was set for logging purposes.
Bug: 134687399
Test: Added SettingsWrapperTest
Change-Id: I50afba479c30029428819c6616ca754db681a2b4
2019-06-20 15:06:28 -04:00
Amith Yamasani
582bedd9d9
Merge "Expose BIND_NOT_PERCEPTIBLE service flag" into qt-dev am: 41d0b1abc8 am: 29c3068cb4
...
am: 6fb1afce50
Change-Id: Ie4b878d3fa6ae8c0619b10fe8d87a06c3b182ca4
2019-06-20 09:10:41 -07:00
arangelov
bb2a802a23
Update docs for EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS.
...
Bug: Fixes: 134391678
Test: manual
Change-Id: I993af4f4a741283294b1754dfc0adc7c6f6f849e
2019-06-20 16:31:10 +01:00
Neil Fuller
2d24f7a39e
Merge "Switch to a single PacketSocketAddress constructor"
2019-06-20 14:09:15 +00:00
Neil Fuller
6ae89f2f9c
Switch to a single PacketSocketAddress constructor
...
Switch to a single PacketSocketAddress constructor to
avoid multiple unnecessary overloads in the
Core Platform API.
Bug: 133196453
Bug: 124232146
Test: build only
Change-Id: I30533ac3aa99c2cd09e8c624fedf6000b0f52c11
2019-06-20 09:24:43 +01:00
Chalard Jean
9c0ff1b005
Factorize custom asserts.
...
Also a few utilities that were in the way, and some opportunistic
cleanups.
Test: FrameworksNetTest NetworkStackTest
Change-Id: I385070e2044fd967cb18f1ffea9a86a4627b742e
2019-06-20 16:24:25 +09:00
Amith Yamasani
6fb1afce50
Merge "Expose BIND_NOT_PERCEPTIBLE service flag" into qt-dev am: 41d0b1abc8
...
am: 29c3068cb4
Change-Id: I835c10d85d623a3b9bf25947f222695dde05dc28
2019-06-19 23:18:27 -07:00
Junyu Lai
8ffb2b0106
Merge "Move the test of minimum supported keepalive slots to CTS" into qt-dev
...
am: 544e00d382
Change-Id: I5a8e52154f777064df66e943a3def4cbbc762856
2019-06-19 22:55:07 -07:00
Junyu Lai
1459e84fd6
Merge "Correct value of supported keepalive count for cellular" into qt-dev
...
am: fbe58171d6
Change-Id: Ic36c3be787c6c12647b1fd1460e3c2183ea605ec
2019-06-19 22:54:45 -07:00
Amith Yamasani
32fbd5c62f
Merge "Expose BIND_NOT_PERCEPTIBLE service flag" into qt-dev
...
am: 41d0b1abc8
Change-Id: Id99a04acfde6efd779f7c6cb5059f11a380aa1a4
2019-06-19 22:53:21 -07:00
Amith Yamasani
29c3068cb4
Merge "Expose BIND_NOT_PERCEPTIBLE service flag" into qt-dev
...
am: 41d0b1abc8
Change-Id: I209930a67dfc89cf4c5178ad21452e624122df7f
2019-06-19 22:53:06 -07:00
Makoto Onuki
3876068996
Merge "Optionally trigger CG in onTrimMemory()" into qt-dev am: 71acb72cbd am: 5b80149cce
...
am: de9b336ce2
Change-Id: I8b190c123371ddc08b139b6c597e53cf69ff4fcf
2019-06-19 22:52:00 -07:00
Junyu Lai
544e00d382
Merge "Move the test of minimum supported keepalive slots to CTS" into qt-dev
2019-06-20 05:35:07 +00:00
Junyu Lai
fbe58171d6
Merge "Correct value of supported keepalive count for cellular" into qt-dev
2019-06-20 05:35:07 +00:00
TreeHugger Robot
41d0b1abc8
Merge "Expose BIND_NOT_PERCEPTIBLE service flag" into qt-dev
2019-06-20 05:34:34 +00:00
Junyu Lai
a248130fc9
Correct value of supported keepalive count for cellular
...
Cellular only supports 1 keepalive connection so correct the default
supported value to 1.
Bug: 134037217
Bug: 134352656
Test: - atest FrameworksNetTests
- atest android.net.cts.ConnectivityManagerTest \
#testSocketKeepaliveLimitTelephony
Merged-In: Ia3761f2e78d54866bb2e156d58004396bbc8adc3
Change-Id: If833b813ba00eeff913160598f1ea9c74e6e35d8
(cherry picked from commit 680abbb591 )
2019-06-20 04:02:38 +00:00
Makoto Onuki
de9b336ce2
Merge "Optionally trigger CG in onTrimMemory()" into qt-dev am: 71acb72cbd
...
am: 5b80149cce
Change-Id: Icec805c33ffbf833f070a5c6a1bb03f92d195ebc
2019-06-19 20:13:32 -07:00
Makoto Onuki
5b80149cce
Merge "Optionally trigger CG in onTrimMemory()" into qt-dev
...
am: 71acb72cbd
Change-Id: I02c2450dc66c3741c451c34d54f90f0214114988
2019-06-19 19:41:10 -07:00
John Reck
14ff220613
Merge "Revert SurfaceView back to Q's version" into qt-r1-dev am: 2f8cae24b9
...
am: 2562753783
Change-Id: I3c95c3c080b76b9f9f33ddb9e27d84a167cdfcb6
2019-06-19 19:33:20 -07:00
Junyu Lai
70c06b5e52
Move the test of minimum supported keepalive slots to CTS
...
This change also enables log when keepalive is started.
Bug: 134352656
Test: 1. atest android.net.cts.ConnectivityManagerTest#testSocketKeepaliveLimitTelephony
2. atest FrameworksNetTests
Merged-In: I408750fa0bceb0c1c26afb5fead4e44fb824fbc1
Change-Id: Ib9b06d3458782a648a2f5b8fd5a9ca1d34bd11f9
(cherry picked from commit aed835f086 )
2019-06-20 02:26:58 +00:00
Makoto Onuki
0e9303f398
Merge "Optionally trigger CG in onTrimMemory()" into qt-dev
...
am: 71acb72cbd
Change-Id: Ic0db7139716eb45178fef4a44d5da77216306a06
2019-06-19 19:11:02 -07:00
Makoto Onuki
71acb72cbd
Merge "Optionally trigger CG in onTrimMemory()" into qt-dev
2019-06-19 23:24:04 +00:00
John Reck
2562753783
Merge "Revert SurfaceView back to Q's version" into qt-r1-dev
...
am: 2f8cae24b9
Change-Id: Iedb5910e225fd2584b6b4342dc7aed9b93747eb0
2019-06-19 16:07:02 -07:00
TreeHugger Robot
9562bc95cb
Merge "Remove @Deprecated && @removed package fields."
2019-06-19 21:42:39 +00:00
Amith Yamasani
5016a7891a
Expose BIND_NOT_PERCEPTIBLE service flag
...
Using this flag when binding to a service will
allow the bound process to be held at a low
oom_adj of 250, so that it can be expunged to
reclaim memory if a more user-visible app needs
it.
Use for bindings such as job services and other
connections that the caller can easily recover
from and restart if necessary.
Adjust the lmk thresholds to use this oom_adj
as one of the levels, so they're killed before
perceptible apps (such as foreground services).
Bug: 135219821
Test: CtsAppTestCases
Manually check notification listener oom_adj
and dumpsys activity services output
Change-Id: I9f6d0891d842e4d12f7995b9b1a8f57b0903a16d
2019-06-19 14:40:57 -07:00
John Reck
5866a0c6ab
Revert SurfaceView back to Q's version
...
Revert API behavior changes to SurfaceView, snapping
back to Q's version.
Bug: 133378280
Test: none
Change-Id: I3a47f9bfdfab2d16707f952a9af672551736e681
2019-06-19 11:39:20 -07:00
Makoto Onuki
0a9ee1af2c
Optionally trigger CG in onTrimMemory()
...
Set a trim-level threshold to debug.am.run_gc_trim_level to activate it.
Bug: 135148702
Test: Manual test with "setprop debug.am.run_gc_trim_level 0", run a lot of
heavy apps and take pictures, and check logcat for the "force_gc" event log.
Test: Manual test with "setprop debug.am.run_mallopt_trim_level 0", run a lot of
heavy apps and take pictures, and check logcat for a debug log.
Change-Id: I73b4dc7374e85e9a22c98ab17da53aa6cb25a188
2019-06-19 10:01:55 -07:00
Junyu Lai
f4d70dc9e3
Merge "Move the test of minimum supported keepalive slots to CTS" am: 579a99e558 am: 6ff00fee75 am: aed835f086
...
am: d2098f84d0
Change-Id: I13f47ed986756933172886d7e0c9b5d653fc34e7
2019-06-19 07:44:59 -07:00
Junyu Lai
c399dc1fb0
Merge "Correct value of supported keepalive count for cellular" am: 68a4599a37 am: 056eeae27c am: 680abbb591
...
am: 734d90759a
Change-Id: I621066b8c4cd9b244b4d70f84d428b5b784e0387
2019-06-19 07:44:39 -07:00
Junyu Lai
d2098f84d0
Merge "Move the test of minimum supported keepalive slots to CTS" am: 579a99e558 am: 6ff00fee75
...
am: aed835f086
Change-Id: If063ff023bf386884c6e42d2acb281763975ac8f
2019-06-19 07:36:52 -07:00
Junyu Lai
734d90759a
Merge "Correct value of supported keepalive count for cellular" am: 68a4599a37 am: 056eeae27c
...
am: 680abbb591
Change-Id: Ia0c1e0511bffd630af4aae87cafd99e68a042149
2019-06-19 07:36:43 -07:00
Andrei-Valentin Onea
4e104348fd
Merge "Document public alternatives to greylisted APIs" am: 3647eb620b am: 3641066567 am: 882defd836
...
am: 8a47b0e724
Change-Id: I9dcf9d0f762596f302ece299e25f23ce71d2937a
2019-06-19 07:36:25 -07:00
Junyu Lai
aed835f086
Merge "Move the test of minimum supported keepalive slots to CTS" am: 579a99e558
...
am: 6ff00fee75
Change-Id: Ib9b06d3458782a648a2f5b8fd5a9ca1d34bd11f9
2019-06-19 07:29:11 -07:00
Junyu Lai
680abbb591
Merge "Correct value of supported keepalive count for cellular" am: 68a4599a37
...
am: 056eeae27c
Change-Id: If833b813ba00eeff913160598f1ea9c74e6e35d8
2019-06-19 07:28:53 -07:00
Andrei-Valentin Onea
8a47b0e724
Merge "Document public alternatives to greylisted APIs" am: 3647eb620b am: 3641066567
...
am: 882defd836
Change-Id: I6e4d6245e19a11346cab16a419ef2f5a5204d489
2019-06-19 07:28:23 -07:00
Andrei-Valentin Onea
882defd836
Merge "Document public alternatives to greylisted APIs" am: 3647eb620b
...
am: 3641066567
Change-Id: Ia21d1ce57a2cbffe8b417d6f1d5535924c7ea162
2019-06-19 07:21:29 -07:00