Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
277,024 Commits 3 Branches 0 Tags
29d7284285196c8ea24daa8ab345f82a1bc2a333
Commit Graph

277024 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colin Cross
29d7284285 Merge "Move libandroid_runtime headers into frameworks/base/core/jni" 
am: 541845908c

Change-Id: Ia15d168a42bd0290e7cdeb7d19c98210890ed095
 2016-12-16 08:57:55 +00:00
Colin Cross
7f63febbc4 Move libandroid_runtime headers into frameworks/base/core/jni 
am: 71044fe7e5

Change-Id: I70e7c0ca02a2783ab2c32a9d067ba75092fd81c6
 2016-12-16 08:57:51 +00:00
Treehugger Robot
541845908c Merge "Move libandroid_runtime headers into frameworks/base/core/jni" 2016-12-16 08:46:59 +00:00
Tamas Berghammer
736852e2c4 Merge "Install all files from the lib directory for debuggable apps" 
am: c0cc7c646c

Change-Id: Idc3b17fa4044ab0dd50fa141f1ec5ec8a47810b0
 2016-12-16 00:48:21 +00:00
Treehugger Robot
c0cc7c646c Merge "Install all files from the lib directory for debuggable apps" 2016-12-16 00:35:55 +00:00
Adrian Roos
d81fde40ef Merge "Assist app is not launched when long-pressing on Home key" 
am: 1e41bb4887

Change-Id: I3d88e9116c45cec013c4b7a3bb3f53480f0f2af6
 2016-12-16 00:01:24 +00:00
Adrian Roos
1e41bb4887 Merge "Assist app is not launched when long-pressing on Home key" 2016-12-15 23:51:12 +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
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
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
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
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
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
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
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
Colin Cross
71044fe7e5 Move libandroid_runtime headers into frameworks/base/core/jni 
Move libandroid_runtime's headers into its source directory, and export
them to modules that link against libandroid_runtime.  Also fixes
one unused-paramter warning that was hidden by the use of -isystem to
include frameworks/base/include.

Bug: 33630870
Test: m -j native
Change-Id: Id6c2561d6c7d82a7ca2d183f11b1d3d3dcb42843
 2016-12-14 13:35:40 -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
Treehugger Robot
e89ed4a001 Merge "Add an IPC for requesting network scores." 2016-12-14 19:47:48 +00:00
Treehugger Robot
f34bdf7676 Merge "Bluetooth: log message improvements" 2016-12-14 19:47:32 +00:00
Marie Janssen
cb21ad71ed Bluetooth: log message improvements 
Some log improvements:
 - Reduce logspam
 - Use names for states in logs instead of numbers
 - Be more consistent with messages

Also remove some commented out dead code.

Test: run on phone, observe more useful logs
Change-Id: I32163278e148be144c03d4e8aaf0eb761226c94c
 2016-12-14 09:51:30 -08:00
Jeremy Joslin
e7f273d508 Add an IPC for requesting network scores. 
Migrating the NetworkScoreManager.requestScores() method to use an
IPC rather than a broadcast.

Defined the new IPC in the AIDL files for NetworkScoreService and
NetworkRecommendationProvider. Added a no-op implementation in
NetworkScoreService and a full implementation in
NetworkRecommendationProvider (plus tests).

Test: adb shell am instrument -e class android.net.NetworkRecommendationProviderTest -w com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
BUG: 33593157
Change-Id: Iacf7b6d424ec3c57e8b89e5abc6bc3e8414097b9
Merged-In: I951f6186aa11ddbe5a94e374173a1fd40b2a4cce
 2016-12-14 09:11:29 -08:00
Marco Nelissen
01cb199bed Merge "Revert "Remove AmrInputStream"" 
am: e2d8581529

Change-Id: I55615b328bedf67819d076ccb21b9bc1f13a07a8
 2016-12-14 16:59:23 +00:00
Marco Nelissen
e2d8581529 Merge "Revert "Remove AmrInputStream"" 2016-12-14 16:44:47 +00:00
Marco Nelissen
a4efbf863b Revert "Remove AmrInputStream" 
This reverts commit 0c3518cc77.

Change-Id: I250d86d2d6ce462cb5f29bc6c312d88a49ac24a4
 2016-12-14 16:44:12 +00:00
Paul Duffin
884d3ca53b Merge "Copy core-junit files into legacy-test." 
am: 69e363f506

Change-Id: I95f3c2005e87f86f7014f6bf693eae7212f54a73
 2016-12-14 15:02:20 +00:00
Paul Duffin
98e609d556 Copy core-junit files into legacy-test. 
am: cd7c34d8bf

Change-Id: I672fa4b006b04db5a4c8f86793f1c891bc55754a
 2016-12-14 15:02:16 +00:00
Paul Duffin
69e363f506 Merge "Copy core-junit files into legacy-test." 2016-12-14 14:50:55 +00:00
Paul Duffin
cd7c34d8bf Copy core-junit files into legacy-test. 
The legacy-test directory contains part of the Android API and
so must maintain backwards compatibility. The junit classes that
are in the API are copied here to ensure that they do not change
when external/junit is upgraded.

Bug: 30188076
Test: make checkbuild and checked legacy-test contents
Change-Id: I6c263afc16c06abfd027334be51a41422239a189
 2016-12-14 14:19:08 +00:00
Paul Duffin
5d53a925a1 Merge "Copy junit-runner files into test-runner." 
am: 3e24af3eb7

Change-Id: I55ec07039052bf6030a16bfa0cbeedc8690809f7
 2016-12-14 13:35:44 +00:00