Jaewan Kim
2cfbc8e56c
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am: 5b05226586 am: b38fbf9894 am: 84ecab6059 -s ours am: 5ac79fa0a1 -s ours am: 890f53a486 am: 1bf809c490 am: 6ad7c0f6ce -s ours am: 1c278e5652 am: bed7636243 am: dd883c7e87 am: 832179120f -s ours am: c547eeda12 am: f91952879c am: dcbae98c53
...
am: 1efb02564f
Change-Id: I972d8fcb51e964c2e92b3caa9573c17e2f56c4ef
2016-09-23 00:05:17 +00:00
Christopher Wiley
531348c37a
Remove WifiManager#get/setFrequencyBand am: 79ec1736be am: a7394a4a70
...
am: af51ffe814
Change-Id: Id522f1b468f7f83484db4b3a039648cf3ca19d9c
2016-09-23 00:04:50 +00:00
Jaewan Kim
8138b50f3c
Merge "DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27 am: 9477c1674c am: 27d24e01cb -s ours am: 8dffbcd169 -s ours am: f140f796ea am: 7eaeeb49bb am: 7ffaaca237 -s ours am: fa9983ec73 am: 900d1c90b3 am: 0e31d93890 am: 4da22f27f6 -s ours am: 36068a2f00 am: 949c938317" into nyc-mr1-dev am: 02b5a0579b
...
am: 7fa39d2a05
Change-Id: I20eac58cf712ecfa6e36781e90ddbcc305e5c284
2016-09-23 00:04:24 +00:00
Jaewan Kim
ecbf83a7cd
DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27 am: 9477c1674c am: 27d24e01cb -s ours am: 8dffbcd169 -s ours am: f140f796ea am: 7eaeeb49bb am: 7ffaaca237 -s ours am: fa9983ec73 am: 900d1c90b3 am: 0e31d93890 am: 4da22f27f6 -s ours am: 36068a2f00 am: 949c938317 am: 55aed3d49a
...
am: dec08ca8d0
Change-Id: I3ebb746bb85892ceaf84a79ea0080af82d3d2220
2016-09-23 00:03:26 +00:00
Chris Tate
6e0ba2915b
Merge "Fix crash in clearWallpaper()" into nyc-mr1-dev am: bd2a00f848
...
am: 5943fec2fb
Change-Id: I29fabb3f1752b2235c331753a9152e994bcc254c
2016-09-23 00:02:26 +00:00
Christopher Tate
150b5dbcc2
Fix crash in clearWallpaper() am: a2bd512034
...
am: 2a8f8f008c
Change-Id: Ia73abd24d04d68c4895da8861a42af8f5887ef4c
2016-09-23 00:01:30 +00:00
Christopher Wiley
4fd00327fd
Merge changes from topic 'remove-set-frequency-band' am: 430904a4ab
...
am: 5135fb8f04
Change-Id: I949e65bb49ab35d01f41f9ff8df74c2a735c8675
2016-09-22 23:59:48 +00:00
Wale Ogunwale
f771caf25c
Merge "Don't take app screenshot in minimize docked stack." into nyc-mr1-dev am: b495cca72b
...
am: a4f8057e3e
Change-Id: Idc10f1a0c5dbfbd531cf5563cdfd96adbdb2e60c
2016-09-22 23:59:40 +00:00
Christopher Wiley
a04b2b5f36
Remove ability to set frequency from WifiAssociationTest am: 93ce63760d
...
am: 4bec7b53b0
Change-Id: I53df1fdc9bd9fb748756a5b75d9cf0063d9e443c
2016-09-22 23:58:52 +00:00
Wale Ogunwale
cdaf9eab60
Don't take app screenshot in minimize docked stack. am: f5d1e35316
...
am: 7cc8d16746
Change-Id: Iab869dbc4cbab32c3afb28f0dd76636c1eb229d5
2016-09-22 23:58:52 +00:00
Christopher Wiley
af51ffe814
Remove WifiManager#get/setFrequencyBand am: 79ec1736be
...
am: a7394a4a70
Change-Id: Ia990b8c209bf7002830f5147d2435a5151ed85f7
2016-09-22 23:57:42 +00:00
Chris Tate
b5e5be2fa9
Merge "Add hidden intent extra about service availability" into nyc-mr1-dev am: 0bb29a8981
...
am: 28b7d9b2fa
Change-Id: Id01bf9c5f6976a4b9b2ba4f72fe69f9537a14ebd
2016-09-22 23:57:23 +00:00
Christopher Tate
fd2173ed83
Add hidden intent extra about service availability am: 38c9c30640
...
am: 588729f07d
Change-Id: I9b3a2f4713a23954fa5a7b01e0d0d8297325180a
2016-09-22 23:56:05 +00:00
Ajay Panicker
131262992b
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am: c119a677c4 am: 35d1b45b0f am: dc0f9fa9c9 -s ours am: 8919cc83bb -s ours am: 0241b6d88a am: 0fee65e58b am: 08fed21f2c -s ours am: 0029d03c0a am: afeaced48f am: 2a214fc5f2 am: 0ec10c8fdc -s ours am: 916552b0c9 am: b937fdbbe8 am: d2ea0ff0cf
...
am: eb90b6f735
Change-Id: Ib1f7e8787c2b02699172d6e8c377f6e92b872dc4
2016-09-22 23:53:07 +00:00
Christopher Wiley
5135fb8f04
Merge changes from topic 'remove-set-frequency-band'
...
am: 430904a4ab
Change-Id: Iadf94f5e95f9a53c03115a44594f32aba21ecb4f
2016-09-22 23:52:02 +00:00
Winson
e124f9c558
Merge "Defer launching next task until after first layout." into nyc-mr1-dev am: a9375fef09
...
am: 307caf4f30
Change-Id: Ia7ffabafdfaad056a555bbfdc34744ef7ecf8650
2016-09-22 23:51:59 +00:00
Christopher Wiley
4bec7b53b0
Remove ability to set frequency from WifiAssociationTest
...
am: 93ce63760d
Change-Id: I334fde9e45a6ca6bba6e6a2ec5d9f68f52e31e03
2016-09-22 23:51:57 +00:00
Winson
ce5dc9236f
Defer launching next task until after first layout. am: bd53a314f4
...
am: 6dcd21e5da
Change-Id: If5fe8dbe4dc0d71cc7b1c4bf19572576bdd8c978
2016-09-22 23:51:15 +00:00
Christopher Wiley
a7394a4a70
Remove WifiManager#get/setFrequencyBand
...
am: 79ec1736be
Change-Id: I9b5b298fc3e47e77a59701e7f9d4dc18680f12b8
2016-09-22 23:50:58 +00:00
Robert Carr
3c0b58f486
Merge "Avoid entering display freeze mode when using seamless rotation." into nyc-mr1-dev am: 7184f8804f
...
am: 872a5fbd5f
Change-Id: Ib3ef052b296538370fb0205707b1a5ea681d7274
2016-09-22 23:50:21 +00:00
Robert Carr
668ac753fc
Avoid entering display freeze mode when using seamless rotation. am: 73a1fa7f2c
...
am: 95e413c781
Change-Id: I23312039e0e4df9ee1787ab7f5808e84070a2adf
2016-09-22 23:49:29 +00:00
Robert Carr
3fb89f35a0
Merge "Fix animation glitch with overlapping orientation changes." into nyc-mr1-dev am: 2ff503b002
...
am: 44a71dd7f6
Change-Id: If74a1846f17735413fd5c84a4e8832d5da277c4d
2016-09-22 23:48:27 +00:00
Robert Carr
022505eb69
Fix animation glitch with overlapping orientation changes. am: 42769fff6f
...
am: f7f12caa73
Change-Id: I708dfaf3186798615222a83c8e61fea609c150e0
2016-09-22 23:47:25 +00:00
Winson
517c0c4516
Merge "Fixing index bounds exception when TaskViews are added while dismissing." into nyc-mr1-dev am: 48d24389cb
...
am: 855f170a01
Change-Id: Iba019ab9b881b57733e9ee450d29cb570d858451
2016-09-22 23:46:23 +00:00
Hugo Benichi
e5a794a2f1
Merge "Add ipconnectivity.proto to services jar" into nyc-mr1-dev
...
am: 239f78a455
Change-Id: I97551513b789471964f637fe1e03784fbba1b246
2016-09-22 23:46:20 +00:00
Hugo Benichi
446a3847b4
Add ipconnectivity.proto to services jar
...
am: 50a84c6210
Change-Id: I3bcaaa4c31aa54dfde8453023c91510d072823a8
2016-09-22 23:46:18 +00:00
Jaewan Kim
bc0d8bd646
Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours am: ded4df2e79 am: 462493ee81 am: 585f642d65 -s ours am: 2cd4383c31 am: 09edfde074 am: 1ab448b5d5 am: 5b649ddcc6 -s ours am: e36701214a am: aec37971b2
...
am: c0024237c0
Change-Id: Id175c5e8463e7ca573ae3a30c37c817883c613ed
2016-09-22 23:45:38 +00:00
Winson
3180d517bd
Fixing index bounds exception when TaskViews are added while dismissing. am: ffaf07fed0
...
am: 0eb26d7e4b
Change-Id: Iffb6fc9ef928f0eb1b3b3bf99239cb6bee7997ab
2016-09-22 23:45:37 +00:00
Winson
d00908fc46
Merge "Fixing RTL issues with transition and screen pinning." into nyc-mr1-dev am: 00dc65158d
...
am: 4823655976
Change-Id: Iaee2e061d3b9eacccb14a10fae6ba433e2a7e6cb
2016-09-22 23:44:45 +00:00
Hugo Benichi
a2598a5a4d
Merge "ConnectivityMetricsLoggerTest" into nyc-mr1-dev
...
am: 3a6acc6d96
Change-Id: I94a70a84e1869573fa3222639538593fa681fcce
2016-09-22 23:44:16 +00:00
Hugo Benichi
63dffe336e
ConnectivityMetricsLoggerTest
...
am: b1af5e51c5
Change-Id: Ifa56e878d17be4f93f2ffd9bc8aaeb4789beb55e
2016-09-22 23:44:13 +00:00
Winson
14fa6c2847
Fixing RTL issues with transition and screen pinning. am: 96f78f5046
...
am: 9ae8d47697
Change-Id: Ie3c2cec6d8c7f3ff09ae12ae02fd1df5d7372a5f
2016-09-22 23:43:45 +00:00
Todd Kennedy
ee5def26ed
Merge "Pass url to the AIA supervisor" into nyc-mr1-dev am: bce1e8c836
...
am: 21cc71328b
Change-Id: Ib38283374a94ed4e38c6eab3077a6586fab1a1d1
2016-09-22 23:42:57 +00:00
Todd Kennedy
8a3e8fe185
Pass url to the AIA supervisor am: 52f179fd0e
...
am: c2467b8c68
Change-Id: I726b5957ba15913e2e462409e71a562ed18eaf9c
2016-09-22 23:42:04 +00:00
Hugo Benichi
239f78a455
Merge "Add ipconnectivity.proto to services jar" into nyc-mr1-dev
2016-09-22 23:37:22 +00:00
Christopher Wiley
430904a4ab
Merge changes from topic 'remove-set-frequency-band'
...
* changes:
Remove ability to set frequency from WifiAssociationTest
Remove WifiManager#get/setFrequencyBand
2016-09-22 23:34:17 +00:00
Jaewan Kim
c0024237c0
Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours am: ded4df2e79 am: 462493ee81 am: 585f642d65 -s ours am: 2cd4383c31 am: 09edfde074 am: 1ab448b5d5 am: 5b649ddcc6 -s ours am: e36701214a
...
am: aec37971b2
Change-Id: I598bd69e76fba210387971a0a8c6841cadf70101
2016-09-22 23:33:25 +00:00
Jeff Sharkey
77d25d4bd5
Merge "Recursively restorecon when SELinux label changes." into nyc-mr1-dev am: 8423493a85
...
am: 12de26b83b
Change-Id: I0feaa2cb9686b869a0fbb3c44a37ef5ee108b0c2
2016-09-22 23:33:22 +00:00
Jeff Sharkey
6a24e97505
Merge "Merge commit '8fb7520a6d7720f69661f6fae9fd868726359dec' into HEAD" into nyc-mr1-dev-plus-aosp
2016-09-22 23:30:28 +00:00
Hugo Benichi
3a6acc6d96
Merge "ConnectivityMetricsLoggerTest" into nyc-mr1-dev
2016-09-22 23:29:43 +00:00
Jeff Sharkey
6b6ad04934
Merge commit '8fb7520a6d7720f69661f6fae9fd868726359dec' into HEAD
...
Change-Id: I82b4752c4c8f8b0786f470695eac27102761fff7
2016-09-22 17:27:40 -06:00
Jaewan Kim
b7af1df93d
Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours am: ded4df2e79 am: 462493ee81 am: 585f642d65 -s ours am: 2cd4383c31 am: 09edfde074 am: 1ab448b5d5 am: 5b649ddcc6 -s ours am: e36701214a
...
am: 2f713b8ad7
Change-Id: Ide8aba0aeb883e5c40f6d01eb8ac2b8f14521a5f
2016-09-22 23:26:51 +00:00
Jaewan Kim
cbea118189
DO NOT MERGE Fix build am: dfedca4e43 -s ours am: 499871ebe9 am: 3ea1f124f9 am: ed3e26e2be -s ours am: e9a9e2f055 am: 351aa0b320 am: 03bad07418 am: afab98a69e -s ours am: 738c21253a
...
am: 9b2aeba20a
Change-Id: I73a68d823db3cec064d095a1d514c255d86b57ea
2016-09-22 23:25:43 +00:00
Jaewan Kim
1548fb1bd5
DO NOT MERGE Fix build am: dfedca4e43 -s ours am: 499871ebe9 am: 3ea1f124f9 am: ed3e26e2be -s ours am: e9a9e2f055 am: 351aa0b320 am: 03bad07418 am: afab98a69e -s ours am: 738c21253a am: 4c7df4ba37
...
am: 80743656b1
Change-Id: I097a8b682b61517481b176d5b917a4f0f22d3d48
2016-09-22 23:22:51 +00:00
Brad Ebinger
653330b86f
Merge "Add RadioAccessFamily rank" into nyc-mr1-dev
...
am: 6f0cbd9297
Change-Id: Ieaf0456a99566a2a1395e78dd1d8c7beba0008ae
2016-09-22 23:21:30 +00:00
Jaewan Kim
aec37971b2
Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours am: ded4df2e79 am: 462493ee81 am: 585f642d65 -s ours am: 2cd4383c31 am: 09edfde074 am: 1ab448b5d5 am: 5b649ddcc6 -s ours
...
am: e36701214a
Change-Id: I648f67d04ae9fd74ea0ea06f47ffea5abde042f9
2016-09-22 23:20:47 +00:00
Brad Ebinger
86739bd8d6
Add RadioAccessFamily rank
...
am: de780c84b5
Change-Id: I60352df2052169c722045669069fef8002561574
2016-09-22 23:20:35 +00:00
Selim Cinek
3334a182a6
Fixed a bug where the dimmed background could be invisible
...
Test: Notification group with 2 children on shade locked. Swipe 1 away and go to lockscreen
Change-Id: If7c3a55e220579eb27036f31d59b222371d2bf8e
Fixes: 31524202
2016-09-22 16:19:42 -07:00
Jaewan Kim
2f713b8ad7
Merge "DO NOT MERGE Fix build" into lmp-dev am: fce3b76452 -s ours am: ded4df2e79 am: 462493ee81 am: 585f642d65 -s ours am: 2cd4383c31 am: 09edfde074 am: 1ab448b5d5 am: 5b649ddcc6 -s ours
...
am: e36701214a
Change-Id: I45ecf1f660e94ef5487711b13d43f38931fb9447
2016-09-22 23:17:29 +00:00
Robert Carr
ffff62d51b
Merge "SurfaceView: Force surface disconnection before reuse." into nyc-mr1-dev
...
am: 9d88f86190
Change-Id: I0c6e3c925cf7d8e111edc4a57e0301fa6dce5285
2016-09-22 23:17:06 +00:00