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
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
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
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
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
Jack Yu
cf7f4ba3fa
DO NOT MERGE - Fixed the logic for tethering provisioning re-evaluation
...
Previously we only re-evaluate provisioning for SIM swap case
The new logic covers both SIM swap case
(ABSENT->NOT_READY->UNKNOWN->READY->LOADED) and modem reset
case (NOT_READY->READY->LOADED)
Test: Manual
bug: 33815946
Merged-In: I9960123605b10d3fa5f3584c6c8b70b616acd6f8
Change-Id: I9960123605b10d3fa5f3584c6c8b70b616acd6f8
2017-01-27 13:30:01 -08:00
Brad Ebinger
e6ec7d8b8f
Adds @hide ImsResolver API and device overlays (2/3)
...
- Adds config_ims_package device overlay, which specifies the default
package name to bind to.
- Adds config_dynamic_bind_ims device overlay, which determines
whether or not the new dynamic binding system is used.
- Adds @hide TelephonyManager API to interface with the ImsResolver
Test: Manual
Merged-In: I82a41da00e6da34629a40db431f13b968dfafe2e
Change-Id: I82a41da00e6da34629a40db431f13b968dfafe2e
2017-01-27 13:09:37 -08:00
Jack Yu
b38770b58e
Merge "Fixed the logic for tethering provisioning re-evaluation" into nyc-mr2-dev
...
am: d9ab9df05b
2017-01-27 21:07:09 +00:00
Jack Yu
df4a6bc4de
Fixed the logic for tethering provisioning re-evaluation
...
am: 3294256ba5
2017-01-27 21:07:00 +00:00
Paul Stewart
1ca57a1d10
Account for null client certificate
...
If a null certificate is passed to setClientKeyEntry() we should
not pass a non-null array with a single null element to the
setClientKeyEntryWithCertificateChain helper method. Instead we
should pass a null array.
Cherry-pick of 410a3498ac
2017-01-27 12:47:20 -08:00
Tomasz Wasilczyk
aa70426388
Merge "Use the new radio_metadata wrapper for safer memory management." am: a9ed0b1c8b am: e163e7b943
...
am: bb15b50ffc
2017-01-27 20:43:24 +00:00
Tomasz Wasilczyk
bb15b50ffc
Merge "Use the new radio_metadata wrapper for safer memory management." am: a9ed0b1c8b
...
am: e163e7b943
2017-01-27 20:38:55 +00:00
TreeHugger Robot
d9ab9df05b
Merge "Fixed the logic for tethering provisioning re-evaluation" into nyc-mr2-dev
2017-01-27 20:36:33 +00:00
Tomasz Wasilczyk
e163e7b943
Merge "Use the new radio_metadata wrapper for safer memory management."
...
am: a9ed0b1c8b
2017-01-27 20:32:52 +00:00
Tomasz Wasilczyk
a9ed0b1c8b
Merge "Use the new radio_metadata wrapper for safer memory management."
2017-01-27 20:26:08 +00:00
Erik Kline
8aba32468a
Merge "Switch to listening for all network changes." am: 085ffa76fa am: 46f8abd229
...
am: 118c0c9e7d
2017-01-27 19:33:16 +00:00
Shukang Zhou
83b3c5994e
Merge "[Frameworks] Add an 'am' cmd option to enable streaming in profiling." am: e924640c4b am: b0f03a64ea
...
am: 221e58fe95
2017-01-27 19:32:24 +00:00
Erik Kline
118c0c9e7d
Merge "Switch to listening for all network changes." am: 085ffa76fa
...
am: 46f8abd229
2017-01-27 19:20:19 +00:00
Erik Kline
46f8abd229
Merge "Switch to listening for all network changes."
...
am: 085ffa76fa
2017-01-27 19:14:39 +00:00
Treehugger Robot
085ffa76fa
Merge "Switch to listening for all network changes."
2017-01-27 19:07:08 +00:00
John Reck
ed065024a5
Fix a bunch of repeated reads of a ro.* property
...
SystemProperties.get() is not particularly fast,
especially if a string is returned. Since ro.* values
are unable to be changed, there's no need to
continously re-query them. Cache the value at
static init time to trivially fix this.
Test: refactoring CL.
Change-Id: Iccb021d3cb2ba3a4a1d0048ddec6811bb7409eec
(cherry picked from commit aa67f684ff
2017-01-27 11:04:39 -08:00
Shukang Zhou
221e58fe95
Merge "[Frameworks] Add an 'am' cmd option to enable streaming in profiling." am: e924640c4b
...
am: b0f03a64ea
2017-01-27 19:01:44 +00:00
Shukang Zhou
b0f03a64ea
Merge "[Frameworks] Add an 'am' cmd option to enable streaming in profiling."
...
am: e924640c4b
2017-01-27 18:57:12 +00:00
Treehugger Robot
e924640c4b
Merge "[Frameworks] Add an 'am' cmd option to enable streaming in profiling."
2017-01-27 18:49:45 +00:00
Paul Stewart
291ddaef78
Add a client chain to WifiEnterpriseConfig
...
Add a list of supporting certificates to be presented in the process
of presenting client credentials.
Cherry-pick of e351176716
2017-01-27 09:46:27 -08:00
Tomasz Wasilczyk
aee690ffad
Use the new radio_metadata wrapper for safer memory management.
...
Bug: b/34054813
Test: VTS, manual - both done in internal branch
Change-Id: I5f4962f86b7732e14c2584a562e9737c92310697
2017-01-27 09:40:35 -08:00
Jack Yu
3294256ba5
Fixed the logic for tethering provisioning re-evaluation
...
Previously we only re-evaluate provisioning for SIM swap case
The new logic covers both SIM swap case
(ABSENT->NOT_READY->UNKNOWN->READY->LOADED) and modem reset
case (NOT_READY->READY->LOADED)
Test: Manual
bug: 33815946
Merged-In: I9960123605b10d3fa5f3584c6c8b70b616acd6f8
Change-Id: I9960123605b10d3fa5f3584c6c8b70b616acd6f8
2017-01-27 17:37:58 +00:00
Android Build Merger (Role)
b20b9d84d2
Merge "Add hidden API for whether permission review mode is on. am: 7b89a7b1f7 am: 90e9bbc814" into nyc-mr2-dev-plus-aosp
2017-01-27 17:00:36 +00:00
Paul Navin
ecc6ce8388
Add hidden API for whether permission review mode is on. am: 7b89a7b1f7
...
am: 90e9bbc814
2017-01-27 16:59:34 +00:00
Paul Navin
dd91db5515
Add hidden API for whether permission review mode is on. am: 7b89a7b1f7
...
am: 7c230c6f3c
2017-01-27 16:59:33 +00:00
Paul Navin
7c230c6f3c
Add hidden API for whether permission review mode is on.
...
am: 7b89a7b1f7
2017-01-27 16:55:03 +00:00
Paul Navin
90e9bbc814
Add hidden API for whether permission review mode is on.
...
am: 7b89a7b1f7
2017-01-27 16:54:58 +00:00
Jason Monk
73f1a5a758
Merge "Add separate roaming icon for status bar + QS" into nyc-mr2-dev
...
am: 76812ac8ac
2017-01-27 15:15:01 +00:00
Jason Monk
f58cc5768a
Add separate roaming icon for status bar + QS
...
am: f62e889394
2017-01-27 15:14:53 +00:00
Jason Monk
76812ac8ac
Merge "Add separate roaming icon for status bar + QS" into nyc-mr2-dev
2017-01-27 15:08:06 +00:00
Lorenzo Colitti
5bad599e2e
Merge "ConnectivityServiceTest: fix flaky tests" am: b8bbd30203 am: 8fea8e5bbd
...
am: c620e64f61
2017-01-27 10:00:06 +00:00
Lorenzo Colitti
c620e64f61
Merge "ConnectivityServiceTest: fix flaky tests" am: b8bbd30203
...
am: 8fea8e5bbd
2017-01-27 09:55:39 +00:00
