Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
282,412 Commits 3 Branches 0 Tags
1a05097d0458bfcdbfa42118fecf6f38bab9bce0
Commit Graph

282412 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Stewart
1a05097d04 Merge changes from topic 'enterprise-client-chain' am: c71b5dab72 am: fc5430a39c 
am: a377b026f6

Change-Id: I80d26378aa4e82aec5a79054ad59f3385ac0e8d0
 2017-01-28 02:06:10 +00:00
Paul Stewart
96c87f7a9b Test passing null cert/keys to WifiEnterpriseConfig am: 88b3c589ad am: cb79016b16 
am: 3bac61ac86

Change-Id: I5c8af5dcd505002d815886f4a1ea30496411a35f
 2017-01-28 02:01:40 +00:00
Paul Stewart
b35b219516 Account for null client certificate am: 1ca57a1d10 am: 4ad314b463 
am: 25eff7731a

Change-Id: I2bd868e534ca1a5960ac9855bd40a91f705b9772
 2017-01-28 02:00:50 +00:00
Paul Stewart
9c9d4f6f6d Add a client chain to WifiEnterpriseConfig am: 291ddaef78 am: cd463ff269 
am: 80b5793645

Change-Id: I11310cfd06db4357ec1ee94139ebdb2e2f40f771
 2017-01-28 01:59:40 +00:00
Paul Stewart
a377b026f6 Merge changes from topic 'enterprise-client-chain' am: c71b5dab72 
am: fc5430a39c

Change-Id: I2850cbafd7800284d259e04e2889af68d3272ab5
 2017-01-28 01:59:39 +00:00
Paul Stewart
3bac61ac86 Test passing null cert/keys to WifiEnterpriseConfig am: 88b3c589ad 
am: cb79016b16

Change-Id: Ib96c9b9034d5fd6fb0477ca274e4cbce86677d0e
 2017-01-28 01:54:47 +00:00
Paul Stewart
25eff7731a Account for null client certificate am: 1ca57a1d10 
am: 4ad314b463

Change-Id: I50138c766a4ca1f697bbe4c2285bc0bc8c2985f4
 2017-01-28 01:53:52 +00:00
Paul Stewart
80b5793645 Add a client chain to WifiEnterpriseConfig am: 291ddaef78 
am: cd463ff269

Change-Id: I3625766bb97cf2bf4ab8a6a0d518c2b876069e23
 2017-01-28 01:52:43 +00:00
Paul Stewart
fc5430a39c Merge changes from topic 'enterprise-client-chain' 
am: c71b5dab72

Change-Id: Icfae9ac89759cd4d18f63dd2da17587bb7fdf96d
 2017-01-28 01:52:41 +00:00
Paul Stewart
cb79016b16 Test passing null cert/keys to WifiEnterpriseConfig 
am: 88b3c589ad

Change-Id: Ia92c2ad4b7562250aa69d3e8dbb3b8d8607d4136
 2017-01-28 01:46:52 +00:00
Paul Stewart
4ad314b463 Account for null client certificate 
am: 1ca57a1d10

Change-Id: Id999634bb25a379a5cfdb47412323d2cc6d0cd30
 2017-01-28 01:45:53 +00:00
Paul Stewart
cd463ff269 Add a client chain to WifiEnterpriseConfig 
am: 291ddaef78

Change-Id: Ic8451631732bd3bfce7ff08f9f37b18745cda357
 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

Change-Id: I1c29dcbdd4f1f1f97bf2e3eb3a1f0bdc83613676
 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

Change-Id: I54c577f6c4bd68f6328572651315e056270ee807
 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

Change-Id: Idbcb9dfeac57036d3621474ee65ba967cc7bc499
 2017-01-27 23:05:52 +00:00
Brad Ebinger
b5f2519abc Merge "Adds @hide ImsResolver API and device overlays (2/3)" 
am: d063843549

Change-Id: I82a38c0cb2b7b229b96f0a617f8b7c921eb6d3a9
 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

Change-Id: Id6af451556fde8eefac8076735e625911f8bf272
 2017-01-27 23:02:41 +00:00
John Reck
e4c2e8f303 Merge "Fix a bunch of repeated reads of a ro.* property" 
am: 4265991701

Change-Id: I996fbd1002ef788a768b575ab6d2177dc9ab5af1
 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

Change-Id: I8697aa07662c7f00f0f5b678f63a1f44a39c08fb
 2017-01-27 21:46:21 +00:00
koji.x.shigehara
679ef0013e Merge "Handles #9 as Dial number" am: 3b24c6e1a2 
am: 4710c36e8d

Change-Id: I2ea8c5bbd06b0b58609f27039a5fef0d9b37cb9e
 2017-01-27 21:42:28 +00:00
koji.x.shigehara
4710c36e8d Merge "Handles #9 as Dial number" 
am: 3b24c6e1a2

Change-Id: I71b8c65b0dc1fd813f2f962074db217df429c8ef
 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

Change-Id: I282418ddb3043e12c48edf23933d1bea4c35c3e0
 2017-01-27 21:07:09 +00:00
Jack Yu
df4a6bc4de Fixed the logic for tethering provisioning re-evaluation 
am: 3294256ba5  -s ours

Change-Id: I153971fb47656ac122f786ed2f86f6302abe48e7
 2017-01-27 21:07:00 +00:00
Paul Stewart
88b3c589ad Test passing null cert/keys to WifiEnterpriseConfig 
Ensure that null certificates and keys don't crash.

Bug: 34765004
Test: This is a test
Change-Id: I439b4f985c1b88ad4a9b58ee6f4eb4f90bd81246
 2017-01-27 12:48:55 -08: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

Bug: 34765004
Test: cts-tradefed run cts -d --module CtsNetTestCases --test android.net.wifi.cts.WifiEnterpriseConfigTest
Change-Id: I02793b4b29bc7325f98833c58bf652ba68353827
 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

Change-Id: I09c0c21f69efb739d73f247e76c3b378a0e5c7d6
 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

Change-Id: I61a101f50ef6ea56b0ed9b9b1b7ec4b0516220ab
 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

Change-Id: I7f5391cced1db62be2d9b88823d88d2d77f8b065
 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

Change-Id: I82ac34a2f846f4ebe164e4190716559186204934
 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  -s ours

Change-Id: I3e70c3a349fd4ce05e88b84e2b987bbf26cadeba
 2017-01-27 19:32:24 +00:00
Erik Kline
118c0c9e7d Merge "Switch to listening for all network changes." am: 085ffa76fa 
am: 46f8abd229

Change-Id: I28ad47a86ea534c5b675a530ffbaac415fd60b25
 2017-01-27 19:20:19 +00:00
Erik Kline
46f8abd229 Merge "Switch to listening for all network changes." 
am: 085ffa76fa

Change-Id: I87157788c5c2dc1015f9518c1c443256cfd30bae
 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

Change-Id: I35fa80e43cd4f6af76099848714f838f217b7989
 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

Change-Id: I7e56dd815f5ac72b27ac6e2e2ca7614eaa648db1
 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

Bug: 34688653
Test: Compile, unit tests
Change-Id: I6afd8baf67312e8ddaaeefd26f30dacc51aa33bb
 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

Change-Id: Ic52f409f1225c85340e71909a8adb3b9c4d66edf
 2017-01-27 16:59:34 +00:00