Justin Klaassen
1e18e9c6c0
DO NOT MERGE - Ask device owner for master clear in demo mode am: a22c8345fa -s ours am: be3c8bf442
...
am: a2075d2eb4
2017-08-10 02:31:18 +00:00
Fan Zhang
3f6c90eb34
Merge "Delete DynamicindexableContentMonitor & all refs to it" into oc-mr1-dev am: 5b820431d3
...
am: a8f7f745e1
2017-08-10 02:30:57 +00:00
qqzhou
366cf1ba78
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev am: 2c2b6b48de am: 13d1167e44
...
am: 23a16c2ae4
2017-08-10 02:30:37 +00:00
Daniel Nishi
36b3c7ca68
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev am: 97e0e42959 am: b2da45dd09 -s ours
...
am: 2151d69764
2017-08-10 02:29:46 +00:00
Matthew Fritze
775f46bbbb
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev am: 3161375f78 am: 8efbe4e120 -s ours
...
am: 005748ba21
2017-08-10 02:28:43 +00:00
mingliang.x.lei
05d56ce9c8
Merge "Fix memory leak in Bluetooth settings" am: 5a652c0286 am: 8d3bb3e2ad am: c46b5e60b9 am: 8ba28798aa
...
am: cc6b8a868d
2017-08-10 02:28:19 +00:00
The Android Open Source Project
f6d579674b
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: dd6d975214 -s ours am: 5d13310d94 -s ours
...
am: df5bd79a29
2017-08-10 02:27:57 +00:00
Daniel Nishi
03b045560d
Merge "Expose the notification-swipe controls." into oc-dr1-dev am: c075f8943e am: 5f3f655ad2
...
am: a17d748f9b
2017-08-10 02:27:12 +00:00
Ruchi Kandoi
7b5bc6b2b1
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev am: 9eff3f90d8 am: 3b012860db
...
am: 71a351af08
2017-08-10 02:26:48 +00:00
Salvador Martinez
cb9614d18c
Merge "Update availability for mobile network" into oc-dr1-dev am: 4bcc3eb193 am: 3781030b94
...
am: 5cefe64942
2017-08-10 02:25:43 +00:00
qqzhou
bef7e0de9d
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev am: 2c2b6b48de am: 467aad4219
...
am: add20708ba
2017-08-10 02:25:22 +00:00
Daniel Nishi
11c93deda6
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev am: 97e0e42959 -s ours am: 14be0e4124 -s ours
...
am: 319c45ad51
2017-08-10 02:24:19 +00:00
Matthew Fritze
6de9f65ced
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev am: 3161375f78 -s ours am: 730bad152c -s ours
...
am: 580810a738
2017-08-10 02:22:54 +00:00
The Android Open Source Project
1ad08db58c
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: dd6d975214 -s ours am: aeee659147 -s ours
...
am: 71460b0859
2017-08-10 02:22:31 +00:00
Daniel Nishi
591c654fb7
Merge "Expose the notification-swipe controls." into oc-dr1-dev am: c075f8943e am: 8bbc28a95b
...
am: 6df5c65f45
2017-08-10 02:22:09 +00:00
Ruchi Kandoi
01e0523441
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev am: 9eff3f90d8 am: bf81a17a31
...
am: 706c6ba20e
2017-08-10 02:21:48 +00:00
Salvador Martinez
f3692132ca
Merge "Update availability for mobile network" into oc-dr1-dev am: 4bcc3eb193 am: 7bc388d823
...
am: 35c0949b2e
2017-08-10 02:20:50 +00:00
Ajay Nadathur
3253b7ee7c
Merge "Show confirmation dialog when user tries to skip fingerprint" into oc-mr1-dev am: 0ed0319005
...
am: b9c3eb954a
2017-08-10 02:20:25 +00:00
Fan Zhang
2b050a3663
Merge "Close cursor after getting data from DB" into oc-mr1-dev am: 298d559c40
...
am: 876513ec38
2017-08-10 02:20:02 +00:00
Eric Schwarzenbach
c03105dfb3
Merge "Fix issue where connected network sometimes doesn't update." into oc-mr1-dev am: 51bde3c8fe
...
am: 33840ce005
2017-08-10 02:19:36 +00:00
Justin Klaassen
27ef303dd1
Merge "Ask device owner for master clear in demo mode" into oc-mr1-dev am: d59854de24
...
am: 6652cfcd7e
2017-08-10 02:19:12 +00:00
Justin Klaassen
a2075d2eb4
DO NOT MERGE - Ask device owner for master clear in demo mode am: a22c8345fa -s ours
...
am: be3c8bf442
2017-08-10 00:37:58 +00:00
Fan Zhang
a8f7f745e1
Merge "Delete DynamicindexableContentMonitor & all refs to it" into oc-mr1-dev
...
am: 5b820431d3
2017-08-10 00:37:34 +00:00
Justin Klaassen
be3c8bf442
DO NOT MERGE - Ask device owner for master clear in demo mode
...
am: a22c8345fa
2017-08-10 00:36:20 +00:00
TreeHugger Robot
5b820431d3
Merge "Delete DynamicindexableContentMonitor & all refs to it" into oc-mr1-dev
2017-08-10 00:28:03 +00:00
Fan Zhang
e3535d9998
Delete DynamicindexableContentMonitor & all refs to it
...
Convert input device search into a search query loader
And remove old logic from DynamicIndexableContentMonitor
Change-Id: If652b1ea7c8add9185bbd025055e14925d3a8eec
Bug: 64310452
Bug: 63831980
Test: robotests
2017-08-09 17:27:02 -07:00
qqzhou
23a16c2ae4
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev am: 2c2b6b48de
...
am: 13d1167e44
2017-08-10 00:09:08 +00:00
Daniel Nishi
2151d69764
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev am: 97e0e42959
...
am: b2da45dd09
2017-08-10 00:08:13 +00:00
TreeHugger Robot
d0b09f7868
Merge "Remove code for old wifi tether feature"
2017-08-10 00:08:03 +00:00
Matthew Fritze
005748ba21
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev am: 3161375f78
...
am: 8efbe4e120
2017-08-10 00:06:54 +00:00
mingliang.x.lei
cc6b8a868d
Merge "Fix memory leak in Bluetooth settings" am: 5a652c0286 am: 8d3bb3e2ad am: c46b5e60b9
...
am: 8ba28798aa
2017-08-10 00:06:32 +00:00
The Android Open Source Project
df5bd79a29
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: dd6d975214 -s ours
...
am: 5d13310d94
2017-08-10 00:06:08 +00:00
Daniel Nishi
a17d748f9b
Merge "Expose the notification-swipe controls." into oc-dr1-dev am: c075f8943e
...
am: 5f3f655ad2
2017-08-10 00:05:18 +00:00
Ruchi Kandoi
71a351af08
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev am: 9eff3f90d8
...
am: 3b012860db
2017-08-10 00:04:52 +00:00
Salvador Martinez
5cefe64942
Merge "Update availability for mobile network" into oc-dr1-dev am: 4bcc3eb193
...
am: 3781030b94
2017-08-10 00:02:05 +00:00
qqzhou
add20708ba
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev am: 2c2b6b48de
...
am: 467aad4219
2017-08-09 23:04:07 +00:00
Daniel Nishi
319c45ad51
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev am: 97e0e42959 -s ours
...
am: 14be0e4124
2017-08-09 22:54:24 +00:00
Matthew Fritze
580810a738
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev am: 3161375f78 -s ours
...
am: 730bad152c
2017-08-09 22:52:43 +00:00
The Android Open Source Project
71460b0859
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: dd6d975214 -s ours
...
am: aeee659147
2017-08-09 22:52:06 +00:00
Daniel Nishi
6df5c65f45
Merge "Expose the notification-swipe controls." into oc-dr1-dev am: c075f8943e
...
am: 8bbc28a95b
2017-08-09 22:51:45 +00:00
qqzhou
467aad4219
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev
...
am: 2c2b6b48de
2017-08-09 22:41:12 +00:00
Daniel Nishi
14be0e4124
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev
...
am: 97e0e42959
2017-08-09 22:39:55 +00:00
Matthew Fritze
730bad152c
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev
...
am: 3161375f78
2017-08-09 22:38:28 +00:00
The Android Open Source Project
aeee659147
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: dd6d975214
2017-08-09 22:37:57 +00:00
Daniel Nishi
8bbc28a95b
Merge "Expose the notification-swipe controls." into oc-dr1-dev
...
am: c075f8943e
2017-08-09 22:37:34 +00:00
Justin Klaassen
a22c8345fa
DO NOT MERGE - Ask device owner for master clear in demo mode
...
Bug: 62712426
Test: make RunSettingsRoboTests -j19
Change-Id: I29f92ff1062590f2c5eb7713e5969da7870fc582
2017-08-09 15:37:01 -07:00
qqzhou
13d1167e44
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev
...
am: 2c2b6b48de
2017-08-09 21:07:36 +00:00
TreeHugger Robot
2c2b6b48de
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev
2017-08-09 20:57:50 +00:00
Ruchi Kandoi
706c6ba20e
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev am: 9eff3f90d8
...
am: bf81a17a31
2017-08-09 20:35:36 +00:00
Salvador Martinez
35c0949b2e
Merge "Update availability for mobile network" into oc-dr1-dev am: 4bcc3eb193
...
am: 7bc388d823
2017-08-09 20:28:30 +00:00
