OSDN Git Service
Sungsoo Lim [Fri, 4 Aug 2017 00:50:11 +0000 (00:50 +0000)]
Merge "Catch IllegalArgumentException when disconnect" into oc-mr1-dev am:
1d66ccde36
am:
f6791675f2
Change-Id: I33c1d2cbccb2e2944bba49d8b7d6b5117816870a
Sungsoo Lim [Fri, 4 Aug 2017 00:48:20 +0000 (00:48 +0000)]
Merge "Do not call ItemCallback after disconnected" into oc-mr1-dev am:
8724fb9348
am:
57cf99b969
Change-Id: I112b12eac97890092af0362048d6e001cbedb923
Sungsoo Lim [Fri, 4 Aug 2017 00:37:19 +0000 (00:37 +0000)]
Merge "Catch IllegalArgumentException when disconnect" into oc-mr1-dev
am:
1d66ccde36
Change-Id: I2db7c5b73f6b4af128dda75150f7bd2ebeeb653c
Sungsoo Lim [Fri, 4 Aug 2017 00:34:08 +0000 (00:34 +0000)]
Merge "Do not call ItemCallback after disconnected" into oc-mr1-dev
am:
8724fb9348
Change-Id: I76638c3b5b2598019ccb669113d3ecc45a0091ff
Jonathan Basseri [Fri, 4 Aug 2017 00:27:34 +0000 (00:27 +0000)]
Merge "Revert "Move getNetworkCountryIso impl from TM to PIM.""
Sungsoo Lim [Fri, 4 Aug 2017 00:22:00 +0000 (00:22 +0000)]
Merge "Catch IllegalArgumentException when disconnect" into oc-mr1-dev
Sungsoo Lim [Fri, 4 Aug 2017 00:21:27 +0000 (00:21 +0000)]
Merge "Do not call ItemCallback after disconnected" into oc-mr1-dev
Jonathan Basseri [Fri, 4 Aug 2017 00:18:28 +0000 (00:18 +0000)]
Revert "Move getNetworkCountryIso impl from TM to PIM."
This reverts commit
2b9aa9e9d1b6c4d5b9a7db128818f7d0c5d42ff5.
Change-Id: I2787f2bd9cd5afe3fde8afdbb62dc255718fe654
Makoto Onuki [Fri, 4 Aug 2017 00:12:38 +0000 (00:12 +0000)]
Merge "Bit: Don't ignore errors and crashes" into oc-mr1-dev am:
437e43ed1f
am:
d3cafac64d
Change-Id: I2723ca82a18e3c9ac507e6a7113618c1850f577a
Makoto Onuki [Thu, 3 Aug 2017 23:53:25 +0000 (23:53 +0000)]
Merge "Bit: Don't ignore errors and crashes" into oc-mr1-dev
am:
437e43ed1f
Change-Id: Idc4e96751659c08d0b95760f41ba47c45bc4e476
Amith Yamasani [Thu, 3 Aug 2017 23:42:57 +0000 (23:42 +0000)]
Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev am:
5a800cf069 am:
6aaaa2bbb0
am:
c1183bf2e7
Change-Id: I0a0df13efa74f3277bf907dcc76ccda3d2ead275
TreeHugger Robot [Thu, 3 Aug 2017 23:41:40 +0000 (23:41 +0000)]
Merge "Bit: Don't ignore errors and crashes" into oc-mr1-dev
Amith Yamasani [Thu, 3 Aug 2017 23:40:10 +0000 (23:40 +0000)]
Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev am:
5a800cf069 am:
26f8f5c868
am:
7d00772ceb
Change-Id: Ib23376b9f072522167c02ea009a0284ab5eabccb
Amith Yamasani [Thu, 3 Aug 2017 23:34:23 +0000 (23:34 +0000)]
Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev am:
5a800cf069
am:
6aaaa2bbb0
Change-Id: I350fe683266ba2a139043c16d282a27b558a625e
Christopher Tate [Thu, 3 Aug 2017 23:30:09 +0000 (23:30 +0000)]
Merge "Use normal API for legacy wallpaper restore" into oc-mr1-dev am:
4204f1658c
am:
454f1466b7
Change-Id: I0e7f9f1297ca3f8a8fd02b7b578905fc38a5b8a9
Amith Yamasani [Thu, 3 Aug 2017 23:29:23 +0000 (23:29 +0000)]
Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev am:
5a800cf069
am:
26f8f5c868
Change-Id: I44fe5b45c8cdc3d4ddd7edc210641f3883265c58
Lucas Dupin [Thu, 3 Aug 2017 23:22:46 +0000 (23:22 +0000)]
Merge "Merge "Multi-user and WallpaperColors" into oc-dr1-dev am:
e09e5ef21b -s ours am:
57d0423e91 -s ours" into oc-mr1-dev-plus-aosp
am:
662282b2b6 -s ours
Change-Id: Ie564e491afac9ee5c05a47b6da0cf781b02e67e5
Lucas Dupin [Thu, 3 Aug 2017 23:20:52 +0000 (23:20 +0000)]
Merge "Multi-user and WallpaperColors" into oc-dr1-dev am:
e09e5ef21b am:
89f58e156e -s ours
am:
1e5f6b3285 -s ours
Change-Id: I8b6ef6cd6f516a6e8ff244f0f80de74938a8d565
Christopher Tate [Thu, 3 Aug 2017 23:18:57 +0000 (23:18 +0000)]
Merge "Use normal API for legacy wallpaper restore" into oc-mr1-dev
am:
4204f1658c
Change-Id: I2621dcbb5b727a5420095223f36d3e6e5784799d
Amith Yamasani [Thu, 3 Aug 2017 23:18:32 +0000 (23:18 +0000)]
Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev
am:
5a800cf069
Change-Id: I4b2e2dc81baea8078b0bca1db357e234bda27bf7
Amith Yamasani [Thu, 3 Aug 2017 23:18:29 +0000 (23:18 +0000)]
Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev
am:
5a800cf069
Change-Id: I99d131e00dc43982f41e8837f44a66c71312615a
TreeHugger Robot [Thu, 3 Aug 2017 23:16:46 +0000 (23:16 +0000)]
Merge "Reverse check for multi-character ellipsis"
Android Build Merger (Role) [Thu, 3 Aug 2017 23:12:44 +0000 (23:12 +0000)]
Merge "Merge "Multi-user and WallpaperColors" into oc-dr1-dev am:
e09e5ef21b -s ours am:
57d0423e91 -s ours" into oc-mr1-dev-plus-aosp
Lucas Dupin [Thu, 3 Aug 2017 23:11:20 +0000 (23:11 +0000)]
Merge "Multi-user and WallpaperColors" into oc-dr1-dev am:
e09e5ef21b -s ours
am:
57d0423e91 -s ours
Change-Id: Ia35fcfad8e0910909c1806d95d3a8c0c33d954ff
Lucas Dupin [Thu, 3 Aug 2017 23:10:23 +0000 (23:10 +0000)]
Merge "Multi-user and WallpaperColors" into oc-dr1-dev am:
e09e5ef21b
am:
89f58e156e -s ours
Change-Id: I455ae6d0552232647409482479bae5a41189faa9
TreeHugger Robot [Thu, 3 Aug 2017 23:09:42 +0000 (23:09 +0000)]
Merge "Set and restore default timezone in DateUtilsTest"
TreeHugger Robot [Thu, 3 Aug 2017 23:07:53 +0000 (23:07 +0000)]
Merge "Use normal API for legacy wallpaper restore" into oc-mr1-dev
Amith Yamasani [Thu, 3 Aug 2017 23:07:32 +0000 (23:07 +0000)]
Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev
TreeHugger Robot [Thu, 3 Aug 2017 22:59:10 +0000 (22:59 +0000)]
Merge "Remove dependency on CalHas.mk."
Lucas Dupin [Thu, 3 Aug 2017 22:56:54 +0000 (22:56 +0000)]
Merge "Multi-user and WallpaperColors" into oc-dr1-dev
am:
e09e5ef21b
Change-Id: Idb06a8e04ac1cb9bf73fe168217d5369bb412b4f
Lucas Dupin [Thu, 3 Aug 2017 22:56:50 +0000 (22:56 +0000)]
Merge "Multi-user and WallpaperColors" into oc-dr1-dev
am:
e09e5ef21b -s ours
Change-Id: Ib197bc342f3829e683a8cba1b2f1cb1856514b1b
Yi Jin [Thu, 3 Aug 2017 22:53:10 +0000 (22:53 +0000)]
Merge "There must not have newline character in wakelock name"
Lucas Dupin [Thu, 3 Aug 2017 22:48:27 +0000 (22:48 +0000)]
Merge "Multi-user and WallpaperColors" into oc-dr1-dev
Jeff Sharkey [Thu, 3 Aug 2017 22:46:02 +0000 (22:46 +0000)]
DO NOT MERGE: Fix searching for overridden methods. am:
008ddd928d -s ours am:
f7602ac731 am:
b89f75efad
am:
bfc1d77e0b -s ours
Change-Id: Ia2eb3ee58f5f53a33785383c869b405a9f00fbcd
Jeff Sharkey [Thu, 3 Aug 2017 22:34:39 +0000 (22:34 +0000)]
DO NOT MERGE: Fix searching for overridden methods. am:
008ddd928d -s ours am:
f7602ac731
am:
b89f75efad
Change-Id: Ie405532b69f8c11c1c16d5d56ad0ff96d7369f03
Tor Norbye [Thu, 3 Aug 2017 22:10:27 +0000 (22:10 +0000)]
Merge "
64123323: Allow marking fields with @TargetApi(XX)"
Nathan Harold [Thu, 3 Aug 2017 21:57:56 +0000 (21:57 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM."
Svet Ganov [Thu, 3 Aug 2017 21:21:15 +0000 (21:21 +0000)]
Merge "Backup all backupable settings" into oc-mr1-dev am:
5444e9d445
am:
de6088f050
Change-Id: Id117a9f4bdce187eecb63b3bd980f83231af0bb1
Jeff Sharkey [Thu, 3 Aug 2017 21:17:06 +0000 (21:17 +0000)]
DO NOT MERGE: Fix searching for overridden methods. am:
008ddd928d -s ours
am:
f7602ac731
Change-Id: Ib328db263876028131009f8b02033da5c99e6327
Jonathan Basseri [Wed, 19 Jul 2017 20:44:31 +0000 (13:44 -0700)]
Move getNetworkCountryIso impl from TM to PIM.
This moves the implementation of getNetworkCountryIso from
TelephonyManager into PhoneInterfaceManager so that we can perform an
additional IWLAN check.
Bug:
63050313
Test: no compilation errors
Change-Id: I541b445b410329798acdaaaccc50955cd1574ae2
(cherry picked from commit
83c25b8ce17c3ce387d87d5f36182645e686540e)
Svet Ganov [Thu, 3 Aug 2017 21:09:06 +0000 (21:09 +0000)]
Merge "Backup all backupable settings" into oc-mr1-dev
am:
5444e9d445
Change-Id: I6c361a8e76596256aa98336c2ec7f6f24df5a782
Jeff Sharkey [Thu, 3 Aug 2017 21:04:47 +0000 (21:04 +0000)]
DO NOT MERGE: Fix searching for overridden methods.
am:
008ddd928d -s ours
Change-Id: Ifb0f9c06ad25a526d8780ce37d0aa2db7934eba7
Roozbeh Pournader [Thu, 3 Aug 2017 20:56:41 +0000 (13:56 -0700)]
Reverse check for multi-character ellipsis
Reverse a recently-introduced incorrect check for multi-character
ellipsis in Layout.java. The check was introduced in
Id1dfdc503f87fabed2447d55ab2107eee0eccd08.
Test: bit CtsTextTestCases:*
Test: bit FrameworksCoreTests:android.text.
Change-Id: I79198be0bd202a303f8db02a235c2af3b76abf32
Jeremy Joslin [Thu, 3 Aug 2017 20:59:57 +0000 (20:59 +0000)]
Merge "NetworkRecommendationProviders require the location permission." into oc-mr1-dev am:
589ba65d91
am:
f16bb77191
Change-Id: I611a839c304bd8ec3bba09c730e9878f55554f01
TreeHugger Robot [Thu, 3 Aug 2017 20:58:35 +0000 (20:58 +0000)]
Merge "Backup all backupable settings" into oc-mr1-dev
Jeremy Joslin [Thu, 3 Aug 2017 20:46:38 +0000 (20:46 +0000)]
Merge "NetworkRecommendationProviders require the location permission." into oc-mr1-dev
am:
589ba65d91
Change-Id: I971c3a922340ee2d73722eea5e293d928b6f9a54
TreeHugger Robot [Thu, 3 Aug 2017 20:37:16 +0000 (20:37 +0000)]
Merge "NetworkRecommendationProviders require the location permission." into oc-mr1-dev
Tor Norbye [Mon, 31 Jul 2017 17:30:31 +0000 (10:30 -0700)]
64123323: Allow marking fields with @TargetApi(XX)
Test: Tested as part of lint
Change-Id: I52dcc0ea788ed916d23be4d7c9fb76755a1aa6b8
Steven Moreland [Thu, 3 Aug 2017 19:35:08 +0000 (12:35 -0700)]
Remove dependency on CalHas.mk.
Now that we can, include dependency on hal
directly.
Test: java links
Test: wip/todo
Change-Id: I45f8c5befab80add7c80cf59dc5c5c56519d295d
Fixes:
64294630
Andre Eisenbach [Thu, 3 Aug 2017 19:24:52 +0000 (19:24 +0000)]
Merge "Remove "Couldn't pair" prompt on ACTION_PAIRING_CANCEL am:
61ad5ae921 am:
39a9832df1" into oc-mr1-dev-plus-aosp
am:
371ccac2ff
Change-Id: I02aee5c787bb0f8b65d433c3133db063a7d6f93d
Andre Eisenbach [Thu, 3 Aug 2017 19:22:59 +0000 (19:22 +0000)]
Remove "Couldn't pair" prompt on ACTION_PAIRING_CANCEL am:
61ad5ae921 am:
c0d1f46845
am:
5b0976d633
Change-Id: I966d5999a5800d1de6d0015ee4729407d1e37926
Android Build Merger (Role) [Thu, 3 Aug 2017 19:13:48 +0000 (19:13 +0000)]
Merge "Remove "Couldn't pair" prompt on ACTION_PAIRING_CANCEL am:
61ad5ae921 am:
39a9832df1" into oc-mr1-dev-plus-aosp
Andre Eisenbach [Thu, 3 Aug 2017 19:11:07 +0000 (19:11 +0000)]
Remove "Couldn't pair" prompt on ACTION_PAIRING_CANCEL am:
61ad5ae921
am:
39a9832df1
Change-Id: I5b861103fdd7099ca38479481388132580e02fdc
Andre Eisenbach [Thu, 3 Aug 2017 19:11:00 +0000 (19:11 +0000)]
Remove "Couldn't pair" prompt on ACTION_PAIRING_CANCEL am:
61ad5ae921
am:
c0d1f46845
Change-Id: I8c0ffbccee4a53acc39d8cb164e1f32477294b73
Andre Eisenbach [Thu, 3 Aug 2017 19:00:00 +0000 (19:00 +0000)]
Remove "Couldn't pair" prompt on ACTION_PAIRING_CANCEL
am:
61ad5ae921
Change-Id: Iadbb0716f82a42366d8aba687208a1df81eafb70
Andre Eisenbach [Thu, 3 Aug 2017 18:59:59 +0000 (18:59 +0000)]
Remove "Couldn't pair" prompt on ACTION_PAIRING_CANCEL
am:
61ad5ae921
Change-Id: I5726036ecf16992e1a9e56ac568b287547208a14
Sergey Vasilinets [Thu, 3 Aug 2017 18:52:57 +0000 (18:52 +0000)]
Merge "Update toast UI" into oc-dr1-dev am:
436b1e2f0e am:
189ff1b021
am:
4e09ee195b
Change-Id: I9838554db314d97c66ddd4fb1fc739c5109e4cc6
Sergey Vasilinets [Thu, 3 Aug 2017 18:50:54 +0000 (18:50 +0000)]
Merge "Update toast UI" into oc-dr1-dev am:
436b1e2f0e am:
ccf0381aae
am:
8695f0fec5
Change-Id: Ib7e7fd4f8408f739b46506bcc4b715c87f3a8bb1
Andre Eisenbach [Wed, 2 Aug 2017 23:51:10 +0000 (16:51 -0700)]
Remove "Couldn't pair" prompt on ACTION_PAIRING_CANCEL
ACTION_PAIRING_CANCEL is triggered as a result of an ACL connection
going down, causing a "Couldn't pair" prompt. This can happen on some
car kits, even if the pairing is successful and the car kit briefly
tearing down the ACL connection after pairing and resuming it
immediately afterwards.
If a connection gets disconnected during a normal bonding procedure, the
UNBOND_REASON_REMOTE_DEVICE_DOWN reason code for the
ACTION_BOND_STATE_CHANGED already indicates this issue and will inform
the user.
Bug:
63975046
Test: manual
Change-Id: I663d8b7700741927c72e38e30cd993c0b81511a9
Sergey Vasilinets [Thu, 3 Aug 2017 18:39:15 +0000 (18:39 +0000)]
Merge "Update toast UI" into oc-dr1-dev am:
436b1e2f0e
am:
189ff1b021
Change-Id: Idbc6646e85044304cc87aa4d67b807b8b2e169d2
Sergey Vasilinets [Thu, 3 Aug 2017 18:35:56 +0000 (18:35 +0000)]
Merge "Update toast UI" into oc-dr1-dev am:
436b1e2f0e
am:
ccf0381aae
Change-Id: I02254bd81a254f76014f3f2240fc6ecb1400a0e4
Yi Jin [Thu, 3 Aug 2017 00:39:15 +0000 (17:39 -0700)]
There must not have newline character in wakelock name
Bug:
64272195
Test: N/A
Change-Id: I07a7d9b9dfbf69acba0123bf4ec6e309c2a5a359
Sergey Vasilinets [Thu, 3 Aug 2017 18:25:19 +0000 (18:25 +0000)]
Merge "Update toast UI" into oc-dr1-dev
am:
436b1e2f0e
Change-Id: Ia346c80194c8792e51be927cc19e4555d3c1527f
Sergey Vasilinets [Thu, 3 Aug 2017 18:24:51 +0000 (18:24 +0000)]
Merge "Update toast UI" into oc-dr1-dev
am:
436b1e2f0e
Change-Id: I5873b48beab466d1a7d99c1173d93bb1e5678a1a
Abodunrinwa Toki [Thu, 3 Aug 2017 18:19:23 +0000 (18:19 +0000)]
Merge "Remove LangId related code." into oc-mr1-dev am:
38bbbdfae6
am:
2566e91f9f
Change-Id: Ic481522e134d17bbaaa3741208a3fee5426ce688
Sergey Vasilinets [Thu, 3 Aug 2017 18:14:24 +0000 (18:14 +0000)]
Merge "Update toast UI" into oc-dr1-dev
Roozbeh Pournader [Thu, 3 Aug 2017 18:11:17 +0000 (11:11 -0700)]
Set and restore default timezone in DateUtilsTest
Previously, the tests assumed a GMT timezone without ever setting it.
Now we set the timezone to GMT on setup and restore the original
timezone on teardown.
Change-Id: Ia168335eac28f33c094581af2437ac635cb38bd9
Fixes:
64149941
Test: bit FrameworksCoreTests:android.text.format.DateUtilsTest (with non-GMT timezone)
Christopher Tate [Tue, 1 Aug 2017 23:32:49 +0000 (16:32 -0700)]
Use normal API for legacy wallpaper restore
No longer do we play crazy rename-into-place tricks! Just take
the restored image and treat it as an ordinary new system wallpaper,
and let the system machinery do all its proper work. While we're at
it, we get rid of the now-spurious shenanigans about backing up the
wallpaper under the 'android' package, an overdue and welcome bit
of thinning.
In addition, we now fully migrate a legacy wallpaper image to have
both a source and a display crop in place. We were previously
not generating the equivalent source image, which made N+ backups
unable to store the image properly.
Fix
64269208
Fix
62809439
Test: manual (set wallpaper under M, backup, flash to ToT,
force restore)
Change-Id: If9b26b777f0fda95cf37c3c790a3fa4e82ff0340
Abodunrinwa Toki [Thu, 3 Aug 2017 18:07:19 +0000 (18:07 +0000)]
Merge "Remove LangId related code." into oc-mr1-dev
am:
38bbbdfae6
Change-Id: I336cab55855dc43c42d73fdf363d8db016bdaf70
Yi Jin [Thu, 3 Aug 2017 18:04:38 +0000 (18:04 +0000)]
Merge "This cl implements CommandSection and use it to add procrank.proto Section"
Jeff Hao [Thu, 3 Aug 2017 17:56:55 +0000 (17:56 +0000)]
Merge "Add dirty_image_objects file."
TreeHugger Robot [Thu, 3 Aug 2017 17:54:29 +0000 (17:54 +0000)]
Merge "Remove LangId related code." into oc-mr1-dev
Jeff Sharkey [Mon, 19 Jun 2017 22:27:25 +0000 (16:27 -0600)]
DO NOT MERGE: Fix searching for overridden methods.
If the superclass is an abstract class, we want to search it for
possibly overridden methods; we don't want to search ourselves.
This bug resulted in (incorrectly) thinking that overridden "default"
methods from interfaces were standalone methods on the class. (The
expected behavior has always been to omit any overridden methods from
the public API surface area to avoid redundant noise.)
Test: make update-api
Bug:
62675475
Change-Id: Ic92544908692bd9af329d302165e18c7b4738e43
(cherry picked from commit
257529dcae079055d51cb8eb42b249512ae41f36)
Calin Juravle [Thu, 3 Aug 2017 17:41:59 +0000 (17:41 +0000)]
Merge "Save PackageDexUsage on PMS shutdown" into oc-mr1-dev am:
7b7b99bf56
am:
3f081e345f
Change-Id: I18a4582776f8cacac98534f677db9508a4beeef4
Calin Juravle [Thu, 3 Aug 2017 17:24:48 +0000 (17:24 +0000)]
Merge "Save PackageDexUsage on PMS shutdown" into oc-mr1-dev
am:
7b7b99bf56
Change-Id: I78826ba7e64d18d3900a61b550d57feb19f3c8a4
Kenny Guy [Thu, 3 Aug 2017 17:19:41 +0000 (17:19 +0000)]
Merge "Update colour to match toasts." into oc-mr1-dev am:
1da2877b9a
am:
97541b704f
Change-Id: I92a48a4d4f3b4ef7ff43fe6641644cc44957b15d
Calin Juravle [Thu, 3 Aug 2017 17:16:57 +0000 (17:16 +0000)]
Merge "Save PackageDexUsage on PMS shutdown" into oc-mr1-dev
Tomasz Wasilczyk [Thu, 3 Aug 2017 17:15:04 +0000 (17:15 +0000)]
Merge "Address Broadcast Radio HAL review notes." into oc-mr1-dev am:
36ea87b075
am:
4da1bf10b7
Change-Id: Ibe87cf6b4037175e66a34ef1efb84209dcae341f
Kenny Guy [Thu, 3 Aug 2017 17:05:58 +0000 (17:05 +0000)]
Merge "Update colour to match toasts." into oc-mr1-dev
am:
1da2877b9a
Change-Id: I71c697d116a44845f517aad8b5f05152b917c65c
Tomasz Wasilczyk [Thu, 3 Aug 2017 17:02:52 +0000 (17:02 +0000)]
Merge "Address Broadcast Radio HAL review notes." into oc-mr1-dev
am:
36ea87b075
Change-Id: I8802ac38c0167f0f2705bfaaf174d30743045a07
TreeHugger Robot [Thu, 3 Aug 2017 16:54:41 +0000 (16:54 +0000)]
Merge "Update colour to match toasts." into oc-mr1-dev
Tomasz Wasilczyk [Thu, 3 Aug 2017 16:52:31 +0000 (16:52 +0000)]
Merge "Address Broadcast Radio HAL review notes." into oc-mr1-dev
Lucas Dupin [Thu, 3 Aug 2017 16:46:16 +0000 (16:46 +0000)]
Merge "Multi-user and WallpaperColors" into oc-mr1-dev am:
22b418448b
am:
430d7450ed
Change-Id: I65ff692f77886bfed6f64ec71f0bab569a6354c0
Lucas Dupin [Thu, 3 Aug 2017 16:35:36 +0000 (16:35 +0000)]
Merge "Multi-user and WallpaperColors" into oc-mr1-dev
am:
22b418448b
Change-Id: I366a0968883a57499392edafcc95c53416268329
Lucas Dupin [Thu, 3 Aug 2017 16:23:41 +0000 (16:23 +0000)]
Merge "Multi-user and WallpaperColors" into oc-mr1-dev
Alexandru-andrei Rotaru [Thu, 3 Aug 2017 15:54:49 +0000 (15:54 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed." into stage-aosp-master am:
b9295c7de0 -s ours am:
7b3fd55c30 -s ours am:
3668323bd7 -s ours
am:
ca48fcd256 -s ours
Change-Id: I67af2c1b8561937ddffafd434220c7769d8c4cdf
Alexandru-andrei Rotaru [Thu, 3 Aug 2017 15:39:09 +0000 (15:39 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed." into stage-aosp-master am:
b9295c7de0 -s ours am:
7b3fd55c30 -s ours
am:
3668323bd7 -s ours
Change-Id: I8204085069cd64e881192c054e60dbc11133f07d
Adrian Roos [Thu, 3 Aug 2017 15:28:25 +0000 (15:28 +0000)]
Merge "Merge "AOD: Unregister touchscreen sensors while pulsing" into oc-dr1-dev am:
a957c56da0 am:
49cbe41a2b" into oc-mr1-dev-plus-aosp
am:
37bcab378b
Change-Id: I83f1cc70904e65ba71931fe614ecb14d74a10e4f
Alexandru-andrei Rotaru [Thu, 3 Aug 2017 15:27:15 +0000 (15:27 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed." into stage-aosp-master am:
b9295c7de0 -s ours
am:
7b3fd55c30 -s ours
Change-Id: Ieab87f4b422168e3bcf8250e405ec91ee67d0e27
Adrian Roos [Thu, 3 Aug 2017 15:26:17 +0000 (15:26 +0000)]
Merge "Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev am:
bc3c1d0170 am:
2674ad2e9a" into oc-mr1-dev-plus-aosp
am:
248673e94f
Change-Id: I550c0b28dfcd9f9a34bb02f666d88dbd5882f200
Adrian Roos [Thu, 3 Aug 2017 15:23:57 +0000 (15:23 +0000)]
Merge "AOD: Unregister touchscreen sensors while pulsing" into oc-dr1-dev am:
a957c56da0 am:
14acc52213
am:
8b62151c50
Change-Id: I670928a685a8b3777aa4e193498e1e46acd6ec45
Adrian Roos [Thu, 3 Aug 2017 15:21:45 +0000 (15:21 +0000)]
Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev am:
bc3c1d0170 am:
1a9c0c37aa
am:
e4f542fabf
Change-Id: Ia932db1b7a924c954e38890fe36da66071f72c10
Alexandru-andrei Rotaru [Thu, 3 Aug 2017 15:19:11 +0000 (15:19 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed." into stage-aosp-master
am:
b9295c7de0 -s ours
Change-Id: I86c4d74187f71a91c4532d055e5e28858ee208ca
Android Build Merger (Role) [Thu, 3 Aug 2017 15:17:09 +0000 (15:17 +0000)]
Merge "Merge "AOD: Unregister touchscreen sensors while pulsing" into oc-dr1-dev am:
a957c56da0 am:
49cbe41a2b" into oc-mr1-dev-plus-aosp
Adrian Roos [Thu, 3 Aug 2017 15:15:40 +0000 (15:15 +0000)]
Merge "AOD: Unregister touchscreen sensors while pulsing" into oc-dr1-dev am:
a957c56da0
am:
49cbe41a2b
Change-Id: I9932c8175ad0e7dd46cfa15fc0c6a037023259b9
Android Build Merger (Role) [Thu, 3 Aug 2017 15:15:18 +0000 (15:15 +0000)]
Merge "Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev am:
bc3c1d0170 am:
2674ad2e9a" into oc-mr1-dev-plus-aosp
Adrian Roos [Thu, 3 Aug 2017 15:13:27 +0000 (15:13 +0000)]
Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev am:
bc3c1d0170
am:
2674ad2e9a
Change-Id: I7089df088a5c7f684af50ede67dbd11df984fc5d
Adrian Roos [Thu, 3 Aug 2017 15:13:12 +0000 (15:13 +0000)]
Merge "AOD: Unregister touchscreen sensors while pulsing" into oc-dr1-dev am:
a957c56da0
am:
14acc52213
Change-Id: I36772d64f0343a8a2155e992a924c89c904acdbe
Adrian Roos [Thu, 3 Aug 2017 15:10:36 +0000 (15:10 +0000)]
Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev am:
bc3c1d0170
am:
1a9c0c37aa
Change-Id: I0af701dfcab068695c3cfcf746b4e23694c20f60
Alexandru-andrei Rotaru [Thu, 3 Aug 2017 15:07:29 +0000 (15:07 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed." into stage-aosp-master
OSDN Git Service
