278941 Commits

Author SHA1 Message Date
Tim Murray
4dfe21d668 Merge "Fix incorrect FIFO cgroup assignment." am: d9ce420d9a
am: a72f5f27d2

Change-Id: I172251111ab333e750bc862725a50b7913f20c90
2016-12-21 02:05:58 +00:00
Tim Murray
a72f5f27d2 Merge "Fix incorrect FIFO cgroup assignment."
am: d9ce420d9a

Change-Id: Ib5c5ee81058ded098d16dba1dfd43096bbd91937
2016-12-21 01:57:51 +00:00
Treehugger Robot
d9ce420d9a Merge "Fix incorrect FIFO cgroup assignment." 2016-12-21 01:47:56 +00:00
Amin Shaikh
18d7a5e95f Merge "Change fillColor for Wi-Fi badges to #FFFFFF." am: c1940ef392
am: 380341f6c8

Change-Id: If863fcce014adf2b2c0d866dc14ba59732f57520
2016-12-21 01:15:18 +00:00
Amin Shaikh
380341f6c8 Merge "Change fillColor for Wi-Fi badges to #FFFFFF."
am: c1940ef392

Change-Id: If3d909680cbcda0440807db40761c1a84b2cde97
2016-12-21 01:10:44 +00:00
Treehugger Robot
c1940ef392 Merge "Change fillColor for Wi-Fi badges to #FFFFFF." 2016-12-21 01:00:19 +00:00
Sundeep Ghuman
c5443c1d5c Merge "Create and implement a CacheListener inside WifiNetworkScoreCache." am: 31a8f712ab
am: 6d749fb489

Change-Id: I711dd2b9d142a3a92ed641b08dd944be329e503a
2016-12-21 00:51:49 +00:00
Sundeep Ghuman
6d749fb489 Merge "Create and implement a CacheListener inside WifiNetworkScoreCache."
am: 31a8f712ab

Change-Id: Iba52c9ed85a7e35c46b85a9516a81ac5096a6710
2016-12-21 00:43:15 +00:00
Treehugger Robot
31a8f712ab Merge "Create and implement a CacheListener inside WifiNetworkScoreCache." 2016-12-21 00:28:48 +00:00
Amin Shaikh
70b1c6ab40 Change fillColor for Wi-Fi badges to #FFFFFF.
Bug: 33778046
Test: make
Change-Id: I0cfc2c6d682a2f13e665563fc1c54fa19324af53
2016-12-20 15:28:34 -08:00
Sundeep Ghuman
d76e65bead Create and implement a CacheListener inside WifiNetworkScoreCache.
Bug: 33041117
Test: Unit tests
Change-Id: Ic07522062f79223079b84c49210fcfc0217ecd38
2016-12-20 15:07:01 -08:00
Amin Shaikh
9209505c85 Merge "Make WifiConfiguration#meteredHint a @SystemApi" am: f456ddf3fd
am: a81a4163f5

Change-Id: I847b3d07024e025040304f47de88211956d20175
2016-12-20 22:39:41 +00:00
Amin Shaikh
a81a4163f5 Merge "Make WifiConfiguration#meteredHint a @SystemApi"
am: f456ddf3fd

Change-Id: Ie1324197329486e9eeec0bb765441a6fc5bb8a32
2016-12-20 22:35:06 +00:00
Treehugger Robot
f456ddf3fd Merge "Make WifiConfiguration#meteredHint a @SystemApi" 2016-12-20 22:24:13 +00:00
Tim Murray
20375fe124 Fix incorrect FIFO cgroup assignment.
bug 33745094
Test: builds

Change-Id: I46eefc8ea6f17ca3795f4743692ddfea36d5db0f
2016-12-20 14:04:44 -08:00
Hall Liu
57c781417f Merge "Adds carrier config to determine if high definition audio is displayed" am: 26e5096364
am: fc125a319e

Change-Id: I305223c2a5499b9fdf2f1f59ddfda40712cd6172
2016-12-20 21:28:12 +00:00
Andre Eisenbach
bf43955a6b Merge "Bluetooth: persist state when turning on from BLE" am: 8e9551bacf
am: e6164ca72a

Change-Id: I7c27d09c83daf73817585f2713bd2f05b97cd525
2016-12-20 21:27:05 +00:00
Hall Liu
fc125a319e Merge "Adds carrier config to determine if high definition audio is displayed"
am: 26e5096364

Change-Id: I2ce0958075ec3bd2c337993516ad06ffd264d594
2016-12-20 21:19:43 +00:00
Andre Eisenbach
e6164ca72a Merge "Bluetooth: persist state when turning on from BLE"
am: 8e9551bacf

Change-Id: Iad69e2f184df54ffbb2d7169e45345c80547b010
2016-12-20 21:18:35 +00:00
Hall Liu
26e5096364 Merge "Adds carrier config to determine if high definition audio is displayed" 2016-12-20 21:13:31 +00:00
Andre Eisenbach
8e9551bacf Merge "Bluetooth: persist state when turning on from BLE" 2016-12-20 21:11:59 +00:00
Marie Janssen
e0bfa2efa2 Bluetooth: persist state when turning on from BLE
Test: in BLE_ON state, turn to full on, reboot phone
Bug: 33777496
Change-Id: I246d6ff0dcb81d66aa915ef443040d6fc3c98310
2016-12-20 21:11:35 +00:00
Amin Shaikh
99a19e8116 Merge "Add Wi-Fi quality badge icons." am: edb8982c31
am: 061d4fff4b

Change-Id: I25b230cbc51cd7079d2c73d116c9e4550fc5b02e
2016-12-20 20:53:32 +00:00
Amin Shaikh
d3dfd3b8e9 Make WifiConfiguration#meteredHint a @SystemApi
This allows NetworkRecommendationProviders to set this field on
returned WifiConfigurations.

Test: make
Bug: 33760009
Change-Id: I4d34272a1fb8d88bcc56cf4f00d8beadd06ac603
Merged-In: I4d34272a1fb8d88bcc56cf4f00d8beadd06ac603
2016-12-20 12:46:50 -08:00
Alex Klyubin
e1bc33228e Merge "Permit 65535 byte ZIP comments and empty Central Directory" am: f420b91e26
am: be81b50b6e

Change-Id: I1275903e7fda6bdd9c1012bc7cfb6c42f6b43304
2016-12-20 20:45:59 +00:00
Amin Shaikh
061d4fff4b Merge "Add Wi-Fi quality badge icons."
am: edb8982c31

Change-Id: I43d4f52e26eb7514b177d10769d6a5e3fc78f386
2016-12-20 20:24:31 +00:00
Treehugger Robot
edb8982c31 Merge "Add Wi-Fi quality badge icons." 2016-12-20 20:13:59 +00:00
Alex Klyubin
be81b50b6e Merge "Permit 65535 byte ZIP comments and empty Central Directory"
am: f420b91e26

Change-Id: Ic178cdd9043c171f2f51643212e34b642657abe9
2016-12-20 18:45:57 +00:00
Amin Shaikh
e2e395e146 Add Wi-Fi quality badge icons.
Test: make
Bug: 33705924
Change-Id: I6ae9fab369151e6c2d3769d7ba4a20103368f0a0
2016-12-20 10:42:25 -08:00
Alex Klyubin
f420b91e26 Merge "Permit 65535 byte ZIP comments and empty Central Directory" 2016-12-20 18:33:29 +00:00
Nick Kralevich
b0e5079b5d LocalSocketImpl.cpp: Set O_CLOEXEC on received FDs
Set O_CLOEXEC on received file descriptors. This prevents FD leakage
across an exec boundary. Please see the description of O_CLOEXEC in "man
2 open" for the reasons why this is useful.

Test: Device boots and no observed errors.
Change-Id: Id0d9c9d71efb25dacb26d5d98d93fc3b72c1b6ae
2016-12-20 07:14:49 -08:00
Jeremy Joslin
949893f5b2 Merge "Implement the request and recommend calls." am: 1e814b3928
am: b50fdc7faa

Change-Id: I81f998b6934715f43797247f411919a4ceee5631
2016-12-20 06:32:42 +00:00
Jeremy Joslin
b50fdc7faa Merge "Implement the request and recommend calls."
am: 1e814b3928

Change-Id: I91c905ab2fc7e061462fb96c2c81a783aa93a391
2016-12-20 06:25:08 +00:00
Treehugger Robot
1e814b3928 Merge "Implement the request and recommend calls." 2016-12-20 06:16:03 +00:00
Jeremy Joslin
af811c2650 Merge "Implement the discovery of a network recommendation provider." am: 470d256519
am: 8fbeb1d74a

Change-Id: I322592326e0a409131a4dd33ab1f907b9262dbf2
2016-12-20 03:34:02 +00:00
Jeremy Joslin
8fbeb1d74a Merge "Implement the discovery of a network recommendation provider."
am: 470d256519

Change-Id: I804df594669be3b42704dead7007790666bef0f6
2016-12-20 03:26:04 +00:00
Treehugger Robot
470d256519 Merge "Implement the discovery of a network recommendation provider." 2016-12-20 03:16:32 +00:00
Jeremy Joslin
36d4c48496 Implement the request and recommend calls.
Implemented requestRecommendation() and requestScores() to call
through to the bound network recommendation provider if available.

BUG: 33593157
BUG: 33668692
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Change-Id: I055251fa94d93d4ea4e5001c4ec6c1dfb626d1b2
Merged-In: I8e2ed73dc6876deb1a8bd47bcaeaca8db68f3a44
2016-12-19 17:53:47 -08:00
Jeremy Joslin
b8418ac89a Implement the discovery of a network recommendation provider.
Updated the NetworkScorerAppManager to examine the list of configured
network recommendation providers and to select the first valid
provider.

As part of this update the old logic of looking for a valid network
scorer has been removed. Scorers/recommendation providers are only
selected from the configured list now. The setActiveScorer() method
has been deprecated as a result.

The NetworkScoreService has been updated to monitor the list of
potential recommendation providers and to reevaluate the binding
whenever they change. It also monitors the new setting for
NETWORK_RECOMMENDATIONS_ENABLED to connect or disconnect from the
provider as needed.

Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
BUG: 33158362
Change-Id: I450981261aa5355c1c91ec2e3a0a3b58cc65316b
Merged-In: I42aeb5223da794f71f7e58cb1bdf18817200cbf2
2016-12-19 17:53:47 -08:00
Jeff Sharkey
e36f449c90 Merge "Remove ~1/3 of the installd calls at boot." am: 5bc305b97c
am: d948865e27

Change-Id: Iaf9d7f9a3f7d2fd34a11ec2ee80d849fc7dd0078
2016-12-20 01:18:38 +00:00
Jeff Sharkey
d948865e27 Merge "Remove ~1/3 of the installd calls at boot."
am: 5bc305b97c

Change-Id: Ia6af8d920971118f108320d08b15cbe3da59b28a
2016-12-20 01:14:35 +00:00
Treehugger Robot
5bc305b97c Merge "Remove ~1/3 of the installd calls at boot." 2016-12-20 01:06:23 +00:00
Jeff Sharkey
1c6f723973 Remove ~1/3 of the installd calls at boot.
When preparing CE storage for an app, we always perform a second call
to extract any newly created CE directory inode.  Let's simplify this
and just return the inode number from the createAppData() call.

Test: builds, boots, reads CE inodes after wipe
Bug: 33463450
Change-Id: I9b73da576800b56d7d0961dd4deb0b6a546acbe7
2016-12-19 16:39:54 -07:00
Jeremy Joslin
5b1a460b94 Merge "Fix ScanResult array parceling." am: 5fdc86fb27
am: 68764eabb7

Change-Id: I6b44179d634722828f40524c26ccf6ea51521f11
2016-12-19 22:14:37 +00:00
Jeremy Joslin
68764eabb7 Merge "Fix ScanResult array parceling."
am: 5fdc86fb27

Change-Id: I25e509ea057370c4380764c47808c0dbde85a6fc
2016-12-19 22:07:20 +00:00
Treehugger Robot
5fdc86fb27 Merge "Fix ScanResult array parceling." 2016-12-19 21:57:05 +00:00
Joe LaPenna
8c5eb9b10f Merge "Remove "final" from ResultCallback." am: b60d7b334c
am: 8df12d98f7

Change-Id: Ia0266003bff04bf0ec5b3ee7134678c1b1f0e77f
2016-12-19 21:07:29 +00:00
Joe LaPenna
8df12d98f7 Merge "Remove "final" from ResultCallback."
am: b60d7b334c

Change-Id: I3b6679368418af3992007f58d47c544cf7a1b1ed
2016-12-19 21:01:26 +00:00
Treehugger Robot
b60d7b334c Merge "Remove "final" from ResultCallback." 2016-12-19 20:54:14 +00:00
Alex Klyubin
9694657967 Permit 65535 byte ZIP comments and empty Central Directory
This fixes two cosmetic issues in APK Signature Scheme v2 signature
verifier in Android Package Manager:
* Accept APKs with ZIP End of Central Directory comment of length
  65535. Previously, only comments of length 65534 were accepted due
  to a off by one bug.
* Accept APKs with empty ZIP Central Directory.

These issues should not affect actual APKs because they cannot have an
empty ZIP Central Directory (they must contain at least the
AndroidManifest.xml entry) and shouldn't contain any comments in ZIP
End of Central Directory.

Test: cts-tradefed run singleCommand cts --skip-device-info --skip-preconditions --skip-connectivity-check --abi arm64-v8a --module CtsAppSecurityHostTestCases -t android.appsecurity.cts.PkgInstallSignatureVerificationTest
Change-Id: I461c43472fa97c04e7579d129a6053e44233adb7
2016-12-19 12:53:32 -08:00