OSDN Git Service
Erik Kline [Tue, 24 Jan 2017 08:11:51 +0000 (08:11 +0000)]
Merge "All upstream mobile connection management is now in UpstreamNetworkMonitor" am:
c1987487a2 am:
555812a3e2
am:
65e01ec4ed
Change-Id: Idfe2c34bad70e0044d7281ba9b9aaaf26f7e2fb5
Erik Kline [Tue, 24 Jan 2017 08:05:25 +0000 (08:05 +0000)]
Merge "All upstream mobile connection management is now in UpstreamNetworkMonitor" am:
c1987487a2
am:
555812a3e2
Change-Id: Icac0e50bae970e7aaa9eecc3d7be3c19b2111a78
Erik Kline [Tue, 24 Jan 2017 08:00:48 +0000 (08:00 +0000)]
Merge "All upstream mobile connection management is now in UpstreamNetworkMonitor"
am:
c1987487a2
Change-Id: I2b7e0f63c8198c8fde52396f989c16d795e612a8
Treehugger Robot [Tue, 24 Jan 2017 07:54:20 +0000 (07:54 +0000)]
Merge "All upstream mobile connection management is now in UpstreamNetworkMonitor"
Hugo Benichi [Fri, 4 Nov 2016 07:06:34 +0000 (16:06 +0900)]
DO NOT MERGE frameworks-test: adding missing @SmallTest
This activates all frameworks-test tests in runs of the continuous
platform tests.
Test: $ runtest frameworks-net passes (expect Tether
Bug:
32561414
(cherry picked from commit
fa8a6f6220d1a0027ba7969c2d3f72690ddc6495)
Change-Id: I84f9aecfbf9ebe07c6fcfec26acb2c2cfaae2d60
Erik Kline [Mon, 23 Jan 2017 07:42:01 +0000 (16:42 +0900)]
All upstream mobile connection management is now in UpstreamNetworkMonitor
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Change-Id: Ifbd430d5bf2d2191469c9810ad8f073506abde46
Chen Xu [Tue, 24 Jan 2017 02:48:00 +0000 (02:48 +0000)]
Merge "support suw and post-suw cases for default app" am:
9fc8d99c76 am:
ea55399ecc
am:
f2a5e432b0
Change-Id: Ica33178ed47d877d6ab723a42dce032456e15201
Chen Xu [Tue, 24 Jan 2017 02:43:28 +0000 (02:43 +0000)]
Merge "support suw and post-suw cases for default app" am:
9fc8d99c76
am:
ea55399ecc
Change-Id: I1b3a5c7aed8a2930ed98c81b1c2c391769d87fe5
Chen Xu [Tue, 24 Jan 2017 02:39:55 +0000 (02:39 +0000)]
Merge "support suw and post-suw cases for default app"
am:
9fc8d99c76
Change-Id: I7a451bf2cfdfd6db65208a46db9d664039297ace
Chen Xu [Tue, 24 Jan 2017 02:30:58 +0000 (02:30 +0000)]
Merge "support suw and post-suw cases for default app"
Android Build Merger (Role) [Tue, 24 Jan 2017 02:20:07 +0000 (02:20 +0000)]
Merge "Change HFP Client API to support multi device am:
c8399321e9" into nyc-mr2-dev-plus-aosp
Sanket Agarwal [Tue, 24 Jan 2017 02:18:54 +0000 (02:18 +0000)]
Change HFP Client API to support multi device
am:
c8399321e9
Change-Id: I96dd85f1bee2f39f683d6ee11b5ab4e8b9a7f217
Ta-wei Yen [Tue, 24 Jan 2017 02:18:30 +0000 (02:18 +0000)]
Merge "Fix typo in the IS_OMPT_VOICEMAIL field." into nyc-mr2-dev
am:
70f920fa0c
Change-Id: If2936ae00b37750362a56975ba7c42a6c30984aa
Ta-wei Yen [Tue, 24 Jan 2017 02:18:26 +0000 (02:18 +0000)]
Fix typo in the IS_OMPT_VOICEMAIL field.
am:
57365441d4
Change-Id: I060ed862bd929875848753d77e6fc3ff8a48e32c
fionaxu [Mon, 23 Jan 2017 06:43:41 +0000 (22:43 -0800)]
support suw and post-suw cases for default app
- our default carrier actions might not compatible with suw since data might be disabled
without surfacing users with an option to activate inside SuW.
- instead, skip carrier actions during setupwizard and schedule a job to resume carrier actions if needed when exit suw.
- use jobscheduler to monitor provision bit instead of keep the app running and listen for content change asynchronously.
Bug:
30958215
Test: Manual
Change-Id: Ie4004b46405b914158f585059d332f4e694053f3
Sanket Agarwal [Fri, 20 Jan 2017 22:55:15 +0000 (14:55 -0800)]
Change HFP Client API to support multi device
- Adds BluetoothDevice as a parameter where required
- Gets rid of device management APIs that can be done via
BluetoothProfiles instead
Test: Manual sanity tests
Bug: b/
33554547
Bug: b/
30984220
Change-Id: I3485ac5bfe1fcb29c774ad040fdd608e1cacb8df
(cherry picked from commit
039eeb81b5ceb5a7141ae852346e054348ac2a06)
Ta-wei Yen [Mon, 23 Jan 2017 22:40:36 +0000 (22:40 +0000)]
Merge "Fix typo in the IS_OMPT_VOICEMAIL field." into nyc-mr2-dev
Jeremy Joslin [Mon, 23 Jan 2017 21:42:00 +0000 (21:42 +0000)]
Merge "Mark the INetworkScoreCache as oneway." am:
edadb3efc3 am:
4fcc44dc9a
am:
ea65f9d392
Change-Id: I54af428743c036da20a0adbaa38d00ca348364fc
Nancy Zheng [Mon, 23 Jan 2017 21:38:43 +0000 (21:38 +0000)]
Merge "Query for the settings package in KeyguardManager instead of hardcoding it." into cw-f-dev am:
8ac1bff7e2
am:
20d79203be
Change-Id: I35ff614a3c37736913f4731f978802c2f0fb12ae
Nancy Zheng [Mon, 23 Jan 2017 21:37:38 +0000 (21:37 +0000)]
Query for the settings package in KeyguardManager instead of hardcoding it. am:
e256a18dcd
am:
11bdbd1145
Change-Id: I946ee02b4d1b5b1286754b2cf233237cbd3b0f31
Nancy Zheng [Mon, 23 Jan 2017 21:35:41 +0000 (21:35 +0000)]
Merge "Query for the settings package in KeyguardManager instead of hardcoding it." into cw-f-dev am:
8ac1bff7e2
am:
d0c5f0047f
Change-Id: I96db2a0bf55871df53f6f7220bac2cdd262cee4b
Jeremy Joslin [Mon, 23 Jan 2017 21:35:27 +0000 (21:35 +0000)]
Merge "Mark the INetworkScoreCache as oneway." am:
edadb3efc3
am:
4fcc44dc9a
Change-Id: I4d2dc6446f347643f654799094ac7f6fb7529438
Nancy Zheng [Mon, 23 Jan 2017 21:34:45 +0000 (21:34 +0000)]
Query for the settings package in KeyguardManager instead of hardcoding it. am:
e256a18dcd
am:
ed92230c38
Change-Id: I41ef0f14cbd3f7e19e6fde0cdf636619683704a2
Nancy Zheng [Mon, 23 Jan 2017 21:32:28 +0000 (21:32 +0000)]
Merge "Query for the settings package in KeyguardManager instead of hardcoding it." into cw-f-dev
am:
8ac1bff7e2
Change-Id: I2e4f9b4ea73ff5d0491b8cfda889a57aaac413ff
Nancy Zheng [Mon, 23 Jan 2017 21:32:26 +0000 (21:32 +0000)]
Query for the settings package in KeyguardManager instead of hardcoding it.
am:
e256a18dcd
Change-Id: I3eb7f475c44f815ad2f0e8e1f85c39e555774fcc
Jeremy Joslin [Mon, 23 Jan 2017 21:31:21 +0000 (21:31 +0000)]
Merge "Mark the INetworkScoreCache as oneway."
am:
edadb3efc3
Change-Id: I3b71e154f49b354ead2bf734da4a94e332f87a33
Nancy Zheng [Mon, 23 Jan 2017 21:23:49 +0000 (21:23 +0000)]
Merge "Query for the settings package in KeyguardManager instead of hardcoding it." into cw-f-dev
am:
8ac1bff7e2
Change-Id: Ia6a1596958bb151ec58e869587bc2201ba0ebc4f
Nancy Zheng [Mon, 23 Jan 2017 21:23:40 +0000 (21:23 +0000)]
Query for the settings package in KeyguardManager instead of hardcoding it.
am:
e256a18dcd
Change-Id: I9e83ca9e1cab882fc0f508ba6c538e08b4fa7499
Treehugger Robot [Mon, 23 Jan 2017 21:22:10 +0000 (21:22 +0000)]
Merge "Mark the INetworkScoreCache as oneway."
Nancy Zheng [Mon, 23 Jan 2017 21:17:15 +0000 (21:17 +0000)]
Merge "Query for the settings package in KeyguardManager instead of hardcoding it." into cw-f-dev
Ta-wei Yen [Mon, 23 Jan 2017 20:50:35 +0000 (12:50 -0800)]
Fix typo in the IS_OMPT_VOICEMAIL field.
This cause the voicemail content provider to crash on query.
Bug:
34610526
Change-Id: I561ae6616fe66ea49630fa6c4eb9280fdc24b153
Fixes:
34610526
Test: VoicemailContentProviderTest
Brad Ebinger [Mon, 23 Jan 2017 19:38:42 +0000 (19:38 +0000)]
Merge "Deprecate old TelecomManager actions" am:
d1ab15a1af am:
ee9a9babb1
am:
50315f010c
Change-Id: I89621d6f584ee743b67838a11fde212d2030900c
Brad Ebinger [Mon, 23 Jan 2017 19:31:18 +0000 (19:31 +0000)]
Merge "Deprecate old TelecomManager actions" am:
d1ab15a1af
am:
ee9a9babb1
Change-Id: Ib24d46d70b10cd8bb6ac39fd4dc915ac9a19a3ba
Brad Ebinger [Mon, 23 Jan 2017 19:23:35 +0000 (19:23 +0000)]
Merge "Deprecate old TelecomManager actions"
am:
d1ab15a1af
Change-Id: Id76db43d6cc4477a328698e049558ef936a4fe1d
Brad Ebinger [Mon, 23 Jan 2017 19:09:11 +0000 (19:09 +0000)]
Merge "Deprecate old TelecomManager actions"
Jeremy Joslin [Mon, 23 Jan 2017 18:51:41 +0000 (10:51 -0800)]
Mark the INetworkScoreCache as oneway.
Test: built & run
Bug:
34522097
Change-Id: I7d2075febe6c3cdc24b56df255f8ba59e13322bf
thecrazyskull [Mon, 23 Jan 2017 17:55:03 +0000 (17:55 +0000)]
Merge "LocalDisplayAdapter: don't crash when no color modes available" am:
24218db904 am:
f15075c9f8
am:
d0fff5284f
Change-Id: I319f88d1d88ff9e4b8507224ca7209eb7631dc99
thecrazyskull [Mon, 23 Jan 2017 17:42:04 +0000 (17:42 +0000)]
Merge "LocalDisplayAdapter: don't crash when no color modes available" am:
24218db904
am:
f15075c9f8
Change-Id: Idcccd811808be32b492d8e2cb753439fc4d9de46
thecrazyskull [Mon, 23 Jan 2017 17:35:11 +0000 (17:35 +0000)]
Merge "LocalDisplayAdapter: don't crash when no color modes available"
am:
24218db904
Change-Id: I89d080a00fb87c73c2af1604f617706f0f60f32b
Treehugger Robot [Mon, 23 Jan 2017 17:25:10 +0000 (17:25 +0000)]
Merge "LocalDisplayAdapter: don't crash when no color modes available"
Polina Bondarenko [Mon, 23 Jan 2017 17:20:58 +0000 (17:20 +0000)]
Merge "Make TelephonyManager#get/setAllowedCarriers system api" am:
6d064d8780 am:
cf176500e6
am:
b46a93ff04
Change-Id: I8f17bef7ccde5953f5b810bd806fc51a4c69e194
Polina Bondarenko [Mon, 23 Jan 2017 17:14:35 +0000 (17:14 +0000)]
Merge "Make TelephonyManager#get/setAllowedCarriers system api" am:
6d064d8780
am:
cf176500e6
Change-Id: Ic278e3a9bd7c9c99345150228c6e87343737079e
Polina Bondarenko [Mon, 23 Jan 2017 17:10:05 +0000 (17:10 +0000)]
Merge "Make TelephonyManager#get/setAllowedCarriers system api"
am:
6d064d8780
Change-Id: I8f9b1c8e9ce1fda6cd03cd0dd459ead8837bd90d
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
Treehugger Robot [Mon, 23 Jan 2017 17:01:24 +0000 (17:01 +0000)]
Merge "Make TelephonyManager#get/setAllowedCarriers system api"
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"
thecrazyskull [Sun, 18 Dec 2016 17:48:20 +0000 (12:48 -0500)]
LocalDisplayAdapter: don't crash when no color modes available
Test: none
Change-Id: Ic11b5b66864fdd97b290722cba534b2aa38ac054
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
OSDN Git Service
