Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
302,529 Commits 3 Branches 0 Tags
dfbfca2015c33d3cbdf438d54774d0bab85b5986
Commit Graph

302529 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pavel Grafov
dfbfca2015 Merge "Fix DevicePolicyManagerServiceMigrationTest." 2017-01-12 11:08:54 +00:00
Erik Kline
17ca0e43a1 Merge "Simplify UpstreamNetworkMonitor callback handling" am: f9f5cf9d9b am: cbd3d8b356 am: 082263344a 
am: 190d8591ce

Change-Id: I255691753279b370e85c4bde1930b7e2f45cd109
 2017-01-12 10:49:31 +00:00
Martijn Coenen
41ab7eed92 Merge "Use new read(Embedded)Buffer APIs." am: 34ed84d4eb am: aa4d6f1be9 am: eed50c1809 
am: cfc4e21899

Change-Id: I0478ca20b670f7ddd776ea98f3d5d1db928842ac
 2017-01-12 10:44:38 +00:00
Erik Kline
190d8591ce Merge "Simplify UpstreamNetworkMonitor callback handling" am: f9f5cf9d9b am: cbd3d8b356 
am: 082263344a

Change-Id: I11af9d4b1810cce628e240f2d8b6980ea55cd40a
 2017-01-12 10:43:26 +00:00
Martijn Coenen
cfc4e21899 Merge "Use new read(Embedded)Buffer APIs." am: 34ed84d4eb am: aa4d6f1be9 
am: eed50c1809

Change-Id: Ia89700ddb0300b931e11b3f4dc5f31c4234d7076
 2017-01-12 10:38:28 +00:00
Erik Kline
082263344a Merge "Simplify UpstreamNetworkMonitor callback handling" am: f9f5cf9d9b 
am: cbd3d8b356

Change-Id: I845443ae243429847e0a42b3be5bec6276a216c0
 2017-01-12 10:33:24 +00:00
Martijn Coenen
eed50c1809 Merge "Use new read(Embedded)Buffer APIs." am: 34ed84d4eb 
am: aa4d6f1be9

Change-Id: I5153b688467f4d06da701eaa34bfa19c7904e33d
 2017-01-12 10:31:35 +00:00
Erik Kline
cbd3d8b356 Merge "Simplify UpstreamNetworkMonitor callback handling" 
am: f9f5cf9d9b

Change-Id: I642567d81b6b8908b2ef7afea8d15628330481f9
 2017-01-12 10:26:43 +00:00
Martijn Coenen
aa4d6f1be9 Merge "Use new read(Embedded)Buffer APIs." 
am: 34ed84d4eb

Change-Id: Idaa3a3a2d874b10cb5f07e3cb606c822e7ddfd8b
 2017-01-12 10:25:01 +00:00
Treehugger Robot
f9f5cf9d9b Merge "Simplify UpstreamNetworkMonitor callback handling" 2017-01-12 10:18:24 +00:00
Treehugger Robot
34ed84d4eb Merge "Use new read(Embedded)Buffer APIs." 2017-01-12 10:17:40 +00:00
Hugo Benichi
57e6cc89af Merge "Captive portal: better detect empty responses" into nyc-mr2-dev am: c45082266f 
am: f32a9f72d0

Change-Id: I62c0ab068b1304a1dbe7edbae29e5e74d8c34e08
 2017-01-12 09:06:28 +00:00
Hugo Benichi
2c69d1de70 Captive portal: better detect empty responses am: cb4aa4d412 
am: 3d5357ba2d

Change-Id: I3982ce4485d94c4abcf6afb2c58aa94a2ff2c902
 2017-01-12 09:05:25 +00:00
Hugo Benichi
f32a9f72d0 Merge "Captive portal: better detect empty responses" into nyc-mr2-dev 
am: c45082266f

Change-Id: Ice8b5df87baf475ebc4eb8f2eb4fe0150c938639
 2017-01-12 08:59:33 +00:00
Hugo Benichi
3d5357ba2d Captive portal: better detect empty responses 
am: cb4aa4d412

Change-Id: I64a006f6bb83dc588b108395d54189bb401c83ff
 2017-01-12 08:59:27 +00:00
TreeHugger Robot
c45082266f Merge "Captive portal: better detect empty responses" into nyc-mr2-dev 2017-01-12 08:51:34 +00:00
TreeHugger Robot
e4e375c749 Merge "Follow minikin::FontFamily constructor signature change." 2017-01-12 07:43:53 +00:00
Stephen Chen
0c43b66a1a Merge "Expose WifiManager#connect and ActionListener as @SystemApi" am: 691ebe5366 am: 0e7882f2ac am: 272e70bf69 
am: 50b0979972  -s ours

Change-Id: I6c96fa4a4033be5236f00082e3c7000a7061dbe9
 2017-01-12 07:39:50 +00:00
TreeHugger Robot
3b7538e370 Merge "Add networkrecommendation permissions to privapp perms list." 2017-01-12 07:33:47 +00:00
Stephen Chen
50b0979972 Merge "Expose WifiManager#connect and ActionListener as @SystemApi" am: 691ebe5366 am: 0e7882f2ac 
am: 272e70bf69

Change-Id: I2bc76076e613566111404c55faefaeda9048f2d1
 2017-01-12 07:33:19 +00:00
Stephen Chen
272e70bf69 Merge "Expose WifiManager#connect and ActionListener as @SystemApi" am: 691ebe5366 
am: 0e7882f2ac

Change-Id: I7408b253a7acc4aaf22dc7748b1941576d5de4c7
 2017-01-12 07:27:22 +00:00
Stephen Chen
0e7882f2ac Merge "Expose WifiManager#connect and ActionListener as @SystemApi" 
am: 691ebe5366

Change-Id: I114cbc6777130b440639b2f13e161d8d044f7185
 2017-01-12 07:21:49 +00:00
Treehugger Robot
691ebe5366 Merge "Expose WifiManager#connect and ActionListener as @SystemApi" 2017-01-12 07:15:06 +00:00
Hugo Benichi
cb4aa4d412 Captive portal: better detect empty responses 
The captive portal detection logic treats empty http responses with a
Content-Length of 0 as not coming from a portal.

However when the Content-Length is missing from the response header, the
empty response is not detected as such and is classified as a captive
portal answer.

When this happens for the http probe, the portal detection logic will
short circuit the detection and wrongly report a portal. The system
validates the network in such conditions only if the https probe
returns a successful connection faster than the http probe.

This patch attempts to better detect empty responses by trying to read
the first byte from the response body when the Content-Length is missing
for 200 responses.

Test: build, flashed + manual tests.
Bug: 33498325
Change-Id: Ie2e5c6a9dc3740e4a2304034879b5ed60f277ade
 2017-01-12 15:21:35 +09:00
Seigo Nonaka
e96cbd2773 Merge "Check the count of the families in a default collection." 2017-01-12 06:02:58 +00:00
Stephen Chen
58ddbd76bb Expose WifiManager#connect and ActionListener as @SystemApi 
This is needed by Wifi Wakeup and Notifications which live within
NetworkRecommendation package.

Bug: 33224871
Test: GTS
Change-Id: If4f1f9957f82b1292af4187c7728cbccab0184e8
Merged-In: If4f1f9957f82b1292af4187c7728cbccab0184e8
 2017-01-11 21:51:36 -08:00
Colin Cross
1b3470b1b2 Merge "Remove libservicestestsjni" am: d00478e9ad am: 301c714b43 am: dcb0c55c15 
am: 9d273bfec1  -s ours

Change-Id: I2c890897639f807e8f8cdd2217d6f3cf13833b4e
 2017-01-12 05:16:47 +00:00
Colin Cross
9d273bfec1 Merge "Remove libservicestestsjni" am: d00478e9ad am: 301c714b43 
am: dcb0c55c15

Change-Id: I55f8fed5eff824e792cbfc29b7cd7b496cad106c
 2017-01-12 05:11:47 +00:00
TreeHugger Robot
adf8b4ca76 Merge "Converting action bars to clusters." 2017-01-12 05:11:26 +00:00
Colin Cross
dcb0c55c15 Merge "Remove libservicestestsjni" am: d00478e9ad 
am: 301c714b43

Change-Id: I08e2298e7dd1ba8729e6d4a03e3c940012bb5e12
 2017-01-12 05:05:41 +00:00
Colin Cross
301c714b43 Merge "Remove libservicestestsjni" 
am: d00478e9ad

Change-Id: I062f8bd18730a8c3ee090fc4665f652fe10ff75c
 2017-01-12 04:59:42 +00:00
Roozbeh Pournader
153071c70a Merge "Rename language+country resources to just language" 2017-01-12 04:58:45 +00:00
Joe LaPenna
cd54da4595 Add networkrecommendation permissions to privapp perms list. 
Bug: 34235587
Test: Flashed and checked logcat for crash.
Change-Id: Ib35070ea87e23a3be8804eb3796e02c76a5628d0
 2017-01-11 20:54:03 -08:00
Treehugger Robot
d00478e9ad Merge "Remove libservicestestsjni" 2017-01-12 04:50:57 +00:00
Erik Kline
452b4b7218 Simplify UpstreamNetworkMonitor callback handling 
In the callback post a lamba to the target state machine's handler
that does the processing we need before sending a notification to
the state machine.

No semantic change, just a bit cleaner.

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - tested basic wifi-to-mobile tethering (no DUN)
Bug: 32163131
Change-Id: I07e1b510c1ebaa5dffd42a3f16ba96e961cb58f1
 2017-01-12 13:43:00 +09:00
TreeHugger Robot
393a954d5f Merge "API for setting default focus per cluster." 2017-01-12 04:19:16 +00:00
Colin Cross
3bc99892e6 Remove libservicestestsjni 
frameworks/base/services/tests/servicestests/jni no longer exists
after I993eeaa5dec001c39389023f355f506129b356e7, remove it.

Test: m -j FrameworksServicesTests
Change-Id: I8f307373aede9e749f1b992dde0f7252bf74b065
(cherry-picked from e399468b88)
Merged-In: I8f307373aede9e749f1b992dde0f7252bf74b065
 2017-01-12 03:24:57 +00:00
Shijian Li
896619a7ed Merge "Sync the startConsentUiIfNeeded logics to master. We are missing the package name when starting the activity now. am: 5e7fc7ccc8 am: ae21066a59" into nyc-mr2-dev-plus-aosp 
am: 8ec5d822c1

Change-Id: Ida281cd80308107dc02bf2b282d1a00ccfdb51c5
 2017-01-12 03:19:33 +00:00
Shijian Li
8e8ed2013c Sync the startConsentUiIfNeeded logics to master. We are missing the package name when starting the activity now. am: 5e7fc7ccc8 am: ae21066a59 
am: f8d62ca359

Change-Id: I4c4130790fbfc56cb952fc076fd2be611bf51b1f
 2017-01-12 03:19:25 +00:00
Shijian Li
b3e7f86997 Sync the startConsentUiIfNeeded logics to master. We are missing the package name when starting the activity now. am: 5e7fc7ccc8 am: 699e7878ef 
am: 7eed086b86

Change-Id: I33321847b4e945498bf4ca4c9840605cd9d31947
 2017-01-12 03:18:09 +00:00
Android Build Merger (Role)
8ec5d822c1 Merge "Sync the startConsentUiIfNeeded logics to master. We are missing the package name when starting the activity now. am: 5e7fc7ccc8 am: ae21066a59" into nyc-mr2-dev-plus-aosp 2017-01-12 03:13:09 +00:00
Shijian Li
f8d62ca359 Sync the startConsentUiIfNeeded logics to master. We are missing the package name when starting the activity now. am: 5e7fc7ccc8 
am: ae21066a59

Change-Id: I3033d6d64d35f2c9c1aafe003eef0860c1f78efc
 2017-01-12 03:12:17 +00:00
Shijian Li
7eed086b86 Sync the startConsentUiIfNeeded logics to master. We are missing the package name when starting the activity now. am: 5e7fc7ccc8 
am: 699e7878ef

Change-Id: I39aefb9af40cbe6a2cc833bf4e5e96890c0b13a4
 2017-01-12 03:12:17 +00:00
Shijian Li
699e7878ef Sync the startConsentUiIfNeeded logics to master. We are missing the package name when starting the activity now. 
am: 5e7fc7ccc8

Change-Id: I327673625deafc5c18319ce1b61734a090b6a989
 2017-01-12 03:07:23 +00:00
Shijian Li
ae21066a59 Sync the startConsentUiIfNeeded logics to master. We are missing the package name when starting the activity now. 
am: 5e7fc7ccc8

Change-Id: I4214dc072d3155cd417ee3577918570e515fa1cf
 2017-01-12 03:07:10 +00:00
TreeHugger Robot
c2d478b658 Merge "Remove libservicestestsjni" 2017-01-12 02:55:15 +00:00
Yifan Hong
ddbf138b80 Merge "BpBase -> BpHwBase" am: d8384b5c15 am: e0707f139d am: 860ef8810d 
am: be7a9b89f4

Change-Id: Iac121abc1603f4739a61b8efc6ce7361656d16ba
 2017-01-12 02:20:03 +00:00
Tim Murray
06fdb08b44 Merge "add additional logging to ActiityManagerService" into nyc-mr2-dev am: 0b7b79a882 
am: d8ecc93ca0

Change-Id: I89b73e795813f4ed251b8612d9058c5d20c30841
 2017-01-12 02:14:18 +00:00
Yifan Hong
be7a9b89f4 Merge "BpBase -> BpHwBase" am: d8384b5c15 am: e0707f139d 
am: 860ef8810d

Change-Id: I60bdcdd36defa739e346481aa3f3a46ac90ccf32
 2017-01-12 02:14:00 +00:00
Yifan Hong
860ef8810d Merge "BpBase -> BpHwBase" am: d8384b5c15 
am: e0707f139d

Change-Id: Iae97457100807d318f383eeaea4901f7ca10737e
 2017-01-12 02:08:36 +00:00