Android Build Merger (Role)
683c255226
Merge "Merge "2D Recents: Fix issue with undocking only one task" into nyc-mr2-dev am: a88749fb51 am: bcbd0231a4"
2017-01-18 22:49:18 +00:00
Jiaquan He
1cd2510f66
Merge "2D Recents: Fix issue with undocking only one task" into nyc-mr2-dev am: a88749fb51
...
am: bcbd0231a4
2017-01-18 22:48:24 +00:00
Android Build Merger (Role)
60582844de
Merge "2D Recents: Fix issue with undocking only one task am: 244bac6c8b am: 9e844c125b"
2017-01-18 22:48:05 +00:00
Jiaquan He
69675691ad
2D Recents: Fix issue with undocking only one task am: 244bac6c8b
...
am: 9e844c125b
2017-01-18 22:47:15 +00:00
Android Build Merger (Role)
cd368ee176
Merge "Merge "Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev am: b8c8b67789 -s ours am: b6973a8c82 -s ours" into nyc-mr2-dev-plus-aosp am: d45dd11045 -s ours"
2017-01-18 22:46:55 +00:00
Android Build Merger (Role)
3645d2cd3d
Merge "Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev am: b8c8b67789 -s ours am: b6973a8c82 -s ours am: 5688955071 -s ours"
2017-01-18 22:46:36 +00:00
Jorim Jaggi
6ed00220d9
Merge "Follow-up for I01e81b9cd11886da734da671c68d5732aa51009f"
2017-01-18 22:46:24 +00:00
Svet Ganov
aa153b5af6
Merge "Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev am: b8c8b67789 -s ours am: b6973a8c82 -s ours" into nyc-mr2-dev-plus-aosp
...
am: d45dd11045
2017-01-18 22:45:32 +00:00
Svet Ganov
a29274040c
Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev am: b8c8b67789 -s ours am: b6973a8c82 -s ours
...
am: 5688955071
2017-01-18 22:45:28 +00:00
Android Build Merger (Role)
cd93a13688
Merge "Merge "Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev am: b8c8b67789 -s ours am: f102bc4a2f -s ours" into nyc-mr2-dev-plus-aosp am: 24ff5a0472 -s ours"
2017-01-18 22:45:03 +00:00
Tyler Gunn
f50354363c
Adding self-managed connection service APIs.
...
1. Adding new APIs for self-managed connection services.
2. Adding Telecom package-level documentation.
Test: Manual (unit, cts pending; this is just scaffolding for now)
Bug: 34159263
Change-Id: Ic226ec8bfcb2fbcc02fe802b47499e47aab17d0a
2017-01-18 14:44:43 -08:00
Android Build Merger (Role)
77087a2883
Merge "Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev am: b8c8b67789 -s ours am: f102bc4a2f -s ours am: d415065f17 -s ours"
2017-01-18 22:44:43 +00:00
Svet Ganov
f1ff196d18
Merge "Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev am: b8c8b67789 -s ours am: f102bc4a2f -s ours" into nyc-mr2-dev-plus-aosp
...
am: 24ff5a0472
2017-01-18 22:43:58 +00:00
Svet Ganov
86b84b75b7
Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g." into cw-f-dev am: b8c8b67789 -s ours am: f102bc4a2f -s ours
...
am: d415065f17
2017-01-18 22:43:53 +00:00
Android Build Merger (Role)
dcb7de0e22
Merge "Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g. am: 4a601f972a -s ours am: cf7b579868 -s ours" into nyc-mr2-dev-plus-aosp am: ba182c0b0c -s ours"
2017-01-18 22:43:28 +00:00
Android Build Merger (Role)
f430a4586b
Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g. am: 4a601f972a -s ours am: cf7b579868 -s ours am: f7426c4280 -s ours"
2017-01-18 22:43:12 +00:00
Fyodor Kupolov
5c26dc1b54
Merge "Updated platform privileged permissions"
2017-01-18 22:42:45 +00:00
Svet Ganov
e454f97475
Merge "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g. am: 4a601f972a -s ours am: cf7b579868 -s ours" into nyc-mr2-dev-plus-aosp
...
am: ba182c0b0c
2017-01-18 22:42:24 +00:00
Svet Ganov
fe4f447122
DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g. am: 4a601f972a -s ours am: cf7b579868 -s ours
...
am: f7426c4280
2017-01-18 22:42:20 +00:00
Svet Ganov
b19341d121
DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g. am: 4a601f972a -s ours am: 79b20c88e2 -s ours
...
am: e9838d9feb
2017-01-18 22:41:24 +00:00
Pavlin Radoslavov
b7e5b0f68e
Merge "Update/cleanup Bluetooth Codec strings in Developer Settings" am: 5fd543ec34 am: fd2f4bbcca am: 14e9d1c33f
...
am: 6878dd5dec
2017-01-18 22:40:03 +00:00
Tamas Berghammer
0bb8bba8d7
Merge "DO NOT MERGE: Revert "Fix build"" into nyc-mr1-dev-plus-aosp am: a553354e84
...
am: c6e0e75534
2017-01-18 22:38:58 +00:00
Tamas Berghammer
6760a7c206
Merge "DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"" into nyc-mr1-dev-plus-aosp am: b4050d8042
...
am: d331d57dc6
2017-01-18 22:38:09 +00:00
TreeHugger Robot
07ea1c635f
Merge "Fixed check for generated ids on onProvideStructureForAssistOrAutoFill()."
2017-01-18 22:32:49 +00:00
TreeHugger Robot
155873057f
Merge "Enable background restrictions"
2017-01-18 22:32:17 +00:00
Android Build Merger (Role)
80c1edfcd8
Merge changes from topic 'am-4c35a7750ff942229896a20b4a9f05ce'
...
* changes:
DO NOT MERGE: Revert "Fix build" am: a0a908f5d60a1a0e6e6124d8553316572dfccfc1
2017-01-18 22:28:00 +00:00
Jeremy Joslin
a480795e34
Have requestRecommendation return a CompletableFuture.
...
Reworked the new requestRecommendation call to return a
CompletableFuture instead of using a custom callback.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug: 33784158
Change-Id: If24a94eb6289cb1952052b2cc3bc7856ce2192a5
2017-01-18 14:27:43 -08:00
Torbjorn Eklund
ecb8183894
SFR sims should treat Spain as roaming
...
Since there are unnecessary "config_operatorConsideredNonRoaming" values
in the following file, UE mistakenly recognizes all Spain network as
non-roaming when SFR sim is inserted. Fix the issue by removing the
values.
- core/res/res/values-mcc208-mnc10/config.xml
Bug: 34369673
Change-Id: I7353e260ec7d3d298346a48c74b7b71bb75b14de
2017-01-19 07:25:32 +09:00
Jiaquan He
1ca4f25052
Merge "Add keyboard support to Grid-based Recents." into nyc-mr2-dev
...
am: 2a147464f6
2017-01-18 22:19:40 +00:00
Jiaquan He
de934359ef
Add keyboard support to Grid-based Recents.
...
am: 21f495f07b
2017-01-18 22:19:32 +00:00
Jiaquan He
c0e1813944
Add arrow key navigation support to Grid-based Recents.
...
Test: Checked that arrow key navigation works in Recents on local
sw600dp devices. Also checked that Recents works properly on phones.
Bug: 32101881
Change-Id: I8ece3fc4c9ae82916efcbbde72d40805e43cc70d
2017-01-18 14:17:54 -08:00
TreeHugger Robot
2a147464f6
Merge "Add keyboard support to Grid-based Recents." into nyc-mr2-dev
2017-01-18 22:14:22 +00:00
Tamas Berghammer
cd7c8d4d64
DO NOT MERGE: Revert "Fix build" am: a0a908f5d6
...
am: 0a1a0e6e61
2017-01-18 22:13:02 +00:00
Tamas Berghammer
f83ced7b60
DO NOT MERGE: Revert "Update package names to work with the proto3 compiler" am: 24d8553316 -s ours
...
am: 572dfccfc1
2017-01-18 22:12:04 +00:00
Jiaquan He
bcbd0231a4
Merge "2D Recents: Fix issue with undocking only one task" into nyc-mr2-dev
...
am: a88749fb51
2017-01-18 22:10:42 +00:00
Jiaquan He
9e844c125b
2D Recents: Fix issue with undocking only one task
...
am: 244bac6c8b
2017-01-18 22:10:35 +00:00
Android Build Merger (Role)
14eb4cdfe1
Merge "Merge "Unhide WifiConfiguration proxy accessors" am: c82d1ddaf4 am: d2f5fd3c42 am: 878fcfaa22 am: 424650dd52 -s ours"
2017-01-18 22:10:18 +00:00
Glen Kuhne
4c5d15a59b
Merge "Unhide WifiConfiguration proxy accessors" am: c82d1ddaf4 am: d2f5fd3c42 am: 878fcfaa22
...
am: 424650dd52
2017-01-18 22:07:58 +00:00
Android Build Merger (Role)
7f52976926
Merge "Fix issue with saving admins before finishing loading. am: f98ed6863a am: b275a205af am: ee9f03d1ed am: 1894632864 am: c8a6eb1382 am: 7ede74bb06"
2017-01-18 22:07:22 +00:00
Kenny Guy
ab16bd6be4
Fix issue with saving admins before finishing loading. am: f98ed6863a am: b275a205af am: ee9f03d1ed am: 1894632864 am: c8a6eb1382
...
am: 7ede74bb06
2017-01-18 22:06:34 +00:00
TreeHugger Robot
a88749fb51
Merge "2D Recents: Fix issue with undocking only one task" into nyc-mr2-dev
2017-01-18 22:06:22 +00:00
Android Build Merger (Role)
b4b2d629e4
Merge "svc nfc should support watches too am: 1876583bfb am: baa26e2d3d am: 9ece7d4509"
2017-01-18 22:06:14 +00:00
Tucker Sylvestro
cac79cc53b
svc nfc should support watches too am: 1876583bfb am: baa26e2d3d
...
am: 9ece7d4509
2017-01-18 22:05:20 +00:00
Android Build Merger (Role)
5a41cb8d51
Merge "Merge "Notify user switch event to NetworkController" am: 1aa24246cf am: 4ab0e9f824 am: 3f326e7011 am: bddba11564"
2017-01-18 22:04:59 +00:00
Jay
e479efcc41
Merge "Notify user switch event to NetworkController" am: 1aa24246cf am: 4ab0e9f824 am: 3f326e7011
...
am: bddba11564
2017-01-18 22:04:22 +00:00
Android Build Merger (Role)
ea145e6936
Merge "Fix build am: 005055c070 am: 655c5066c7"
2017-01-18 22:04:01 +00:00
Jason Monk
03ab949fbc
Fix build am: 005055c070
...
am: 655c5066c7
2017-01-18 22:03:19 +00:00
Jason Monk
97705ce116
Fix build
...
Test: treehugger
Change-Id: Ic33d5ff2d7845bf4edd81d3e966fce3f0e5956bb
(cherry picked from commit 005055c070
2017-01-18 22:01:08 +00:00
Jason Monk
056e44947e
Merge "resolve merge conflicts of 8cff199b09 to master"
2017-01-18 22:00:06 +00:00
Jason Monk
6ca235de02
Add primaryContentAlpha attribute
...
And create a generic primary text selector that can be used for all
themes.
Test: Manual
Change-Id: I274da909209188d7a8f4924ee8c64eff7011b7e2
2017-01-18 16:34:45 -05:00
