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

280273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
09583bdc88 Merge "Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev am: a586b546c3 am: 5109de9bd3" into nyc-mr2-dev-plus-aosp 2016-12-19 19:20:16 +00:00
Android Build Merger (Role)
e85cf6ef20 Merge "Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev am: a586b546c3 am: 63fb5ccc17" into nyc-mr2-dev-plus-aosp 2016-12-19 19:19:36 +00:00
Charles Mendis
a922beb6ec Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev am: a586b546c3 
am: 5109de9bd3

Change-Id: I831ab60727b0d7fa57d379c110f37e2442ba5e5e
 2016-12-19 19:19:19 +00:00
Android Build Merger (Role)
07ff764573 Merge "Fix OnCancelListener for Dialogs on swipe to dismiss. am: 67639a5f67 am: a2160c27f9" into nyc-mr2-dev-plus-aosp 2016-12-19 19:18:57 +00:00
Charles Mendis
174671b698 Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev am: a586b546c3 
am: 63fb5ccc17

Change-Id: Ifd33331fddf87c8b9349654aee0c78216a53561d
 2016-12-19 19:18:51 +00:00
Michael Kwan
34df02eec2 Fix OnCancelListener for Dialogs on swipe to dismiss. am: 67639a5f67 
am: a2160c27f9

Change-Id: I4b0ecf9f50e43c7026a52f767af1bc9717626148
 2016-12-19 19:17:56 +00:00
Michael Kwan
95ccfb0dcc Fix OnCancelListener for Dialogs on swipe to dismiss. am: 67639a5f67 
am: 5a0c0ffd03

Change-Id: Id8faa62cb551424036aae9f542f2d0776cfea522
 2016-12-19 19:17:48 +00:00
Charles Mendis
63fb5ccc17 Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev 
am: a586b546c3

Change-Id: Ib994cff58777ab8b33a0f1bf79d6bf4128556344
 2016-12-19 19:11:52 +00:00
Michael Kwan
5a0c0ffd03 Fix OnCancelListener for Dialogs on swipe to dismiss. 
am: 67639a5f67

Change-Id: I92bc472b3519020eeadf61b1e8047aee9e8bd96c
 2016-12-19 19:11:48 +00:00
Charles Mendis
5109de9bd3 Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev 
am: a586b546c3

Change-Id: I32b15e3ab326700434f488aad7f6e8f05bfa153e
 2016-12-19 19:11:47 +00:00
Michael Kwan
a2160c27f9 Fix OnCancelListener for Dialogs on swipe to dismiss. 
am: 67639a5f67

Change-Id: I8ceab83a3a8287bdf8d2a7ff88427404543755c9
 2016-12-19 19:11:45 +00:00
Charles Mendis
a586b546c3 Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev 2016-12-19 19:05:53 +00:00
Marie Janssen
75bb16acc7 Merge changes I546d7abc,I32163278 into nyc-mr2-dev 
am: df37f1fa74

Change-Id: I082c8d392bd693ec0cad019c24bc03829dd6bad0
 2016-12-19 19:01:03 +00:00
Marie Janssen
6b93f50989 Bluetooth: fix issues re-enabling after crash 
am: fa63068deb

Change-Id: I89c5253d284b64359c1abc5c078bcd69bedfc503
 2016-12-19 19:00:55 +00:00
Marie Janssen
5e9774c184 resolve merge conflicts of ffcf88f to nyc-mr2-dev-plus-aosp 
Change-Id: Ib8c2e6770448bda00c0d64b42ce0495049acb268
 2016-12-19 10:32:20 -08:00
Philipp Weiß
5c49897d8c Merge "DO NOT MERGE Add network logging icon to Quicksettings when enabled" into nyc-mr2-dev 
am: f84f98c4e2

Change-Id: I505fade40150c0a425ab44a292219cf071f10026
 2016-12-19 18:03:53 +00:00
phweiss
5edfd11bea DO NOT MERGE Add network logging icon to Quicksettings when enabled 
am: c94b637305

Change-Id: I227210c1d938b98bfb8b2a5f895b837fad1c6181
 2016-12-19 18:03:47 +00:00
Marie Janssen
df37f1fa74 Merge changes I546d7abc,I32163278 into nyc-mr2-dev 
* changes:
  Bluetooth: fix issues re-enabling after crash
  Bluetooth: log message improvements
 2016-12-19 17:58:43 +00:00
Philipp Weiß
f84f98c4e2 Merge "DO NOT MERGE Add network logging icon to Quicksettings when enabled" into nyc-mr2-dev 2016-12-19 17:57:16 +00:00
Daniel Sandler
946ae62dba Merge "Avoid NPE in notification inline controls." into nyc-mr2-dev 
am: be09dd77dc

Change-Id: I9dd8c496cb6e9fec63ba370d25faedbcd505dd13
 2016-12-19 16:50:18 +00:00
Dan Sandler
0f82af28ef Avoid NPE in notification inline controls. 
am: 6e54b889d0

Change-Id: I4d581b3d8e59bb9baa16199243b59aaa57d8fc7a
 2016-12-19 16:50:12 +00:00
Daniel Sandler
be09dd77dc Merge "Avoid NPE in notification inline controls." into nyc-mr2-dev 2016-12-19 16:44:12 +00:00
Michal Karpinski
5dcf480c0d Merge "Initialize AtomicBoolean for NetworkLogger#mIsLoggingEnabled" into nyc-mr2-dev 
am: bd510de4e9

Change-Id: I82c5e02fb4356465a738b2d7906b6894065e73ef
 2016-12-19 13:50:05 +00:00
Michal Karpinski
1ec95aaa26 Initialize AtomicBoolean for NetworkLogger#mIsLoggingEnabled 
am: a775ad997b

Change-Id: Iffda619c616ab804b97a837910ca55de4d283cf0
 2016-12-19 13:49:58 +00:00
TreeHugger Robot
bd510de4e9 Merge "Initialize AtomicBoolean for NetworkLogger#mIsLoggingEnabled" into nyc-mr2-dev 2016-12-19 13:43:10 +00:00
Hugo Benichi
2cb7bad13e Merge changes I1450c126,I8926a922,I54403377,Idf216797 into nyc-mr2-dev 
am: 85f3996d72

Change-Id: Ia780475dbbd9ebd58f5bcc9cefa74108f48ca53b
 2016-12-19 08:40:43 +00:00
Hugo Benichi
e55546a127 DO NOT MERGE IP Connectivity metrics: add connect() statistics 
am: 2299a1c401

Change-Id: I7ad93b1b3a3446ffd6dce7c0799ddb9a2b43955f
 2016-12-19 08:40:37 +00:00
Hugo Benichi
6b480eca3f DO NOT MERGE Fix IP connectivity metrics tests 
am: 93c0de0a35

Change-Id: Ia6a28b09263729caa72786062e134f8c684e3ccb
 2016-12-19 08:39:55 +00:00
Hugo Benichi
3fc3dc2602 DO NOT MERGE IP connectivity metrics: introduce ConnectStatistics and DNS statistics 
am: 097bde6c8f

Change-Id: Ibe6d3945cda64f55c6aab7ef4fc4a6cd8a6daf05
 2016-12-19 08:38:54 +00:00
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
85f3996d72 Merge changes I1450c126,I8926a922,I54403377,Idf216797 into nyc-mr2-dev 
* changes:
  DO NOT MERGE IP Connectivity metrics: add connect() statistics
  DO NOT MERGE Fix IP connectivity metrics tests
  DO NOT MERGE IP connectivity metrics: introduce ConnectStatistics and DNS statistics
  DO NOT MERGE IP connectivity metrics: add transport field.
 2016-12-19 08:31:17 +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