drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
278,634 Commits 1 Branch 0 Tags
Commit Graph

278634 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shinji Sogo
80fba49386 Merge "[HS2.0] Need to compare with not only FQDN but SSID" am: 69e7f9683d 
am: e67395a97a

Change-Id: Idff19dcb2c95c4f8b359863fe8545fc478040723
 2016-12-15 23:04:21 +00:00
Shinji Sogo
e67395a97a Merge "[HS2.0] Need to compare with not only FQDN but SSID" 
am: 69e7f9683d

Change-Id: I7ce35b895d24b013169aa30b794fb524bac09990
 2016-12-15 22:32:03 +00:00
Treehugger Robot
69e7f9683d Merge "[HS2.0] Need to compare with not only FQDN but SSID" 2016-12-15 22:17:48 +00:00
Michael Kwan
106821edfe Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev 
am: 738fb65657

Change-Id: Ica017f0a0490c522777f20e38b7db16872ccc615
 2016-12-15 21:16:19 +00:00
Michael Kwan
3707030cf5 Fix swipe-to-dismiss to properly react to swipe gestures. 
am: 8a9b27773b

Change-Id: If7040c0f1cc71edcc16021b4825fb5d1d6fbdecf
 2016-12-15 21:16:15 +00:00
Michael Kwan
738fb65657 Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev 2016-12-15 21:09:57 +00:00
Martijn Coenen
370815ef62 Merge "HwBinder: Remove use of IHw class." am: 11ec22ab2a 
am: df296fe1fa

Change-Id: I1c1069b5d2c1452f1cc9ee33725c3fa8f541966c
 2016-12-15 20:47:05 +00:00
dcashman
33d3d19235 Merge "Split mac_permissions.xml into plat and non-plat components." am: a1c9c860a9 
am: 455202b9db

Change-Id: I2a314f827db34cc92058729629d9000526b43027
 2016-12-15 20:45:55 +00:00
dcashman
46d6966f43 Split mac_permissions.xml into plat and non-plat components. am: b1cc4f8ca4 
am: 2a7ce100b7

Change-Id: I9d0e0f824fdc26c64d41f97b370f7483b63b97c5
 2016-12-15 20:41:14 +00:00
Martijn Coenen
df296fe1fa Merge "HwBinder: Remove use of IHw class." 
am: 11ec22ab2a

Change-Id: Icbeb3bb7548b00c5e28f689c761a4de425e1bd74
 2016-12-15 20:38:07 +00:00
dcashman
455202b9db Merge "Split mac_permissions.xml into plat and non-plat components." 
am: a1c9c860a9

Change-Id: I11397c898e5cf7b0dd4a300646b409d28eb00b59
 2016-12-15 20:32:54 +00:00
Martijn Coenen
11ec22ab2a Merge "HwBinder: Remove use of IHw class." 2016-12-15 20:28:49 +00:00
dcashman
2a7ce100b7 Split mac_permissions.xml into plat and non-plat components. 
am: b1cc4f8ca4

Change-Id: I4c3d3a9c088c4cfc75f5503966390030e1375305
 2016-12-15 20:27:27 +00:00
Treehugger Robot
a1c9c860a9 Merge "Split mac_permissions.xml into plat and non-plat components." 2016-12-15 20:13:28 +00:00
Phil Weaver
278782f275 Add null check to a11y interrupt. 
am: 74f9e1b867

Change-Id: I51bcf42327f30a0c6b1dc7666a5c057d44eec98c
 2016-12-15 19:05:00 +00:00
dcashman
b1cc4f8ca4 Split mac_permissions.xml into plat and non-plat components. 
Bug: 31363362
Test: Bullhead and Sailfish both build and boot without new denials.
Change-Id: Ic9523ce4b0755d6c585548f4f2b1f00e7000195b
 2016-12-15 10:04:38 -08:00
Erik Kline
62c1d307e3 Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity." am: 80ff5ecd4a 
am: cdcc931d93

Change-Id: Ib46bdab897cef221f4c22326e562130822d42298
 2016-12-15 12:28:41 +00:00
Erik Kline
cdcc931d93 Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity." 
am: 80ff5ecd4a

Change-Id: If85702e1cc44967841ab91d723aa627862bcda21
 2016-12-15 12:22:06 +00:00
Erik Kline
80ff5ecd4a Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity." 2016-12-15 12:10:17 +00:00
Joachim Sauer
c066d73c32 Merge "API updated for ICU4J 58.1" am: 9e3b160fc3 
am: d20aebb443

Change-Id: Ib3ddf7441306adca048e2ef5c6cda31bb2543df6
 2016-12-15 11:39:37 +00:00
Joachim Sauer
d20aebb443 Merge "API updated for ICU4J 58.1" 
am: 9e3b160fc3

Change-Id: If8d8b9708217442bf23f092ef2e1bfd235926aff
 2016-12-15 11:24:52 +00:00
Joachim Sauer
9e3b160fc3 Merge "API updated for ICU4J 58.1" 2016-12-15 11:16:41 +00:00
Erik Kline
ade3a8ccb0 Have IpManager track L2-L4 signaling traffic required for IP connectivity. 
Test: as follows
    - built and flashed
    - observed logcat
    - observed "dumpsys wifi ipmanager"
    - runtest BlockingSocketReaderTest passes
    - runtest ConnectivityPacketSummaryTest passes
Bug: 21859053
Bug: 26101306
Bug: 31742572
Bug: 31707128
Bug: 33531488

Change-Id: Ibecaf809dcc1813924b25749e8ba8eb2d4bdf114
 2016-12-15 19:09:49 +09:00
Phil Weaver
74f9e1b867 Add null check to a11y interrupt. 
Also adding same robustness to interrupt that we have for
sending a11y events.

Bug: 32507871

Test: Ran a11y CTS. Verified manually with sample app
that sends interrupt and accessibility service that
crashes when started. That case used to crash the
app, and doesn't anymore.
Change-Id: I5cf05dcbb54ea23ae876cb3258dd206c55dce775
(cherry picked from commit 867ad35d9c676b5ba2047b0fc9a4006737e5c4aa)
 2016-12-15 08:06:15 +00:00
Colin Cross
b9743aa650 Merge changes I4968d5aa,Ieb34d79a,Idc073536 am: c2f9ae35e6 
am: 4379639606

Change-Id: I1d29954997012b2ac435dab96486175a40cd65a8
 2016-12-15 07:18:02 +00:00
Colin Cross
6b629b7f38 Move hwui private headers to frameworks/base/libs/hwui/private am: 19def9943a 
am: 174d150673

Change-Id: I0d97c3bc96c0beebc5988e4dca22ba4d5d1f982c
 2016-12-15 07:16:31 +00:00
Colin Cross
791d02818a Convert libstorage to Android.bp am: 3ac2be93a9 
am: f12ae4bed7

Change-Id: I1255ee2b166b73a79b19035d59994204bb268c82
 2016-12-15 07:15:32 +00:00
Colin Cross
f142640afb Move libstorage includes into frameworks/base/lib/storage am: e78f853e46 
am: afef87b1ba

Change-Id: Iff9c41710528af37a788973ac4a1080024808c95
 2016-12-15 07:14:32 +00:00
Colin Cross
4379639606 Merge changes I4968d5aa,Ieb34d79a,Idc073536 
am: c2f9ae35e6

Change-Id: Icd7cc5949d1388a5f928561dc0eea8a7df91b1b9
 2016-12-15 07:01:01 +00:00
Colin Cross
174d150673 Move hwui private headers to frameworks/base/libs/hwui/private 
am: 19def9943a

Change-Id: Ic26ef842f58a9db61e7ee12b3d4d858fc24cfbc8
 2016-12-15 07:00:54 +00:00
Colin Cross
f12ae4bed7 Convert libstorage to Android.bp 
am: 3ac2be93a9

Change-Id: Ia1d78149bfedcc7e8959d557ac3a239a77c04924
 2016-12-15 07:00:07 +00:00
Colin Cross
afef87b1ba Move libstorage includes into frameworks/base/lib/storage 
am: e78f853e46

Change-Id: Icac09a62152f11cf7a8d5ce5ffe9011949e17ec0
 2016-12-15 06:59:18 +00:00
Treehugger Robot
c2f9ae35e6 Merge changes I4968d5aa,Ieb34d79a,Idc073536 
* changes:
  Move hwui private headers to frameworks/base/libs/hwui/private
  Convert libstorage to Android.bp
  Move libstorage includes into frameworks/base/lib/storage
 2016-12-15 06:49:35 +00:00
Erik Kline
7074b562d9 Merge "More correct startup and shutdown procedures." am: 618d4215a2 
am: b6588f9a41

Change-Id: I8a2bcab3b9373d2573601fa3bffa123020b3fbae
 2016-12-15 05:32:50 +00:00
Erik Kline
b6588f9a41 Merge "More correct startup and shutdown procedures." 
am: 618d4215a2

Change-Id: I4844130b04ded0fc913593081d07a6052bdc0e42
 2016-12-15 05:25:48 +00:00
Treehugger Robot
618d4215a2 Merge "More correct startup and shutdown procedures." 2016-12-15 05:10:11 +00:00
Erik Kline
c8585b9742 More correct startup and shutdown procedures. 
During IpManager startup, anything sending messages to the state machine
must not begin doing so until after the state machine has been started.
Reorder the constructor accordingly.

During shutdown, AvoidBadWifiTracker needs to unregister the registered
BroadcastReceiver and might as well also unregister the ContentObserver.

Test: backport from internal
Bug: 33388922
Change-Id: I58e07f7ccddaab160c153bcfb69fd45f50bb8710
 2016-12-15 10:43:41 +09:00
George Burgess IV
85785b557a Merge "Fix a memory leak." am: 1715678a89 
am: 8f9c005fa9

Change-Id: I29afa8d1394feb57574ed527cda102405571fd65
 2016-12-14 23:41:26 +00:00
George Burgess IV
8f9c005fa9 Merge "Fix a memory leak." 
am: 1715678a89

Change-Id: Ia005c534ef0e62e3efd6f59954cd2850349c7672
 2016-12-14 23:34:23 +00:00
Treehugger Robot
1715678a89 Merge "Fix a memory leak." 2016-12-14 23:23:52 +00:00
Hall Liu
60cb82e8e6 Merge "Add ability to set supported audio routes on phone accounts and connection" am: d11261dcc9 
am: 32e98d2f45

Change-Id: I0741edc2b35b7c57cbde338c4617791d1d089137
 2016-12-14 23:23:21 +00:00
Jeremy Joslin
a00fda5311 Merge "Add an IPC for requesting network scores." am: e89ed4a001 
am: 724b26c902

Change-Id: If6284c934cd47257367c614523d4928758ab34e1
 2016-12-14 23:22:15 +00:00
Marie Janssen
f2fc15824d resolve merge conflicts of 7a2518e to nyc-mr1-dev-plus-aosp 
Change-Id: I903680717ed121a93fee3b7c2ed358cb29726d71
 2016-12-14 13:44:28 -08:00
Colin Cross
19def9943a Move hwui private headers to frameworks/base/libs/hwui/private 
hwui already exports most of its headers, move its private headers
into its source directory.

Bug: 33630870
Test: m -j native
Change-Id: I4968d5aaaa68d9e92c826841d20f29cef349c9d8
 2016-12-14 13:35:40 -08:00
Colin Cross
3ac2be93a9 Convert libstorage to Android.bp 
See build/soong/README.md for more information.

Test: m -j native
Change-Id: Ieb34d79af10e4e7cd146d0d40fd6946499dd1da0
 2016-12-14 13:28:56 -08:00
Colin Cross
e78f853e46 Move libstorage includes into frameworks/base/lib/storage 
Move the libstorage includes out of the global include path and into
frameworks/base/lib/storage/include, and export it.

Bug: 33630870
Test: m -j native
Change-Id: Idc0735360abc703496b9bc46d1a76ce8039af0d1
 2016-12-14 13:28:46 -08:00
Hall Liu
32e98d2f45 Merge "Add ability to set supported audio routes on phone accounts and connection" 
am: d11261dcc9

Change-Id: I002d1d32e6c0fb69c99047a19ca07f4326ec5323
 2016-12-14 20:03:54 +00:00
Jeremy Joslin
724b26c902 Merge "Add an IPC for requesting network scores." 
am: e89ed4a001

Change-Id: I23bee3f29d3b3f71da6103e23afafc2df128ab75
 2016-12-14 20:02:45 +00:00
Marie Janssen
7a2518ee6e Merge "Bluetooth: log message improvements" 
am: f34bdf7676

Change-Id: Ic89c59257559d95119829fa4157dbb763124e86f
 2016-12-14 20:01:39 +00:00
Hall Liu
d11261dcc9 Merge "Add ability to set supported audio routes on phone accounts and connection" 2016-12-14 19:55:00 +00:00