Torbjorn Eklund
95451d5390
Merge "SFR sims should treat Spain as roaming" am: 06aed6950d am: e5f8e6088e
...
am: 2cf376459b
2017-01-30 20:18:23 +00:00
Torbjorn Eklund
2cf376459b
Merge "SFR sims should treat Spain as roaming" am: 06aed6950d
...
am: e5f8e6088e
2017-01-30 20:14:52 +00:00
Torbjorn Eklund
e5f8e6088e
Merge "SFR sims should treat Spain as roaming"
...
am: 06aed6950d
2017-01-30 20:10:23 +00:00
Treehugger Robot
06aed6950d
Merge "SFR sims should treat Spain as roaming"
2017-01-30 20:03:13 +00:00
Robert Greenwalt
98a5a760a0
Merge "SFR sims should treat Spain as roaming" into nyc-mr2-dev
...
am: 66d545bfe9
2017-01-30 18:19:55 +00:00
Torbjorn Eklund
c911358efd
SFR sims should treat Spain as roaming
...
am: 05bd58fc4f
2017-01-30 18:19:48 +00:00
Robert Greenwalt
66d545bfe9
Merge "SFR sims should treat Spain as roaming" into nyc-mr2-dev
2017-01-30 18:14:24 +00:00
Marie Janssen
9eb3d7e335
Merge "Bluetooth: add getDiscoveryEndMillis() call" am: 1785fc4eea am: 7f8d8638eb
...
am: ca312c1cd3
2017-01-30 18:01:51 +00:00
Marie Janssen
ca312c1cd3
Merge "Bluetooth: add getDiscoveryEndMillis() call" am: 1785fc4eea
...
am: 7f8d8638eb
2017-01-30 17:57:02 +00:00
Marie Janssen
7f8d8638eb
Merge "Bluetooth: add getDiscoveryEndMillis() call"
...
am: 1785fc4eea
2017-01-30 17:51:37 +00:00
Marie Janssen
1785fc4eea
Merge "Bluetooth: add getDiscoveryEndMillis() call"
2017-01-30 17:46:18 +00:00
Makoto Onuki
bbdd744c21
Merge "Do not call RecoverySystem with DPMS lock held" into nyc-mr2-dev
...
am: 85ecba4423
2017-01-30 17:23:21 +00:00
Makoto Onuki
363677863b
Do not call RecoverySystem with DPMS lock held
...
am: efdec8f568
2017-01-30 17:23:14 +00:00
Makoto Onuki
85ecba4423
Merge "Do not call RecoverySystem with DPMS lock held" into nyc-mr2-dev
2017-01-30 17:18:03 +00:00
Torbjorn Eklund
05bd58fc4f
SFR sims should treat Spain as roaming
...
Since there are unnecessary "config_operatorConsideredNonRoaming" values
in the following file, UE mistakenly recognizes all Spain network as
non-roaming when SFR sim is inserted. Fix the issue by removing the
values.
- core/res/res/values-mcc208-mnc10/config.xml
Bug: 34369673
Bug: 33902721
Change-Id: I7353e260ec7d3d298346a48c74b7b71bb75b14de
2017-01-30 08:23:16 -08:00
Nicolas Geoffray
96ea5ccef6
Merge "Introduce DEBUG_JAVA_DEBUGGABLE." am: 4df43ad959 am: 27ffe754a4
...
am: 1852c380e0
2017-01-30 15:26:29 +00:00
Nicolas Geoffray
1852c380e0
Merge "Introduce DEBUG_JAVA_DEBUGGABLE." am: 4df43ad959
...
am: 27ffe754a4
2017-01-30 15:21:17 +00:00
Nicolas Geoffray
27ffe754a4
Merge "Introduce DEBUG_JAVA_DEBUGGABLE."
...
am: 4df43ad959
2017-01-30 15:15:10 +00:00
Nicolas Geoffray
4df43ad959
Merge "Introduce DEBUG_JAVA_DEBUGGABLE."
2017-01-30 15:09:45 +00:00
Thecrazyskull
8734438320
Merge "KeySetManagerService: prevent NPE" am: c66327149a am: 51ad0f67d2
...
am: 7adb348796
2017-01-29 17:30:47 +00:00
Thecrazyskull
7adb348796
Merge "KeySetManagerService: prevent NPE" am: c66327149a
...
am: 51ad0f67d2
2017-01-29 17:26:47 +00:00
Thecrazyskull
51ad0f67d2
Merge "KeySetManagerService: prevent NPE"
...
am: c66327149a
2017-01-29 17:22:13 +00:00
Treehugger Robot
c66327149a
Merge "KeySetManagerService: prevent NPE"
2017-01-29 17:14:40 +00:00
Marie Janssen
23a4833157
Bluetooth: add getDiscoveryEndMillis() call
...
Method to tell when the adapter finished (or will finish) being in
discovery mode.
Test: compiles and still can scan
Bug: 34395439
Change-Id: I41b48c2b934c0a1d5e1727cec08f3f762e3cb309
2017-01-27 18:48:11 -08:00
Paul Stewart
1a05097d04
Merge changes from topic 'enterprise-client-chain' am: c71b5dab72 am: fc5430a39c
...
am: a377b026f6
2017-01-28 02:06:10 +00:00
Paul Stewart
96c87f7a9b
Test passing null cert/keys to WifiEnterpriseConfig am: 88b3c589ad am: cb79016b16
...
am: 3bac61ac86
2017-01-28 02:01:40 +00:00
Paul Stewart
b35b219516
Account for null client certificate am: 1ca57a1d10 am: 4ad314b463
...
am: 25eff7731a
2017-01-28 02:00:50 +00:00
Paul Stewart
9c9d4f6f6d
Add a client chain to WifiEnterpriseConfig am: 291ddaef78 am: cd463ff269
...
am: 80b5793645
2017-01-28 01:59:40 +00:00
Paul Stewart
a377b026f6
Merge changes from topic 'enterprise-client-chain' am: c71b5dab72
...
am: fc5430a39c
2017-01-28 01:59:39 +00:00
Paul Stewart
3bac61ac86
Test passing null cert/keys to WifiEnterpriseConfig am: 88b3c589ad
...
am: cb79016b16
2017-01-28 01:54:47 +00:00
Paul Stewart
25eff7731a
Account for null client certificate am: 1ca57a1d10
...
am: 4ad314b463
2017-01-28 01:53:52 +00:00
Paul Stewart
80b5793645
Add a client chain to WifiEnterpriseConfig am: 291ddaef78
...
am: cd463ff269
2017-01-28 01:52:43 +00:00
Paul Stewart
fc5430a39c
Merge changes from topic 'enterprise-client-chain'
...
am: c71b5dab72
2017-01-28 01:52:41 +00:00
Paul Stewart
cb79016b16
Test passing null cert/keys to WifiEnterpriseConfig
...
am: 88b3c589ad
2017-01-28 01:46:52 +00:00
Paul Stewart
4ad314b463
Account for null client certificate
...
am: 1ca57a1d10
2017-01-28 01:45:53 +00:00
Paul Stewart
cd463ff269
Add a client chain to WifiEnterpriseConfig
...
am: 291ddaef78
2017-01-28 01:45:05 +00:00
Treehugger Robot
c71b5dab72
Merge changes from topic 'enterprise-client-chain'
...
* changes:
Test passing null cert/keys to WifiEnterpriseConfig
Account for null client certificate
Add a client chain to WifiEnterpriseConfig
2017-01-28 01:38:31 +00:00
Brad Ebinger
cc778dae0d
Merge "Adds @hide ImsResolver API and device overlays (2/3)" am: d063843549 am: b5f2519abc
...
am: 18140a6784
2017-01-27 23:13:36 +00:00
Brad Ebinger
18140a6784
Merge "Adds @hide ImsResolver API and device overlays (2/3)" am: d063843549
...
am: b5f2519abc
2017-01-27 23:08:31 +00:00
John Reck
6e4f930457
Merge "Fix a bunch of repeated reads of a ro.* property" am: 4265991701 am: e4c2e8f303
...
am: 3c2837e77e
2017-01-27 23:05:52 +00:00
Brad Ebinger
b5f2519abc
Merge "Adds @hide ImsResolver API and device overlays (2/3)"
...
am: d063843549
2017-01-27 23:03:47 +00:00
John Reck
3c2837e77e
Merge "Fix a bunch of repeated reads of a ro.* property" am: 4265991701
...
am: e4c2e8f303
2017-01-27 23:02:41 +00:00
John Reck
e4c2e8f303
Merge "Fix a bunch of repeated reads of a ro.* property"
...
am: 4265991701
2017-01-27 22:57:29 +00:00
Treehugger Robot
d063843549
Merge "Adds @hide ImsResolver API and device overlays (2/3)"
2017-01-27 22:55:16 +00:00
Treehugger Robot
4265991701
Merge "Fix a bunch of repeated reads of a ro.* property"
2017-01-27 22:49:04 +00:00
Makoto Onuki
efdec8f568
Do not call RecoverySystem with DPMS lock held
...
Note DPM.wipeData() on a secondary user is now blocking, just like
it's been always blocking on the primary user.
Test: Manually tested wipeData() with ApiDemos, both on 1) the primary user,
2) a secondary user and 3) work profile.
Test: adb shell am instrument -e class com.android.server.devicepolicy.DevicePolicyManagerTest -w com.android.frameworks.servicestests
Bug 30681079
Change-Id: Ia832bed0f22396998d6307ab46e262dae9463838
Merged-in: Ib97a92a6af87a5589d2643b9ae0522395735e1a5
2017-01-27 14:08:01 -08:00
koji.x.shigehara
8247102e16
Merge "Handles #9 as Dial number" am: 3b24c6e1a2 am: 4710c36e8d
...
am: 679ef0013e
2017-01-27 21:46:21 +00:00
koji.x.shigehara
679ef0013e
Merge "Handles #9 as Dial number" am: 3b24c6e1a2
...
am: 4710c36e8d
2017-01-27 21:42:28 +00:00
koji.x.shigehara
4710c36e8d
Merge "Handles #9 as Dial number"
...
am: 3b24c6e1a2
2017-01-27 21:38:26 +00:00
Treehugger Robot
3b24c6e1a2
Merge "Handles #9 as Dial number"
2017-01-27 21:30:42 +00:00
