OSDN Git Service
ltrochtova [Thu, 26 Jan 2017 09:53:23 +0000 (09:53 +0000)]
Merge "Don't offer the BT sharing option to the user if BT is disallowed." am:
2c1e396382
am:
c0118ac10e
Change-Id: I2aede50aba4c693f6bc45d2e53a0f4b7d8303c32
ltrochtova [Thu, 26 Jan 2017 09:48:23 +0000 (09:48 +0000)]
Merge "Don't offer the BT sharing option to the user if BT is disallowed."
am:
2c1e396382
Change-Id: I132bdd6aee36e32ddbcfdc8f38aed1e88424297e
ltrochtova [Thu, 26 Jan 2017 09:41:51 +0000 (09:41 +0000)]
Merge "Don't offer the BT sharing option to the user if BT is disallowed."
Elliot Waite [Thu, 26 Jan 2017 04:40:54 +0000 (04:40 +0000)]
Merge "Fix @links in reference docs." into nyc-mr1-dev am:
3366d4beb4
am:
6cc3802e50
Change-Id: I9b581b9a8be3d5d10abfbbc5770301fe67f94f78
Elliot Waite [Thu, 26 Jan 2017 04:39:57 +0000 (04:39 +0000)]
Fix @links in reference docs. am:
54de77470d
am:
ab978c035e
Change-Id: If0d0613362e0ea95cf48eaf9a16d3eea48b589ea
Elliot Waite [Thu, 26 Jan 2017 04:35:00 +0000 (04:35 +0000)]
Merge "Fix @links in reference docs." into nyc-mr1-dev
am:
3366d4beb4
Change-Id: I90aa2e4ca0553d5816024486015514b3e5d7bc86
Pavlin Radoslavov [Thu, 26 Jan 2017 04:34:57 +0000 (04:34 +0000)]
Merge "Fix wording ambiguity for Bluetooth LDAC Playback Quality selection" am:
0645c21163
am:
b3f1eaa504
Change-Id: Ie1f0e958b93bfb898a7fdbe3ed8f732190a3e7ac
Elliot Waite [Thu, 26 Jan 2017 04:34:57 +0000 (04:34 +0000)]
Fix @links in reference docs.
am:
54de77470d
Change-Id: Id38c30bad13d6b61ed504a06471b9f197b360f7b
Pavlin Radoslavov [Thu, 26 Jan 2017 04:29:57 +0000 (04:29 +0000)]
Merge "Fix wording ambiguity for Bluetooth LDAC Playback Quality selection"
am:
0645c21163
Change-Id: I66a7a5f8dc423c7999b4e0a39a272a837e66c847
Elliot Waite [Thu, 26 Jan 2017 04:29:43 +0000 (04:29 +0000)]
Merge "Fix @links in reference docs." into nyc-mr1-dev
Treehugger Robot [Thu, 26 Jan 2017 04:23:42 +0000 (04:23 +0000)]
Merge "Fix wording ambiguity for Bluetooth LDAC Playback Quality selection"
Brad Ebinger [Thu, 26 Jan 2017 01:46:06 +0000 (01:46 +0000)]
Merge "Adding Dynamic ImsService Binding (1/3)" am:
8e6b13a1c0
am:
64057ab972
Change-Id: I901c72a38b522c190e849de55078036adc80d8b6
Brad Ebinger [Thu, 26 Jan 2017 01:41:38 +0000 (01:41 +0000)]
Merge "Adding Dynamic ImsService Binding (1/3)"
am:
8e6b13a1c0
Change-Id: I8534273da5579b7662e66f80a60348a4665dd65b
Treehugger Robot [Thu, 26 Jan 2017 01:34:04 +0000 (01:34 +0000)]
Merge "Adding Dynamic ImsService Binding (1/3)"
Elliot Waite [Wed, 11 Jan 2017 23:30:35 +0000 (15:30 -0800)]
Fix @links in reference docs.
Change-Id: I40cea46efd80c448640ff69753698fe8404da40b
Brad Ebinger [Mon, 23 Jan 2017 23:17:50 +0000 (15:17 -0800)]
Adding Dynamic ImsService Binding (1/3)
Adds support for dynamic ImsService Binding (change 1/3). Included
in this change:
- AIDLs for ImsServiceController
- ImsFeature/ImsServiceBase definitions
- KEY_CONFIG_IMS_PACKAGE_OVERRIDE CarrierConfig option
Test: Unit Tests in opt/telephony
Bug:
30290416
Change-Id: Ic4cb1d85a29681b08a6a525c588a72209862dcc3
Pavlin Radoslavov [Wed, 25 Jan 2017 22:00:02 +0000 (14:00 -0800)]
Fix wording ambiguity for Bluetooth LDAC Playback Quality selection
"Optimize for" -> "Optimized for"
Bug:
34687041
Test: UI Visual inspection
Change-Id: I112ed6451465750978181e6ee35f96fd76969e9c
Josh Gao [Wed, 25 Jan 2017 21:25:23 +0000 (21:25 +0000)]
Merge "zygote: don't drop CAP_SYS_PTRACE from the bounding set." am:
273b886c49
am:
e801810553
Change-Id: I636c0f021c6ffae4518d889b1e7c4c3c29c6e864
Josh Gao [Wed, 25 Jan 2017 21:21:29 +0000 (21:21 +0000)]
Merge "zygote: don't drop CAP_SYS_PTRACE from the bounding set."
am:
273b886c49
Change-Id: I82c58cd03c8db78a1733ba5070d314607475cee7
Josh Gao [Wed, 25 Jan 2017 21:16:57 +0000 (21:16 +0000)]
Merge "zygote: don't drop CAP_SYS_PTRACE from the bounding set."
George Burgess IV [Wed, 25 Jan 2017 20:14:00 +0000 (20:14 +0000)]
Merge "Fix a use-of-uninitialized-value warning." am:
500cf67206
am:
f77f2cb3e7
Change-Id: I44e23c5689b51ae002a8db71a537ab97d3f31121
George Burgess IV [Wed, 25 Jan 2017 20:09:26 +0000 (20:09 +0000)]
Merge "Fix a use-of-uninitialized-value warning."
am:
500cf67206
Change-Id: I8b171a90696e09c42a1506255bc4c0056f69f35c
Josh Gao [Wed, 25 Jan 2017 19:45:58 +0000 (11:45 -0800)]
zygote: don't drop CAP_SYS_PTRACE from the bounding set.
crash_dump needs to acquire CAP_SYS_PTRACE to be able to ptrace
processes with capabilities. selinux should hopefully be sufficient for
restricting ptrace to processes that should do it.
Bug: http://b/
34694637
Test: debuggerd `pidof system_server`
Change-Id: If46f0b9baa54529780f7767f309f76b102a42ab4
Ruchi Kandoi [Wed, 25 Jan 2017 20:03:00 +0000 (20:03 +0000)]
Merge "nfc: Make NDEF validation stricter" am:
f3a6269fed
am:
e6cb2aa614
Change-Id: Ib069a18f16850d419b6c10c3b80e80115d9d8fc8
Treehugger Robot [Wed, 25 Jan 2017 20:01:33 +0000 (20:01 +0000)]
Merge "Fix a use-of-uninitialized-value warning."
Ruchi Kandoi [Wed, 25 Jan 2017 19:59:16 +0000 (19:59 +0000)]
Merge "nfc: Make NDEF validation stricter"
am:
f3a6269fed
Change-Id: If69e586c81e5926c0795af3689de67b260891eaa
Treehugger Robot [Wed, 25 Jan 2017 19:53:59 +0000 (19:53 +0000)]
Merge "nfc: Make NDEF validation stricter"
Lenka Trochtova [Tue, 17 Jan 2017 09:35:49 +0000 (10:35 +0100)]
Don't offer the BT sharing option to the user if BT is disallowed.
Disable BluetoothOppLauncherActivity component if the
UserManager#BLUETOOTH_DISALLOWED user restriction is set.
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test
com.android.cts.devicepolicy.DeviceOwnerTest#testBluetoothRestriction
Bug:
32895060
Bug:
34239380
Change-Id: I3467c82881896f276f542583bb50807b5e27276b
Ruchi Kandoi [Wed, 25 Jan 2017 02:32:01 +0000 (18:32 -0800)]
nfc: Make NDEF validation stricter
- Check if the MB is not set for any record apart from the first one.
- If the record is chunked, first record must contain the type
Bug:
20722275
Test: Manual; write raw NDEF messages to a tag
Change-Id: I3e73fc5163bbcd8a1f23417e98f57b665f4f1fad
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
Andre Eisenbach [Wed, 25 Jan 2017 18:19:51 +0000 (18:19 +0000)]
Merge "Bluetooth: fix indentation, formatting in dumpsys" am:
35c715332f
am:
36ce9b7ea0
Change-Id: I3381764156fadf755d679b9a3c9356fc90e50fd2
Andre Eisenbach [Wed, 25 Jan 2017 18:16:27 +0000 (18:16 +0000)]
Merge "Bluetooth: fix indentation, formatting in dumpsys"
am:
35c715332f
Change-Id: I7c603ab9f50921afb45e3d7181541260d8939089
Andre Eisenbach [Wed, 25 Jan 2017 18:05:10 +0000 (18:05 +0000)]
Merge "Bluetooth: fix indentation, formatting in dumpsys"
Marie Janssen [Wed, 18 Jan 2017 17:37:52 +0000 (09:37 -0800)]
Bluetooth: fix indentation, formatting in dumpsys
Before
======
Enable log:
01-17 09:43:18 Enabled by com.android.systemui
01-18 07:13:10 Disabled by com.andorid.systemui
1 BLE Apps registered:
com.google.android.gms
After
=====
Enable log:
02-06 07:49:07 Enabled by system boot
02-06 07:49:35 Disabled by com.andorid.systemui
1 BLE App registered:
com.google.android.gms
Test: run bugreport, see differences in dumpsys
Change-Id: I6086f7f97c1fcbdb860d70d9516fd5bf630a9f5e
Tobias Thierer [Wed, 25 Jan 2017 11:40:33 +0000 (11:40 +0000)]
Merge "API: Update Collections to OpenJDK8u60" am:
815fb54798
am:
b8557c431d
Change-Id: I074661952d4d8b67cdba3038f564d29329469bab
Tobias Thierer [Wed, 25 Jan 2017 11:35:11 +0000 (11:35 +0000)]
Merge "API: Update Collections to OpenJDK8u60"
am:
815fb54798
Change-Id: I97f0155ed743c7bc674f0241b2b07955e8d68e56
Tobias Thierer [Wed, 25 Jan 2017 11:29:42 +0000 (11:29 +0000)]
Merge "API: Update Collections to OpenJDK8u60"
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
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
Treehugger Robot [Wed, 25 Jan 2017 03:09:08 +0000 (03:09 +0000)]
Merge "hotspot2: add support for complete PerProviderSubscription/Credential subtree"
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
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
Treehugger Robot [Wed, 25 Jan 2017 02:02:58 +0000 (02:02 +0000)]
Merge "hotspot2: add support for complete HomeSP 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
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
George Burgess IV [Tue, 24 Jan 2017 23:48:28 +0000 (15:48 -0800)]
Fix a use-of-uninitialized-value warning.
Caught by clang's static analyzer:
frameworks/base/core/jni/android_hardware_SoundTrigger.cpp:660:20:
warning: Assigned value is garbage or undefined
nHandle[0] = (jint)handle;
Given that we return an error code anyway, we can just set it to 0 and
move on.
Bug: None
Test: Still builds; static analyzer doesn't complain.
Change-Id: I9a5be562a0d96fd6c48bb98eca0867fc754bba63
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
Chris Tate [Tue, 24 Jan 2017 23:38:12 +0000 (23:38 +0000)]
Merge "unbindBackupAgent and initialize inFullBackup"
am:
36654ffef5
Change-Id: I5ba75075e2fb2dae0dcabbb0cee3b83c3d0c15ea
Chris Tate [Tue, 24 Jan 2017 23:31:34 +0000 (23:31 +0000)]
Merge "unbindBackupAgent and initialize inFullBackup"
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
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
Treehugger Robot [Tue, 24 Jan 2017 22:43:31 +0000 (22:43 +0000)]
Merge "Vodafone SIMs should treat Spain as roaming"
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
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
Sanket Agarwal [Tue, 24 Jan 2017 19:01:13 +0000 (19:01 +0000)]
Merge "Change HFP Client API to support multi device"
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
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
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)"
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
Tobias Thierer [Fri, 2 Sep 2016 14:04:54 +0000 (15:04 +0100)]
API: Update Collections to OpenJDK8u60
Bug:
29935305
Bug:
31896176
Test: make update-api
Change-Id: I94f0f8c6915fdc1c8151b816d0a988a07629e984
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
Joachim Sauer [Tue, 24 Jan 2017 12:35:30 +0000 (12:35 +0000)]
Merge "Expose more ICU4J APIs."
am:
e5f0221f06
Change-Id: I77e300979bdfe781ad9ab7aff5241b92491e5660
Joachim Sauer [Tue, 24 Jan 2017 12:30:11 +0000 (12:30 +0000)]
Merge "Expose more ICU4J APIs."
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"
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: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"
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)
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
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
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: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: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
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 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
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()"