OSDN Git Service
Robin Lee [Mon, 23 Jan 2017 17:01:31 +0000 (17:01 +0000)]
Merge "Disable always-on VPN in factoryReset" am:
63c14e0ab6 am:
1135d509c5
am:
e2554d51c4
Change-Id: I99207281321861a3e720b5c1e2e316e12b104677
Robin Lee [Mon, 23 Jan 2017 16:54:59 +0000 (16:54 +0000)]
Merge "Disable always-on VPN in factoryReset" am:
63c14e0ab6
am:
1135d509c5
Change-Id: I66b6721932ae8798cbb406cafa04ed0c92fe47f6
Robin Lee [Mon, 23 Jan 2017 16:47:58 +0000 (16:47 +0000)]
Merge "Disable always-on VPN in factoryReset"
am:
63c14e0ab6
Change-Id: I021b288e3db17ddefbea3645fd282e3ee123a6e8
Robin Lee [Mon, 23 Jan 2017 16:40:05 +0000 (16:40 +0000)]
Merge "Disable always-on VPN in factoryReset"
Erik Kline [Mon, 23 Jan 2017 13:05:15 +0000 (13:05 +0000)]
Merge "Move TetheringConfiguration out to its own file" am:
5a45170f95 -s ours am:
fc97509a3e
am:
42bd98f1ce
Change-Id: I3580c86b3d252209dfa84c9beb4c42403609b267
Erik Kline [Mon, 23 Jan 2017 12:49:40 +0000 (21:49 +0900)]
resolve merge conflicts of
261932b98cb6 to nyc-mr2-dev-plus-aosp
Change-Id: I8476804f77567cf01693a4126d5a41bcdb0016e8
Erik Kline [Mon, 23 Jan 2017 12:24:15 +0000 (12:24 +0000)]
Merge "Move TetheringConfiguration out to its own file" am:
5a45170f95 -s ours
am:
fc97509a3e
Change-Id: I28eabc6e3f58ac2b3b45fa5d218fcaf41b13de5c
Erik Kline [Mon, 23 Jan 2017 12:23:16 +0000 (12:23 +0000)]
Move TetheringConfiguration out to its own file
am:
a3d5657027
Change-Id: I429649e576fdd0f6c08b2a90c0dfba5de2316c4f
Erik Kline [Mon, 23 Jan 2017 12:20:35 +0000 (12:20 +0000)]
Merge "Move TetheringConfiguration out to its own file"
am:
5a45170f95 -s ours
Change-Id: I6a6bc4b2679432dd539d6b6930d7a32229fab363
Erik Kline [Sat, 21 Jan 2017 05:33:56 +0000 (14:33 +0900)]
Move TetheringConfiguration out to its own file
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net
- vanilla tethering works
- changing from no dun requirement to dun shows dun required
Bug:
32163131
Change-Id: I488449570dff057311b37335923ce6a199b363b7
Hugo Benichi [Mon, 23 Jan 2017 11:09:15 +0000 (11:09 +0000)]
Merge changes Idbde7000,Idde3c9d0 into nyc-mr2-dev-plus-aosp
* changes:
DO NOT MERGE ApfFilter: use elapsedRealTime for RA lifetime
DO NOT MERGE ApfFilter: systematically use u8, u16, u32 getters
Erik Kline [Mon, 23 Jan 2017 11:06:06 +0000 (11:06 +0000)]
Merge "Add test for updateMobileRequiresDun()" am:
7f018500dc am:
2a3338084a
am:
503374c0ae
Change-Id: I25751833ed6623ab156156fc76aa23b158a60fb4
Erik Kline [Mon, 23 Jan 2017 10:59:41 +0000 (10:59 +0000)]
Merge "Add test for updateMobileRequiresDun()" am:
7f018500dc
am:
2a3338084a
Change-Id: I3fe2605bba2a8c8ee3284f3c3278258d37fae46b
Erik Kline [Mon, 23 Jan 2017 10:56:35 +0000 (10:56 +0000)]
Merge "Move TetheringConfiguration out to its own file"
Erik Kline [Sat, 21 Jan 2017 05:33:56 +0000 (14:33 +0900)]
Move TetheringConfiguration out to its own file
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net
- vanilla tethering works
- changing from no dun requirement to dun shows dun required
Bug:
32163131
Change-Id: I488449570dff057311b37335923ce6a199b363b7
Erik Kline [Mon, 23 Jan 2017 10:53:11 +0000 (10:53 +0000)]
Merge "Add test for updateMobileRequiresDun()"
am:
7f018500dc
Change-Id: Ic7b984105e2c245a992446e15d11dd19e4671a57
Treehugger Robot [Mon, 23 Jan 2017 10:44:19 +0000 (10:44 +0000)]
Merge "Add test for updateMobileRequiresDun()"
Erik Kline [Mon, 23 Jan 2017 06:55:16 +0000 (15:55 +0900)]
Add test for updateMobileRequiresDun()
This test validates that when a mobile upstream has been requested
changing the "DUN required" state results in updating the requested
network appropriately.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-test passes
Bug:
32163131
Change-Id: Ia3a1f6493ea348eb75e334344468a980206f618f
Erik Kline [Mon, 23 Jan 2017 07:26:28 +0000 (07:26 +0000)]
Merge "More concisely export whether we have a "tetherable configuration"" am:
1b2a1b911d am:
72c17a7234
am:
d0867fb876
Change-Id: Iba07ae91906fa2f0763dae831f56b4841572e1f1
Erik Kline [Mon, 23 Jan 2017 07:20:32 +0000 (07:20 +0000)]
Merge "More concisely export whether we have a "tetherable configuration"" am:
1b2a1b911d
am:
72c17a7234
Change-Id: Ic67b2d4589f586c67109216330f68cb1fc08c55a
Erik Kline [Mon, 23 Jan 2017 07:13:56 +0000 (07:13 +0000)]
Merge "More concisely export whether we have a "tetherable configuration""
am:
1b2a1b911d
Change-Id: I5f9717c9dab6b39f1fbf2186107b2a1f3f2d4f8f
Treehugger Robot [Mon, 23 Jan 2017 07:04:21 +0000 (07:04 +0000)]
Merge "More concisely export whether we have a "tetherable configuration""
Hugo Benichi [Mon, 17 Oct 2016 05:21:33 +0000 (14:21 +0900)]
DO NOT MERGE ApfFilter: use elapsedRealTime for RA lifetime
This patch replaces System.currentTimeMillis() with
SystemClock.elapsedRealTime() to make RA lifetime computation more
resilient to various external events inducing jumps in
currentTimeMillis().
Test: ApfTest passes.
(cherry picked from commit
305af8e98a4fce712c1a93daf3b050dac2e8b91a)
Change-Id: Idbde700025fecfecefb8162d66b94194a87829d5
Hugo Benichi [Thu, 13 Oct 2016 00:26:01 +0000 (09:26 +0900)]
DO NOT MERGE ApfFilter: systematically use u8, u16, u32 getters
This patch adds a getUint8 getter for ByteBuffers and changes ApfFilter
to make uses of getUint8/16/32 everywhere.
The return types of getUint16 is also changed from long to int, which
will expand gracefully to long as an unsigned int as it is guaranteed to
be positive after getUint16.
Test: ApfTest passes
(cherry picked from commit
995dd94673005b43d32456e2de5fda0090b23576)
Change-Id: Idde3c9d03d39fbdf6f9b84d398f3fe8ea371483d
Erik Kline [Mon, 23 Jan 2017 04:01:58 +0000 (13:01 +0900)]
More concisely export whether we have a "tetherable configuration"
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
- vanilla WiFi-to-mobile tethering works
Bug:
32163131
Change-Id: I20dd36b5bf7fc55a639c76ea4bdb55b650654881
Bill Yi [Sun, 22 Jan 2017 01:01:22 +0000 (01:01 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
40758bb7d2 -s ours
Change-Id: I25058d9c3131588c724233d1d9faafad9f4104d6
Bill Yi [Sun, 22 Jan 2017 01:01:15 +0000 (01:01 +0000)]
Import translations. DO NOT MERGE
am:
c78569cc23 -s ours
Change-Id: If9dd42a1c21fd84db10276fce6d79cc17e46061b
Bill Yi [Sun, 22 Jan 2017 00:59:40 +0000 (00:59 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
96701d3c94 -s ours
Change-Id: I7e2c5d5ea83dfce16529ef041f06ee18d5a16a11
Bill Yi [Sun, 22 Jan 2017 00:59:33 +0000 (00:59 +0000)]
Import translations. DO NOT MERGE
am:
7eefc3ed2a -s ours
Change-Id: I4d2301434bbd5e6aed99d7850ce0924939c6e62c
Bill Yi [Sun, 22 Jan 2017 00:58:17 +0000 (00:58 +0000)]
Import translations. DO NOT MERGE
am:
f60d275a45 -s ours
Change-Id: I1ab211b4274b8cf4efcc84bdc52101e058f4d184
TreeHugger Robot [Sun, 22 Jan 2017 00:50:15 +0000 (00:50 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Sun, 22 Jan 2017 00:49:12 +0000 (00:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Sat, 21 Jan 2017 21:29:01 +0000 (13:29 -0800)]
Import translations. DO NOT MERGE
Change-Id: I62a808a76324482f44009f4ab8cf5916ba2f0477
Auto-generated-cl: translation import
Bill Yi [Sat, 21 Jan 2017 19:57:08 +0000 (11:57 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5784ba9ac936cab4b2d809ff49d4e070c039cebe
Auto-generated-cl: translation import
Bill Yi [Sat, 21 Jan 2017 19:48:44 +0000 (11:48 -0800)]
Import translations. DO NOT MERGE
Change-Id: I015ec135dd7a62e001bee4c1356a9bc87814aa6d
Auto-generated-cl: translation import
Christine Franks [Sat, 21 Jan 2017 05:42:11 +0000 (05:42 +0000)]
Merge "DO NOT MERGE - Require password to FR in carrier demo mode" into nyc-mr2-dev
am:
e1a7e67dc0
Change-Id: I3a337da003d504647d6ff7489d907754986e8482
Christine Franks [Sat, 21 Jan 2017 05:42:06 +0000 (05:42 +0000)]
DO NOT MERGE - Require password to FR in carrier demo mode
am:
319b44e6e9
Change-Id: Ie53a29cfc067f255f2f90e5d83ec8d92a57a3651
Amin Shaikh [Sat, 21 Jan 2017 05:38:45 +0000 (05:38 +0000)]
Merge "Add Setting for curating saved open networks." am:
b3b665de22 am:
2aec2f7a9c
am:
835db7f6b6
Change-Id: I5a8e3a4fc0198dbb7bf88e2bbcf0152b0b82a7fc
Christine Franks [Sat, 21 Jan 2017 05:36:08 +0000 (05:36 +0000)]
Merge "DO NOT MERGE - Require password to FR in carrier demo mode" into nyc-mr2-dev
Amin Shaikh [Sat, 21 Jan 2017 05:34:12 +0000 (05:34 +0000)]
Merge "Add Setting for curating saved open networks." am:
b3b665de22
am:
2aec2f7a9c
Change-Id: If61be9f8e71bb89a8714c3f4a5eb10b04982cdf7
Amin Shaikh [Sat, 21 Jan 2017 05:27:06 +0000 (05:27 +0000)]
Merge "Add Setting for curating saved open networks."
am:
b3b665de22
Change-Id: I3c65f39dc4f38f1c6c00a240f519cb0b0cf1a916
Treehugger Robot [Sat, 21 Jan 2017 05:17:41 +0000 (05:17 +0000)]
Merge "Add Setting for curating saved open networks."
Erik Kline [Sat, 21 Jan 2017 05:12:58 +0000 (05:12 +0000)]
Merge "Move several config elements into TetheringConfiguration class" am:
8d35276910 am:
81499754bc
am:
46f036c6da
Change-Id: I29fb42f75f0bd660f003794b47164d119a3e57ae
Erik Kline [Sat, 21 Jan 2017 05:12:00 +0000 (05:12 +0000)]
Move several config elements into TetheringConfiguration class am:
3e7566572e am:
ec45953fd7
am:
befb6a1702
Change-Id: Ife89a2da79aa2a3002eca50f7e9c0a91c894375c
Jesse Hall [Sat, 21 Jan 2017 05:08:38 +0000 (05:08 +0000)]
Merge "Load EGL early in Activity launch, instead of in Zygote" into nyc-mr2-dev
am:
f2a54b6a39 -s ours
Change-Id: I3392b81976e9a530faba27ff93e6514ad8ded7a7
Jesse Hall [Sat, 21 Jan 2017 05:08:33 +0000 (05:08 +0000)]
Load EGL early in Activity launch, instead of in Zygote
am:
fd104e7fde -s ours
Change-Id: Ide0fccd9666589c0003312ee51e25eb253bddce7
Erik Kline [Sat, 21 Jan 2017 05:06:06 +0000 (05:06 +0000)]
Merge "Move several config elements into TetheringConfiguration class" am:
8d35276910
am:
81499754bc
Change-Id: I6a0dc7192aeca1ecccbf8223516bf3f5f4a9bfb8
Erik Kline [Sat, 21 Jan 2017 05:05:04 +0000 (05:05 +0000)]
Move several config elements into TetheringConfiguration class am:
3e7566572e
am:
ec45953fd7
Change-Id: If9cffb4d63cdfdf075b6c8991e763f4237d0d5a8
TreeHugger Robot [Sat, 21 Jan 2017 05:04:21 +0000 (05:04 +0000)]
Merge "Load EGL early in Activity launch, instead of in Zygote" into nyc-mr2-dev
Erik Kline [Sat, 21 Jan 2017 04:57:34 +0000 (04:57 +0000)]
Merge "Move several config elements into TetheringConfiguration class"
am:
8d35276910
Change-Id: I0eb196a4b61e460db24271d6805177641ad3fc9b
Erik Kline [Sat, 21 Jan 2017 04:57:32 +0000 (04:57 +0000)]
Merge "Address a few unittest comments." am:
9c3a298748 am:
d4d464ae2c
am:
8de6457414
Change-Id: I007c10df7bd3658453cb245d11f5b606ac70e0b3
Erik Kline [Sat, 21 Jan 2017 04:57:29 +0000 (04:57 +0000)]
Move several config elements into TetheringConfiguration class
am:
3e7566572e
Change-Id: Ic053965b54eed0afc9a4785ce80ef1fab281493a
Erik Kline [Sat, 21 Jan 2017 04:50:36 +0000 (04:50 +0000)]
Merge "Address a few unittest comments." am:
9c3a298748
am:
d4d464ae2c
Change-Id: Iacb543c081a89327c66ce849b764866f12bc60d0
Erik Kline [Sat, 21 Jan 2017 04:49:10 +0000 (04:49 +0000)]
Merge "Move several config elements into TetheringConfiguration class"
Erik Kline [Sat, 21 Jan 2017 04:43:27 +0000 (04:43 +0000)]
Merge "Address a few unittest comments."
am:
9c3a298748
Change-Id: I2d41cdbe05653bcbed9d3b38b440c06b98006809
Erik Kline [Sat, 21 Jan 2017 04:36:27 +0000 (04:36 +0000)]
Merge "Address a few unittest comments."
Amin Shaikh [Fri, 20 Jan 2017 01:38:23 +0000 (17:38 -0800)]
Add Setting for curating saved open networks.
Bug:
34392914
Test: make
Change-Id: Icd17753af6b0efdb35d1060b16029a53fdf4e605
Merged-In: Icd17753af6b0efdb35d1060b16029a53fdf4e605
Christine Franks [Fri, 20 Jan 2017 19:56:32 +0000 (11:56 -0800)]
DO NOT MERGE - Require password to FR in carrier demo mode
Bug:
34341567
Test: manual - password not required for regular user factory resets
and is required in carrier demo mode.
Change-Id: If696e5c5c806e31399e33a151b0d36e7a950ceb0
Jesse Hall [Fri, 20 Jan 2017 01:59:08 +0000 (17:59 -0800)]
Load EGL early in Activity launch, instead of in Zygote
Preloading EGL in Zygote was originally a memory footprint
optimization, but it turns out to be an important app startup time
optimization as well. Preloading EGL in Zygote is incompatible with
updatable graphics drivers, but we don't want to do it on-demand as
part of drawing the first frame either, since that increases
first-frame latency unacceptably.
This change removes Zygote preload, and instead loads EGL on a
low-priority background thread immediately after choosing which
graphics driver to use. This means it is usually done well before
drawing the first frame, without significantly disrupting other
activity launch work.
Test: observe systrace of Calculator launch on bullhead
Bug:
34404021
Change-Id: I6a0f6b90ade21848a10d51ddae62c936f70151b5
Merged-In: I887aa09bd35b088b16f53a89838a0c7c98f15761
Jesse Hall [Fri, 20 Jan 2017 23:57:30 +0000 (23:57 +0000)]
Merge "Load EGL early in Activity launch, instead of in Zygote" into nyc-mr2-dev-plus-aosp
Amin Shaikh [Fri, 20 Jan 2017 23:30:39 +0000 (23:30 +0000)]
Merge "Add additional fields to RecommendationRequest." am:
b8f0e69ef0 am:
ac05acad45
am:
b7b9c6f889
Change-Id: Ieade1643bfc4c9039d6d4f702bf3ec527679ce74
Amin Shaikh [Fri, 20 Jan 2017 23:23:39 +0000 (23:23 +0000)]
Merge "Add additional fields to RecommendationRequest." am:
b8f0e69ef0
am:
ac05acad45
Change-Id: I1062446bbd085b794bfe61843e670dc5af689d32
Amin Shaikh [Fri, 20 Jan 2017 23:18:02 +0000 (23:18 +0000)]
Merge "Add additional fields to RecommendationRequest."
am:
b8f0e69ef0
Change-Id: I9a50c8aca36cf740abbc62af6879b4e6ea736855
Rebecca Silberstein [Fri, 20 Jan 2017 23:13:38 +0000 (23:13 +0000)]
Merge "SystemServer: reorder wifi services start" am:
10c514d9de am:
eae39fd1ec
am:
5c00ee28b2
Change-Id: Id6eb74c4aab2cd25f1d7adff4ddff160f6132fc6
Rebecca Silberstein [Fri, 20 Jan 2017 23:07:10 +0000 (23:07 +0000)]
Merge "SystemServer: reorder wifi services start" am:
10c514d9de
am:
eae39fd1ec
Change-Id: I723d8b96f5d5406e8f948885a845993e755ab0d8
Treehugger Robot [Fri, 20 Jan 2017 23:04:54 +0000 (23:04 +0000)]
Merge "Add additional fields to RecommendationRequest."
Jeff Sharkey [Fri, 20 Jan 2017 23:03:40 +0000 (23:03 +0000)]
Merge "Add Binder support for Parcelable exceptions." am:
a2ef6b5741 am:
c3fbf32011
am:
4a0a4664b9
Change-Id: I9b5667ca6e5497a4eedaaf88979a1a3d0e22c174
Rebecca Silberstein [Fri, 20 Jan 2017 23:00:13 +0000 (23:00 +0000)]
Merge "SystemServer: reorder wifi services start"
am:
10c514d9de
Change-Id: I3a918b707932084759701103c683fffed0e16cee
Jeff Sharkey [Fri, 20 Jan 2017 22:56:45 +0000 (22:56 +0000)]
Merge "Add Binder support for Parcelable exceptions." am:
a2ef6b5741
am:
c3fbf32011
Change-Id: Ibd977a017ce48f0791520af3500969aec0c132e5
Rebecca Silberstein [Fri, 20 Jan 2017 22:51:35 +0000 (22:51 +0000)]
Merge "SystemServer: reorder wifi services start"
Jeff Sharkey [Fri, 20 Jan 2017 22:50:49 +0000 (22:50 +0000)]
Merge "Add Binder support for Parcelable exceptions."
am:
a2ef6b5741
Change-Id: Ide766c0220e86b7661af83551354b3a498297ed8
Jeff Sharkey [Fri, 20 Jan 2017 22:45:03 +0000 (22:45 +0000)]
Merge "Add Binder support for Parcelable exceptions."
Jesse Hall [Fri, 20 Jan 2017 01:59:08 +0000 (17:59 -0800)]
Load EGL early in Activity launch, instead of in Zygote
Preloading EGL in Zygote was originally a memory footprint
optimization, but it turns out to be an important app startup time
optimization as well. Preloading EGL in Zygote is incompatible with
updatable graphics drivers, but we don't want to do it on-demand as
part of drawing the first frame either, since that increases
first-frame latency unacceptably.
This change removes Zygote preload, and instead loads EGL on a
low-priority background thread immediately after choosing which
graphics driver to use. This means it is usually done well before
drawing the first frame, without significantly disrupting other
activity launch work.
Test: observe systrace of Calculator launch on bullhead
Bug:
34404021
Change-Id: I887aa09bd35b088b16f53a89838a0c7c98f15761
Philipp Weiß [Fri, 20 Jan 2017 19:18:38 +0000 (19:18 +0000)]
Merge "DO NOT MERGE Finalize device-monitoring dialog strings" into nyc-mr2-dev
am:
c281fd12af
Change-Id: Idb993945120ca591dfa9471bfc4a36706fe70e5f
phweiss [Fri, 20 Jan 2017 19:18:29 +0000 (19:18 +0000)]
DO NOT MERGE Finalize device-monitoring dialog strings
am:
232b0d4088
Change-Id: I37008b2f10b746ed7aa0c455d832efd7b2966c77
Philipp Weiß [Fri, 20 Jan 2017 19:12:44 +0000 (19:12 +0000)]
Merge "DO NOT MERGE Finalize device-monitoring dialog strings" into nyc-mr2-dev
Ta-wei Yen [Fri, 20 Jan 2017 18:38:31 +0000 (18:38 +0000)]
Merge "Add voicemail backup/restore columns" into nyc-mr2-dev
am:
c1a1348b99
Change-Id: Ifd5116c2d8e44d6f16d6abd76d41fe5aebb28a24
Ta-wei Yen [Fri, 20 Jan 2017 18:38:23 +0000 (18:38 +0000)]
Add voicemail backup/restore columns
am:
f48d5ce630
Change-Id: I2dd76b4107b9e7c75595fa3c49dcda74cebd2a09
phweiss [Fri, 20 Jan 2017 17:41:57 +0000 (18:41 +0100)]
DO NOT MERGE Finalize device-monitoring dialog strings
Add Char-limits, do minor style changes and remove STOPSHIP comment.
Related change on master:
ag/
1800040
0d08ca7d7fa12217f4a6562764b4ea65f3fa31f2
BUG:
33655277
BUG:
31207965
BUG:
29748723
Test: only string changes
Change-Id: I37d1b509c6344d7f7d144fc0d8950f45faeaaef4
Ta-wei Yen [Fri, 20 Jan 2017 18:31:41 +0000 (18:31 +0000)]
Merge "Add voicemail backup/restore columns" into nyc-mr2-dev
Fyodor Kupolov [Fri, 20 Jan 2017 18:23:20 +0000 (18:23 +0000)]
Merge "[DO NOT MERGE] Do not report boot timings on first boot or runtime restart" into nyc-mr2-dev
am:
1dcfc423cd
Change-Id: I00117f3c0ac6d9bae5650dceea182790ed43bb1c
Fyodor Kupolov [Fri, 20 Jan 2017 18:23:16 +0000 (18:23 +0000)]
[DO NOT MERGE] Do not report boot timings on first boot or runtime restart
am:
83a218c416
Change-Id: Ib503ffb8d0d718aa6af4b420cc71e32a033e658b
Fyodor Kupolov [Fri, 20 Jan 2017 18:17:58 +0000 (18:17 +0000)]
Merge "[DO NOT MERGE] Do not report boot timings on first boot or runtime restart" into nyc-mr2-dev
Amin Shaikh [Fri, 20 Jan 2017 01:24:41 +0000 (17:24 -0800)]
Add additional fields to RecommendationRequest.
- Add networkId and timestamp for the last user selected network
Bug:
34467596
Test: runtest --path core/tests/coretests/src/android/net/RecommendationRequestTest.java
Change-Id: Ic81c1beede1a643cd428b6e5c57ed430a6b1ccc0
Merged-In: Ic81c1beede1a643cd428b6e5c57ed430a6b1ccc0
Fyodor Kupolov [Thu, 19 Jan 2017 20:11:32 +0000 (12:11 -0800)]
[DO NOT MERGE] Do not report boot timings on first boot or runtime restart
During first boot after OTA, additional dexopting has to be done
during PM initialization. Timings for OTA are reported separately,
so we should ignore first boot to avoid skewing the metrics.
The following metrics were updated:
- framework_locked_boot_completed
- framework_boot_completed
Cherry-picked from commit
1d87e40d4214a7f6d20a58d6f27cca174f0d974e
Test: manual
Bug:
32807863
Change-Id: I9d545cf38118f45f3f13597df2949d0ae4abd26a
Erik Kline [Fri, 20 Jan 2017 10:21:20 +0000 (10:21 +0000)]
Merge "Refactor to SimChangeListener class" am:
a12217012e am:
74247b4ee8
am:
6dacd5ecf2
Change-Id: Ia80e64c9f1188953aa4d9687bc7b0b0659de968a
Erik Kline [Fri, 20 Jan 2017 10:16:56 +0000 (10:16 +0000)]
Merge "Refactor to SimChangeListener class" am:
a12217012e
am:
74247b4ee8
Change-Id: I59dc854bd74eb8ba6addae90a4a87453868b5368
Erik Kline [Fri, 20 Jan 2017 10:14:50 +0000 (10:14 +0000)]
Merge "Address comments from previous change (320592)" am:
e7cb6c3761 am:
b6f606b59f
am:
454a408717
Change-Id: I374c8c63e4fb3310c3c50cc531a65005991c2fe2
Erik Kline [Tue, 17 Jan 2017 06:06:35 +0000 (15:06 +0900)]
Address a few unittest comments.
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Change-Id: I8f6002243031dceff60b3d6d377b9e25f239eb23
Erik Kline [Fri, 20 Jan 2017 10:13:08 +0000 (10:13 +0000)]
Merge "Refactor to SimChangeListener class"
am:
a12217012e
Change-Id: I863f0b23251a0ebd18a76cf08e1ff0f2cee9cda3
Erik Kline [Tue, 17 Jan 2017 04:42:19 +0000 (13:42 +0900)]
Move several config elements into TetheringConfiguration class
Encapsulate the following config elements:
- all interface name regular expressions
- specification of preferred upstreams
- downstream DHCPv4 ranges
- default IPv4 (and IPv6) DNS servers
Test: as follows
- builds
- flashed (bullhead)
- runtest frameworks-net passes
Bug:
32163131
Change-Id: Ife4871c0b89d2d52e2cc9238e0606b428287521c
Erik Kline [Fri, 20 Jan 2017 10:10:52 +0000 (10:10 +0000)]
Merge "Address comments from previous change (320592)" am:
e7cb6c3761
am:
b6f606b59f
Change-Id: Icc5aa3d6cafd9829e65a0e82523727a9aba4ade5
Treehugger Robot [Fri, 20 Jan 2017 10:05:50 +0000 (10:05 +0000)]
Merge "Refactor to SimChangeListener class"
Erik Kline [Fri, 20 Jan 2017 10:04:51 +0000 (10:04 +0000)]
Merge "Address comments from previous change (320592)"
am:
e7cb6c3761
Change-Id: I3266a02a4a2fd76c4bb2f1a744103add63307e26
Treehugger Robot [Fri, 20 Jan 2017 09:57:26 +0000 (09:57 +0000)]
Merge "Address comments from previous change (320592)"
Lorenzo Colitti [Fri, 20 Jan 2017 09:02:50 +0000 (09:02 +0000)]
Merge "Don't loop forever on zero-length ICMPv6 ND options." am:
e7128b10a8 am:
113d5f8f40
am:
6bcbb16630
Change-Id: I38ba45068c00c0948f561a788a7015ed250d62b6
Lorenzo Colitti [Fri, 20 Jan 2017 08:58:47 +0000 (08:58 +0000)]
Merge "Don't loop forever on zero-length ICMPv6 ND options." am:
e7128b10a8
am:
113d5f8f40
Change-Id: Ic2d6596d14f6176a823fd66b400af8515617c66d
Lorenzo Colitti [Fri, 20 Jan 2017 08:54:42 +0000 (08:54 +0000)]
Merge "Don't loop forever on zero-length ICMPv6 ND options."
am:
e7128b10a8
Change-Id: If2260dd2b1bdaf2619cee668f8c2ef81e9dcfdce
Treehugger Robot [Fri, 20 Jan 2017 08:47:17 +0000 (08:47 +0000)]
Merge "Don't loop forever on zero-length ICMPv6 ND options."
Erik Kline [Tue, 17 Jan 2017 08:31:26 +0000 (17:31 +0900)]
Refactor to SimChangeListener class
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameswork-net passes
- tested wifi-to-mobile tethering, including SIM remove/insert
Bug:
32163131
Change-Id: I6aac9a8f34cfd0079a4433471ec08b9b1ec0d754
OSDN Git Service
