OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "hotspot2: add support for complete PerProviderSubscription/Credential subtree...
Peter Qiu [Wed, 25 Jan 2017 03:21:49 +0000 (03:21 +0000)]
Merge "hotspot2: add support for complete PerProviderSubscription/Credential subtree" am: 123aa5d8b1
am: 55d23d0829

Change-Id: Ia7d1beb9a1ebd55a72c403f9ed159f55b491b10b

7 years agoMerge "hotspot2: add support for complete PerProviderSubscription/Credential subtree"
Peter Qiu [Wed, 25 Jan 2017 03:17:19 +0000 (03:17 +0000)]
Merge "hotspot2: add support for complete PerProviderSubscription/Credential subtree"
am: 123aa5d8b1

Change-Id: If8164839812728361fcd3d9b2f37c481ccf9b33c

7 years agoMerge "hotspot2: add support for complete PerProviderSubscription/Credential subtree"
Treehugger Robot [Wed, 25 Jan 2017 03:09:08 +0000 (03:09 +0000)]
Merge "hotspot2: add support for complete PerProviderSubscription/Credential subtree"

7 years agoMerge "hotspot2: add support for complete HomeSP subtree" am: 28c7afe578
Peter Qiu [Wed, 25 Jan 2017 02:15:44 +0000 (02:15 +0000)]
Merge "hotspot2: add support for complete HomeSP subtree" am: 28c7afe578
am: 6570ce6c80

Change-Id: I8c232cc7d246b28943d16c1f28121597dad8f215

7 years agoMerge "hotspot2: add support for complete HomeSP subtree"
Peter Qiu [Wed, 25 Jan 2017 02:11:10 +0000 (02:11 +0000)]
Merge "hotspot2: add support for complete HomeSP subtree"
am: 28c7afe578

Change-Id: If1b097fb5b9453d1e108534c1fb088dfc92b1b6e

7 years agoMerge "hotspot2: add support for complete HomeSP subtree"
Treehugger Robot [Wed, 25 Jan 2017 02:02:58 +0000 (02:02 +0000)]
Merge "hotspot2: add support for complete HomeSP subtree"

7 years agohotspot2: add support for complete PerProviderSubscription/Credential subtree
Peter Qiu [Wed, 11 Jan 2017 21:39:35 +0000 (13:39 -0800)]
hotspot2: add support for complete PerProviderSubscription/Credential subtree

Added missing fields in Credential subtree for supporting Release 2
and added parsing support for the new fields.

Bug: 34198926
Test: frameworks/base/wifi/test/runtests.sh
Change-Id: Ic3665c963ab77ddc4b9a03262517a3c7a4ec3ffc

7 years agohotspot2: add support for complete HomeSP subtree
Peter Qiu [Wed, 11 Jan 2017 19:01:02 +0000 (11:01 -0800)]
hotspot2: add support for complete HomeSP subtree

Added missing fields in HomeSP subtree for supporting Release 2
and added parsing support for the new fields.

Bug: 34198926
Test: frameworks/base/wifi/test/runtests.sh
Change-Id: Id2766b6b48be8bd97b56eb7c57a0e8527f38e06c

7 years agoMerge "unbindBackupAgent and initialize inFullBackup" am: 36654ffef5
Chris Tate [Tue, 24 Jan 2017 23:42:33 +0000 (23:42 +0000)]
Merge "unbindBackupAgent and initialize inFullBackup" am: 36654ffef5
am: 3a13bb43f6

Change-Id: I44fcb1ff849d39ff528adb85f8d76563eb9b9d52

7 years agoMerge "unbindBackupAgent and initialize inFullBackup"
Chris Tate [Tue, 24 Jan 2017 23:38:12 +0000 (23:38 +0000)]
Merge "unbindBackupAgent and initialize inFullBackup"
am: 36654ffef5

Change-Id: I5ba75075e2fb2dae0dcabbb0cee3b83c3d0c15ea

7 years agoMerge "unbindBackupAgent and initialize inFullBackup"
Chris Tate [Tue, 24 Jan 2017 23:31:34 +0000 (23:31 +0000)]
Merge "unbindBackupAgent and initialize inFullBackup"

7 years agoMerge "Vodafone SIMs should treat Spain as roaming" am: a9c27b348c
Torbjorn Eklund [Tue, 24 Jan 2017 22:52:59 +0000 (22:52 +0000)]
Merge "Vodafone SIMs should treat Spain as roaming" am: a9c27b348c
am: 8e9cf51db3

Change-Id: I7fbc47d01539202c4a9d022dc6609bc88e1d4621

7 years agoMerge "Vodafone SIMs should treat Spain as roaming"
Torbjorn Eklund [Tue, 24 Jan 2017 22:49:27 +0000 (22:49 +0000)]
Merge "Vodafone SIMs should treat Spain as roaming"
am: a9c27b348c

Change-Id: Ia57e460220a5f8e53f47f2454f5c1a005830a3e6

7 years agoMerge "Vodafone SIMs should treat Spain as roaming"
Treehugger Robot [Tue, 24 Jan 2017 22:43:31 +0000 (22:43 +0000)]
Merge "Vodafone SIMs should treat Spain as roaming"

7 years agoMerge "Change HFP Client API to support multi device" am: 01f2e67648
Sanket Agarwal [Tue, 24 Jan 2017 19:11:21 +0000 (19:11 +0000)]
Merge "Change HFP Client API to support multi device" am: 01f2e67648
am: aaa490025b

Change-Id: I2e5a77ba5efece7af1d4be91ca795cd97e96acf3

7 years agoMerge "Change HFP Client API to support multi device"
Sanket Agarwal [Tue, 24 Jan 2017 19:06:40 +0000 (19:06 +0000)]
Merge "Change HFP Client API to support multi device"
am: 01f2e67648

Change-Id: I887b83939581fe1fd4068f7a4a72a6910c994c74

7 years agoMerge "Change HFP Client API to support multi device"
Sanket Agarwal [Tue, 24 Jan 2017 19:01:13 +0000 (19:01 +0000)]
Merge "Change HFP Client API to support multi device"

7 years agoMerge "Prepare for removal of legacy-test from default targets (Part 2)" am: 5a3a3d298a
Paul Duffin [Tue, 24 Jan 2017 16:12:57 +0000 (16:12 +0000)]
Merge "Prepare for removal of legacy-test from default targets (Part 2)" am: 5a3a3d298a
am: a07f9d522b

Change-Id: I758123e58a78ac515fb4ed0ce8e1647cfd1a3dc8

7 years agoMerge "Prepare for removal of legacy-test from default targets (Part 2)"
Paul Duffin [Tue, 24 Jan 2017 16:08:26 +0000 (16:08 +0000)]
Merge "Prepare for removal of legacy-test from default targets (Part 2)"
am: 5a3a3d298a

Change-Id: I14fd4502454a98baf01f5ace83fe0c583005a52d

7 years agoMerge "Prepare for removal of legacy-test from default targets (Part 2)"
Paul Duffin [Tue, 24 Jan 2017 16:01:59 +0000 (16:01 +0000)]
Merge "Prepare for removal of legacy-test from default targets (Part 2)"

7 years agoPrepare for removal of legacy-test from default targets (Part 2)
Paul Duffin [Tue, 24 Jan 2017 14:28:20 +0000 (14:28 +0000)]
Prepare for removal of legacy-test from default targets (Part 2)

In preparation for removing junit classes from the Android API
the legacy-test target will be removed from the
TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit
dependencies on junit and/or legacy-android-test to ensure that
modules will compile properly once it is removed.

Bug: 30188076
Test: make checkbuild
Merged-In: If507b641624a2933e722f61e815890fcdf442265
Change-Id: Icdcad50f1cc32e900bc9e882f1db2867ea170fbf

7 years agoMerge "Expose more ICU4J APIs." am: e5f0221f06
Joachim Sauer [Tue, 24 Jan 2017 12:41:57 +0000 (12:41 +0000)]
Merge "Expose more ICU4J APIs." am: e5f0221f06
am: 5272231259

Change-Id: I2714668baf99fb18d726212917a32e8e98b734a2

7 years agoMerge "Expose more ICU4J APIs."
Joachim Sauer [Tue, 24 Jan 2017 12:35:30 +0000 (12:35 +0000)]
Merge "Expose more ICU4J APIs."
am: e5f0221f06

Change-Id: I77e300979bdfe781ad9ab7aff5241b92491e5660

7 years agoMerge "Expose more ICU4J APIs."
Joachim Sauer [Tue, 24 Jan 2017 12:30:11 +0000 (12:30 +0000)]
Merge "Expose more ICU4J APIs."

7 years agoMerge "All upstream mobile connection management is now in UpstreamNetworkMonitor...
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

7 years agoMerge "All upstream mobile connection management is now in UpstreamNetworkMonitor"
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

7 years agoMerge "All upstream mobile connection management is now in UpstreamNetworkMonitor"
Treehugger Robot [Tue, 24 Jan 2017 07:54:20 +0000 (07:54 +0000)]
Merge "All upstream mobile connection management is now in UpstreamNetworkMonitor"

7 years agoAll upstream mobile connection management is now in UpstreamNetworkMonitor
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

7 years agoMerge "support suw and post-suw cases for default app" am: 9fc8d99c76
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

7 years agoMerge "support suw and post-suw cases for default app"
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

7 years agoMerge "support suw and post-suw cases for default app"
Chen Xu [Tue, 24 Jan 2017 02:30:58 +0000 (02:30 +0000)]
Merge "support suw and post-suw cases for default app"

7 years agosupport suw and post-suw cases for default app
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

7 years agoChange HFP Client API to support multi device
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)

7 years agoMerge "Mark the INetworkScoreCache as oneway." am: edadb3efc3
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

7 years agoMerge "Mark the INetworkScoreCache as oneway."
Jeremy Joslin [Mon, 23 Jan 2017 21:31:21 +0000 (21:31 +0000)]
Merge "Mark the INetworkScoreCache as oneway."
am: edadb3efc3

Change-Id: I3b71e154f49b354ead2bf734da4a94e332f87a33

7 years agoMerge "Query for the settings package in KeyguardManager instead of hardcoding it...
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

7 years agoQuery for the settings package in KeyguardManager instead of hardcoding it.
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

7 years agoMerge "Mark the INetworkScoreCache as oneway."
Treehugger Robot [Mon, 23 Jan 2017 21:22:10 +0000 (21:22 +0000)]
Merge "Mark the INetworkScoreCache as oneway."

7 years agoMerge "Query for the settings package in KeyguardManager instead of hardcoding it...
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

7 years agoMerge "Deprecate old TelecomManager actions" am: d1ab15a1af
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

7 years agoMerge "Deprecate old TelecomManager actions"
Brad Ebinger [Mon, 23 Jan 2017 19:23:35 +0000 (19:23 +0000)]
Merge "Deprecate old TelecomManager actions"
am: d1ab15a1af

Change-Id: Id76db43d6cc4477a328698e049558ef936a4fe1d

7 years agoMerge "Deprecate old TelecomManager actions"
Brad Ebinger [Mon, 23 Jan 2017 19:09:11 +0000 (19:09 +0000)]
Merge "Deprecate old TelecomManager actions"

7 years agoMark the INetworkScoreCache as oneway.
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

7 years agoMerge "LocalDisplayAdapter: don't crash when no color modes available" am: 24218db904
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

7 years agoMerge "LocalDisplayAdapter: don't crash when no color modes available"
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

7 years agoMerge "LocalDisplayAdapter: don't crash when no color modes available"
Treehugger Robot [Mon, 23 Jan 2017 17:25:10 +0000 (17:25 +0000)]
Merge "LocalDisplayAdapter: don't crash when no color modes available"

7 years agoMerge "Make TelephonyManager#get/setAllowedCarriers system api" am: 6d064d8780
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

7 years agoMerge "Make TelephonyManager#get/setAllowedCarriers system api"
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

7 years agoMerge "Make TelephonyManager#get/setAllowedCarriers system api"
Treehugger Robot [Mon, 23 Jan 2017 17:01:24 +0000 (17:01 +0000)]
Merge "Make TelephonyManager#get/setAllowedCarriers system api"

7 years agoMerge "Disable always-on VPN in factoryReset" am: 63c14e0ab6
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

7 years agoMerge "Disable always-on VPN in factoryReset"
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

7 years agoMerge "Disable always-on VPN in factoryReset"
Robin Lee [Mon, 23 Jan 2017 16:40:05 +0000 (16:40 +0000)]
Merge "Disable always-on VPN in factoryReset"

7 years agoLocalDisplayAdapter: don't crash when no color modes available
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

7 years agoMerge "Move TetheringConfiguration out to its own file" am: 5a45170f95 -s ours
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

7 years agoMove TetheringConfiguration out to its own file
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

7 years agoMerge "Move TetheringConfiguration out to its own file"
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

7 years agoMove 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

7 years agoMerge "Add test for updateMobileRequiresDun()" am: 7f018500dc
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

7 years agoMerge "Move TetheringConfiguration out to its own file"
Erik Kline [Mon, 23 Jan 2017 10:56:35 +0000 (10:56 +0000)]
Merge "Move TetheringConfiguration out to its own file"

7 years agoMove 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

7 years agoMerge "Add test for updateMobileRequiresDun()"
Erik Kline [Mon, 23 Jan 2017 10:53:11 +0000 (10:53 +0000)]
Merge "Add test for updateMobileRequiresDun()"
am: 7f018500dc

Change-Id: Ic7b984105e2c245a992446e15d11dd19e4671a57

7 years agoMerge "Add test for updateMobileRequiresDun()"
Treehugger Robot [Mon, 23 Jan 2017 10:44:19 +0000 (10:44 +0000)]
Merge "Add test for updateMobileRequiresDun()"

7 years agoAdd 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

7 years agoMerge "More concisely export whether we have a "tetherable configuration"" am: 1b2a1b911d
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

7 years agoMerge "More concisely export whether we have a "tetherable configuration""
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

7 years agoMerge "More concisely export whether we have a "tetherable configuration""
Treehugger Robot [Mon, 23 Jan 2017 07:04:21 +0000 (07:04 +0000)]
Merge "More concisely export whether we have a "tetherable configuration""

7 years agoMore concisely export whether we have a "tetherable configuration"
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

7 years agoMerge "Add Setting for curating saved open networks." am: b3b665de22
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

7 years agoMerge "Add Setting for curating saved open networks."
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

7 years agoMerge "Add Setting for curating saved open networks."
Treehugger Robot [Sat, 21 Jan 2017 05:17:41 +0000 (05:17 +0000)]
Merge "Add Setting for curating saved open networks."

7 years agoMerge "Move several config elements into TetheringConfiguration class" am: 8d35276910
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

7 years agoMove several config elements into TetheringConfiguration class am: 3e7566572e
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

7 years agoMerge "Move several config elements into TetheringConfiguration class"
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

7 years agoMove several config elements into TetheringConfiguration class
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

7 years agoMerge "Address a few unittest comments." am: 9c3a298748
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

7 years agoMerge "Move several config elements into TetheringConfiguration class"
Erik Kline [Sat, 21 Jan 2017 04:49:10 +0000 (04:49 +0000)]
Merge "Move several config elements into TetheringConfiguration class"

7 years agoMerge "Address a few unittest comments."
Erik Kline [Sat, 21 Jan 2017 04:43:27 +0000 (04:43 +0000)]
Merge "Address a few unittest comments."
am: 9c3a298748

Change-Id: I2d41cdbe05653bcbed9d3b38b440c06b98006809

7 years agoMerge "Address a few unittest comments."
Erik Kline [Sat, 21 Jan 2017 04:36:27 +0000 (04:36 +0000)]
Merge "Address a few unittest comments."

7 years agoChange HFP Client API to support multi device
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)

7 years agoAdd Setting for curating saved open networks.
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

7 years agoMerge "Add additional fields to RecommendationRequest." am: b8f0e69ef0
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

7 years agoMerge "Add additional fields to RecommendationRequest."
Amin Shaikh [Fri, 20 Jan 2017 23:18:02 +0000 (23:18 +0000)]
Merge "Add additional fields to RecommendationRequest."
am: b8f0e69ef0

Change-Id: I9a50c8aca36cf740abbc62af6879b4e6ea736855

7 years agoMerge "SystemServer: reorder wifi services start" am: 10c514d9de
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

7 years agoMerge "Add additional fields to RecommendationRequest."
Treehugger Robot [Fri, 20 Jan 2017 23:04:54 +0000 (23:04 +0000)]
Merge "Add additional fields to RecommendationRequest."

7 years agoMerge "SystemServer: reorder wifi services start"
Rebecca Silberstein [Fri, 20 Jan 2017 23:00:13 +0000 (23:00 +0000)]
Merge "SystemServer: reorder wifi services start"
am: 10c514d9de

Change-Id: I3a918b707932084759701103c683fffed0e16cee

7 years agoMerge "Add Binder support for Parcelable exceptions." am: a2ef6b5741
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

7 years agoMerge "SystemServer: reorder wifi services start"
Rebecca Silberstein [Fri, 20 Jan 2017 22:51:35 +0000 (22:51 +0000)]
Merge "SystemServer: reorder wifi services start"

7 years agoMerge "Add Binder support for Parcelable exceptions."
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

7 years agoMerge "Add Binder support for Parcelable exceptions."
Jeff Sharkey [Fri, 20 Jan 2017 22:45:03 +0000 (22:45 +0000)]
Merge "Add Binder support for Parcelable exceptions."

7 years agoQuery for the settings package in KeyguardManager instead of
Nancy Zheng [Mon, 21 Nov 2016 23:46:08 +0000 (15:46 -0800)]
Query for the settings package in KeyguardManager instead of
hardcoding it.

Bug: 33047002
Change-Id: I57bfab4750540789937d50c72ec05bb7a4535ae1

7 years agoAdd additional fields to RecommendationRequest.
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

7 years agoExpose more ICU4J APIs.
Joachim Sauer [Wed, 18 Jan 2017 16:33:08 +0000 (16:33 +0000)]
Expose more ICU4J APIs.

Expose more classes/methods, mostly those added in ICU4J 57.

Additionally EthiopicCalendar is now un-hidden which was hidden
accidentally and should have been in N.

Bug: 30825380
Test: m checkapi
Change-Id: Ib3bea26a9b246401d33cc0ccc0f91768d1fe1286

7 years agoMerge "Refactor to SimChangeListener class" am: a12217012e
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

7 years agoAddress a few unittest comments.
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

7 years agoMerge "Refactor to SimChangeListener class"
Erik Kline [Fri, 20 Jan 2017 10:13:08 +0000 (10:13 +0000)]
Merge "Refactor to SimChangeListener class"
am: a12217012e

Change-Id: I863f0b23251a0ebd18a76cf08e1ff0f2cee9cda3

7 years agoMove several config elements into TetheringConfiguration class
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

7 years agoMerge "Address comments from previous change (320592)" am: e7cb6c3761
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

7 years agoMerge "Refactor to SimChangeListener class"
Treehugger Robot [Fri, 20 Jan 2017 10:05:50 +0000 (10:05 +0000)]
Merge "Refactor to SimChangeListener class"

7 years agoMerge "Address comments from previous change (320592)"
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

7 years agoMerge "Address comments from previous change (320592)"
Treehugger Robot [Fri, 20 Jan 2017 09:57:26 +0000 (09:57 +0000)]
Merge "Address comments from previous change (320592)"