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

280234 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hugo Benichi
66346ab78c DO NOT MERGE IP connectivity metrics: add transport field. 
am: 4c9d3f19cd

Change-Id: I1e6b0f9e7b8f2e2808d85e302fdd3ca1dc4d5a41
 2016-12-19 08:38:10 +00:00
Hugo Benichi
58b3f35e9f Merge changes Iadf7f15d,I74702938,Ib8a725cd into nyc-mr2-dev 
am: 05d36569b6

Change-Id: I09bbd93408e2de8b4ce159a7b22d3650a04ba081
 2016-12-19 08:29:30 +00:00
Hugo Benichi
7f907b0341 DO NOT MERGE Network notifications: revamp keying scheme 
am: 84daaea8fd

Change-Id: Ibad7d0210b2c69826462b781f43a82d65849ebfb
 2016-12-19 08:29:23 +00:00
Hugo Benichi
4778249ab0 DO NOT MERGE Define Network notification proto constants. 
am: 065acc5a6c

Change-Id: Ic1bb6306d6a0f2e5a764abb1834f75ad796c9f28
 2016-12-19 08:29:16 +00:00
Hugo Benichi
04507a635b DO NOT MERGE Unit tests for NetworkNotificationManager 
am: d3da17a260

Change-Id: I873ea4a5625c526d61017967604305ada548f907
 2016-12-19 08:29:11 +00:00
Hugo Benichi
05d36569b6 Merge changes Iadf7f15d,I74702938,Ib8a725cd into nyc-mr2-dev 
* changes:
  DO NOT MERGE Network notifications: revamp keying scheme
  DO NOT MERGE Define Network notification proto constants.
  DO NOT MERGE Unit tests for NetworkNotificationManager
 2016-12-19 08:25:32 +00:00
Hugo Benichi
7f58ca8af4 Merge "DO NOT MERGE Netd events: record connect() success/errno" into nyc-mr2-dev 
am: 64bc2580e3

Change-Id: I24ab257a4f9646edf25bde3c95f31b88ff35aa48
 2016-12-19 06:00:34 +00:00
Hugo Benichi
2f30e611eb DO NOT MERGE Netd events: record connect() success/errno 
am: e8fe0aaab9

Change-Id: Ia9d271d4dac362e930c7c3463bdbafd9a85ca739
 2016-12-19 06:00:28 +00:00
Hugo Benichi
64bc2580e3 Merge "DO NOT MERGE Netd events: record connect() success/errno" into nyc-mr2-dev 2016-12-19 05:55:26 +00:00
Hugo Benichi
403ea607a5 Captive portals: login activity probes like NetworkMonitor 
am: cdf3ba48cc

Change-Id: Ie85df7dd734b872cc361d0820edbfffc928f9f3a
 2016-12-19 02:07:41 +00:00
Hugo Benichi
cdf3ba48cc Captive portals: login activity probes like NetworkMonitor 
This patch changes CaptivePortalLoginActivity captive portal test to be
consistent with NetworkMonitor by:
 - using Network.java to open the http connection.
 - adding a UserAgent property to the request header.

Test: manually tested.
Bug: 32369183
Change-Id: I33cbcdab9809c712d998da6d925bdd4e3093f8ff
 2016-12-19 09:19:13 +09:00
Michael Rosenfeld
bf5546b1e2 Merge "Clean up local hprofs" am: 9ab94e15c7 am: 1876d82450 
am: 67fd9f3968

Change-Id: I8eaea581cfda4844c3ea81f7ee63f0cfc40ef3e0
 2016-12-18 00:28:42 +00:00
Marie Janssen
02daba1e72 Merge "Bluetooth: fix issues re-enabling after crash" am: e2c22e38d5 am: ff0d3e1c8d -s ours 
am: 7fd7bc57ee

Change-Id: I711edb691cd0cbbd4c5f52d4ebdc27fd7adb2d26
 2016-12-18 00:24:42 +00:00
Michael Rosenfeld
67fd9f3968 Merge "Clean up local hprofs" am: 9ab94e15c7 
am: 1876d82450

Change-Id: I16c2e27c21d933e6090adb48af144c731a2c8ac6
 2016-12-18 00:21:19 +00:00
Marie Janssen
7fd7bc57ee Merge "Bluetooth: fix issues re-enabling after crash" am: e2c22e38d5 
am: ff0d3e1c8d  -s ours

Change-Id: I5e891c190c1c86d33176f83a2e92ce807af45472
 2016-12-18 00:20:18 +00:00
Android Build Merger (Role)
21014b81be Merge "docs: Add deprecation message for the developer.android.com docs am: b9bd6cca9e am: 045ae0458a am: e161f75d38 am: 536dc4ecc4 am: 206d947de9" into nyc-mr2-dev-plus-aosp 2016-12-17 05:10:35 +00:00
Joe Fernandez
88136284e2 docs: Add deprecation message for the developer.android.com docs am: b9bd6cca9e am: 045ae0458a am: e161f75d38 am: 536dc4ecc4 
am: 206d947de9

Change-Id: I56fe38f6bb41a9ddc17b197a1284361600443d23
 2016-12-17 05:09:40 +00:00
Joe Fernandez
4c7e06b361 docs: Add deprecation message for the developer.android.com docs am: b9bd6cca9e am: 045ae0458a am: e161f75d38 am: 536dc4ecc4 
am: bd7fab30dc

Change-Id: I1764cf01406aa25d009df76ce4e76e1763ab1be7
 2016-12-17 05:09:37 +00:00
Joe Fernandez
206d947de9 docs: Add deprecation message for the developer.android.com docs am: b9bd6cca9e am: 045ae0458a am: e161f75d38 
am: 536dc4ecc4

Change-Id: I431cc25fd1658a08497c562abefa05f55df9382f
 2016-12-17 04:59:06 +00:00
Joe Fernandez
bd7fab30dc docs: Add deprecation message for the developer.android.com docs am: b9bd6cca9e am: 045ae0458a am: e161f75d38 
am: 536dc4ecc4

Change-Id: I00433f2c53c4ae494082ce21a4edb63717347906
 2016-12-17 04:59:05 +00:00
Joe Fernandez
536dc4ecc4 docs: Add deprecation message for the developer.android.com docs am: b9bd6cca9e am: 045ae0458a 
am: e161f75d38

Change-Id: I622c23e61f4e8db5a51a9d2425cc1fe379ec9505
 2016-12-17 04:48:04 +00:00
Joe Fernandez
e161f75d38 docs: Add deprecation message for the developer.android.com docs am: b9bd6cca9e 
am: 045ae0458a

Change-Id: I2257467a9b263897d2af594720de61d29a982709
 2016-12-17 04:37:05 +00:00
Joe Fernandez
045ae0458a docs: Add deprecation message for the developer.android.com docs 
am: b9bd6cca9e

Change-Id: I3ba7d4519c491bdf09836f096106b4a6bc52e116
 2016-12-17 04:26:02 +00:00
Android Build Merger (Role)
89bf2239de Merge "[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am: c3db570a00 -s ours am: c91845f753 am: 5034efbaf3 am: 0dca3a2fba am: 5857a47008" into nyc-mr2-dev-plus-aosp 2016-12-17 04:05:28 +00:00
Svet Ganov
a3044b0214 [DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am: c3db570a00 -s ours am: c91845f753 am: 5034efbaf3 am: 0dca3a2fba 
am: 5857a47008

Change-Id: Idfc7dbcdc5dea568f07b2b47c9cbedb176527fb4
 2016-12-17 04:04:35 +00:00
Svet Ganov
c2181a63e0 [DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am: c3db570a00 -s ours am: c91845f753 am: 5034efbaf3 am: 0dca3a2fba 
am: d10857f210

Change-Id: Ibb218fa69c45aa9404be89a7f5394023395417b1
 2016-12-17 04:04:31 +00:00
Svet Ganov
d10857f210 [DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am: c3db570a00 -s ours am: c91845f753 am: 5034efbaf3 
am: 0dca3a2fba

Change-Id: Ifd62443464dfa77b022552a1fada1288cfd42afe
 2016-12-17 03:54:05 +00:00
Svet Ganov
5857a47008 [DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am: c3db570a00 -s ours am: c91845f753 am: 5034efbaf3 
am: 0dca3a2fba

Change-Id: Ieb84f199c9cfe49045dc969a3c9a620037e7587a
 2016-12-17 03:54:00 +00:00
Svet Ganov
0dca3a2fba [DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am: c3db570a00 -s ours am: c91845f753 
am: 5034efbaf3

Change-Id: I22c38f921047ba7ecea5826701e3024de9a3d110
 2016-12-17 03:42:58 +00:00
Svet Ganov
5034efbaf3 [DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am: c3db570a00 -s ours 
am: c91845f753

Change-Id: Ia85d2855dd8360b94fecb4bf6cd280ea4518d0e1
 2016-12-17 03:32:01 +00:00
Svet Ganov
c91845f753 [DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file 
am: c3db570a00  -s ours

Change-Id: I63b03cd2b057f95aefab23cdb4a29766ec304544
 2016-12-17 03:21:28 +00:00
Android Build Merger (Role)
1784848976 Merge "Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am: 88e64bb739 am: 1474527789 am: 760d127583" into nyc-mr2-dev-plus-aosp 2016-12-17 02:40:26 +00:00
Android Build Merger (Role)
60dbafb19c Merge "Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am: 88e64bb739 am: 1474527789 am: 68b2be6105" into nyc-mr2-dev-plus-aosp 2016-12-17 02:39:49 +00:00
Mark Lu
dc031941bf Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am: 88e64bb739 am: 1474527789 
am: 760d127583

Change-Id: I066d9f922e4e0b6baad2ce9b6be72e8435f7fc0a
 2016-12-17 02:39:39 +00:00
Android Build Merger (Role)
38dbcd1997 Merge "docs: update description for BitmapFactory.Options#inBitmap am: a8f4286272 am: 58d24b22ed am: c9328c18a4" into nyc-mr2-dev-plus-aosp 2016-12-17 02:39:17 +00:00
Mark Lu
ce2d5723cb Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am: 88e64bb739 am: 1474527789 
am: 68b2be6105

Change-Id: I51f8ea1b15702094cfb9b3761bbeaf3f3ed4022b
 2016-12-17 02:39:07 +00:00
Mark Lu
1c64c32051 docs: update description for BitmapFactory.Options#inBitmap am: a8f4286272 am: 58d24b22ed 
am: c9328c18a4

Change-Id: Ia793ab899b7c8a30e79244337efc39d779f9c92f
 2016-12-17 02:38:23 +00:00
Mark Lu
f34e9fc48d docs: update description for BitmapFactory.Options#inBitmap am: a8f4286272 am: 58d24b22ed 
am: 2b77de3a44

Change-Id: Icc0b43048f14108b95a580f1aed3f595b16fc441
 2016-12-17 02:37:58 +00:00
Mark Lu
760d127583 Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am: 88e64bb739 
am: 1474527789

Change-Id: I9ec8192fcf3bf3fa180e471648894d6b2e51abc9
 2016-12-17 02:29:43 +00:00
Mark Lu
68b2be6105 Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am: 88e64bb739 
am: 1474527789

Change-Id: I0bf163508c4e936b2876cfdab59b47e1b3740f09
 2016-12-17 02:29:14 +00:00
Mark Lu
c9328c18a4 docs: update description for BitmapFactory.Options#inBitmap am: a8f4286272 
am: 58d24b22ed

Change-Id: I0420f0eba2d7d99b0c19aad72082b53dca3ac00e
 2016-12-17 02:28:31 +00:00
Mark Lu
2b77de3a44 docs: update description for BitmapFactory.Options#inBitmap am: a8f4286272 
am: 58d24b22ed

Change-Id: I8e3a23304924623e2379155dcc7df1f739a5b7f0
 2016-12-17 02:28:22 +00:00
Joe Fernandez
b9bd6cca9e docs: Add deprecation message for the developer.android.com docs 
Change-Id: Ia091df49099482696abbc3a596cf1787ca904d67
 2016-12-16 18:20:56 -08:00
Mark Lu
1474527789 Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev 
am: 88e64bb739

Change-Id: Idcaf2dabd54d5fc07cce825e44237ddb3fc0e51f
 2016-12-17 02:19:55 +00:00
Mark Lu
58d24b22ed docs: update description for BitmapFactory.Options#inBitmap 
am: a8f4286272

Change-Id: I163f1f5f8a9d688407aa7c0d76895bf18efa3430
 2016-12-17 02:19:51 +00:00
Justin Klaassen
0169932c51 Merge "Reset BatteryStats when too large for clients to handle" into nyc-mr2-dev 
am: 868a859fd7

Change-Id: I3d9dfe36dbc2261e0390695940602769cfcc46cb
 2016-12-17 02:11:02 +00:00
Adam Lesinski
66c7e9c20e Reset BatteryStats when too large for clients to handle 
am: 45489787d7

Change-Id: Ie90ad79b71198d0fe0ead12048aec9bf6658a35a
 2016-12-17 02:10:57 +00:00
Michael Rosenfeld
1876d82450 Merge "Clean up local hprofs" 
am: 9ab94e15c7

Change-Id: Ie99cc29ef321ec7276535b28ae4b7eaf828410da
 2016-12-17 02:10:53 +00:00
Mark Lu
88e64bb739 Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev 2016-12-17 02:04:28 +00:00
Justin Klaassen
868a859fd7 Merge "Reset BatteryStats when too large for clients to handle" into nyc-mr2-dev 2016-12-17 02:00:26 +00:00