OSDN Git Service
Fan Zhang [Thu, 10 Aug 2017 00:44:59 +0000 (00:44 +0000)]
Merge "Update icon and string for new device intro suggestion" into oc-mr1-dev
am:
0dc85bcc1e
Change-Id: I3942d07dd5c0acd5640ad50b7311ba15177f5a6d
TreeHugger Robot [Thu, 10 Aug 2017 00:38:43 +0000 (00:38 +0000)]
Merge "Update icon and string for new device intro suggestion" into oc-mr1-dev
Justin Klaassen [Thu, 10 Aug 2017 00:37:58 +0000 (00:37 +0000)]
DO NOT MERGE - Ask device owner for master clear in demo mode am:
a22c8345fa -s ours
am:
be3c8bf442
Change-Id: I3514945d92ca8036a5e890317ff9343eb7784b0d
Fan Zhang [Thu, 10 Aug 2017 00:37:34 +0000 (00:37 +0000)]
Merge "Delete DynamicindexableContentMonitor & all refs to it" into oc-mr1-dev
am:
5b820431d3
Change-Id: I269323c219ccd8e5d343b62bfbc6160959f5340f
Justin Klaassen [Thu, 10 Aug 2017 00:36:20 +0000 (00:36 +0000)]
DO NOT MERGE - Ask device owner for master clear in demo mode
am:
a22c8345fa -s ours
Change-Id: Idba1b64f82a297c5617073e29c5f07902ca69177
TreeHugger Robot [Thu, 10 Aug 2017 00:28:03 +0000 (00:28 +0000)]
Merge "Delete DynamicindexableContentMonitor & all refs to it" into oc-mr1-dev
Fan Zhang [Thu, 3 Aug 2017 00:32:43 +0000 (17:32 -0700)]
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
qqzhou [Thu, 10 Aug 2017 00:09:08 +0000 (00:09 +0000)]
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev am:
2c2b6b48de
am:
13d1167e44
Change-Id: I960589b0eb1fff23b1254f462ce52d1b2e433b23
Daniel Nishi [Thu, 10 Aug 2017 00:08:13 +0000 (00:08 +0000)]
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev am:
97e0e42959
am:
b2da45dd09 -s ours
Change-Id: Ic8d931d7ca59e69d168b0ca787dfbf8643899eea
Matthew Fritze [Thu, 10 Aug 2017 00:06:54 +0000 (00:06 +0000)]
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev am:
3161375f78
am:
8efbe4e120 -s ours
Change-Id: I3b2d7249a8b174dc6fe0aa072cc8767c8c859090
mingliang.x.lei [Thu, 10 Aug 2017 00:06:32 +0000 (00:06 +0000)]
Merge "Fix memory leak in Bluetooth settings" am:
5a652c0286 am:
8d3bb3e2ad am:
c46b5e60b9
am:
8ba28798aa
Change-Id: Ib0f0e1d0ec3bbcf2223e5609bc6218f0c360a5cb
The Android Open Source Project [Thu, 10 Aug 2017 00:06:08 +0000 (00:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
dd6d975214 -s ours
am:
5d13310d94 -s ours
Change-Id: I15188bd1727dca63df2ddf3cbd1435c5bfbfc79a
Daniel Nishi [Thu, 10 Aug 2017 00:05:18 +0000 (00:05 +0000)]
Merge "Expose the notification-swipe controls." into oc-dr1-dev am:
c075f8943e
am:
5f3f655ad2
Change-Id: I74680d46cc09148a58062c5c4f24404b6cc19713
Ruchi Kandoi [Thu, 10 Aug 2017 00:04:52 +0000 (00:04 +0000)]
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev am:
9eff3f90d8
am:
3b012860db
Change-Id: I9c36d1d2f111e39a517fac319ececb7a4abf25cd
Salvador Martinez [Thu, 10 Aug 2017 00:02:05 +0000 (00:02 +0000)]
Merge "Update availability for mobile network" into oc-dr1-dev am:
4bcc3eb193
am:
3781030b94
Change-Id: Id6bee10ec7356c9446278d1d314d527a5bc8bdc3
qqzhou [Wed, 9 Aug 2017 23:04:07 +0000 (23:04 +0000)]
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev am:
2c2b6b48de
am:
467aad4219
Change-Id: I8084bdf06e20e94a2963f5bfe590a7588a9c2e4c
Daniel Nishi [Wed, 9 Aug 2017 22:54:24 +0000 (22:54 +0000)]
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev am:
97e0e42959 -s ours
am:
14be0e4124 -s ours
Change-Id: Ib0be13003a7a56fb64d0f8a901bc38850627e8f8
Matthew Fritze [Wed, 9 Aug 2017 22:52:43 +0000 (22:52 +0000)]
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev am:
3161375f78 -s ours
am:
730bad152c -s ours
Change-Id: I3a79f410b37f330deed8bdb8a6e6c7070f3ce732
The Android Open Source Project [Wed, 9 Aug 2017 22:52:06 +0000 (22:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
dd6d975214 -s ours
am:
aeee659147 -s ours
Change-Id: I446a2efc2cc4afda46abdb775ffb36044ae82983
Daniel Nishi [Wed, 9 Aug 2017 22:51:45 +0000 (22:51 +0000)]
Merge "Expose the notification-swipe controls." into oc-dr1-dev am:
c075f8943e
am:
8bbc28a95b
Change-Id: I2f52d59322a5b5f3960aa686adca06451ca87d13
qqzhou [Wed, 9 Aug 2017 22:41:12 +0000 (22:41 +0000)]
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev
am:
2c2b6b48de
Change-Id: Id7c3417b82cd6f814f5ffbdd993a8c22be1c7a81
Daniel Nishi [Wed, 9 Aug 2017 22:39:55 +0000 (22:39 +0000)]
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev
am:
97e0e42959 -s ours
Change-Id: Id1083efaf83092cf8329fac64b933dfb9e652396
Matthew Fritze [Wed, 9 Aug 2017 22:38:28 +0000 (22:38 +0000)]
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev
am:
3161375f78 -s ours
Change-Id: I34e117b92e73a36f9c3c70f7c2e6b224ed308a0b
The Android Open Source Project [Wed, 9 Aug 2017 22:37:57 +0000 (22:37 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
dd6d975214 -s ours
Change-Id: I2ae2cce68305a32c8f1272a46b3eb784e32b8b22
Daniel Nishi [Wed, 9 Aug 2017 22:37:34 +0000 (22:37 +0000)]
Merge "Expose the notification-swipe controls." into oc-dr1-dev
am:
c075f8943e
Change-Id: I479a411c032df7426d89838a668f4303c4d67a54
Justin Klaassen [Wed, 9 Aug 2017 04:58:05 +0000 (21:58 -0700)]
DO NOT MERGE - Ask device owner for master clear in demo mode
Bug:
62712426
Test: make RunSettingsRoboTests -j19
Change-Id: I29f92ff1062590f2c5eb7713e5969da7870fc582
qqzhou [Wed, 9 Aug 2017 21:07:36 +0000 (21:07 +0000)]
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev
am:
2c2b6b48de
Change-Id: I4255d1eea7583a448172dbfaba5fdec1eb168c28
TreeHugger Robot [Wed, 9 Aug 2017 20:57:50 +0000 (20:57 +0000)]
Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev
Fan Zhang [Wed, 9 Aug 2017 18:28:38 +0000 (11:28 -0700)]
Update icon and string for new device intro suggestion
Change-Id: If1cca8e54e277d0ad58b76318df58842f2bec886
Fixes:
64342027
Test: visual
Ruchi Kandoi [Wed, 9 Aug 2017 20:35:36 +0000 (20:35 +0000)]
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev am:
9eff3f90d8
am:
bf81a17a31
Change-Id: I8ac2a1d903588f27b57b7f5993cb833100436108
Salvador Martinez [Wed, 9 Aug 2017 20:28:30 +0000 (20:28 +0000)]
Merge "Update availability for mobile network" into oc-dr1-dev am:
4bcc3eb193
am:
7bc388d823
Change-Id: I33cb44239c0725efd34611c06ed1734a6898d943
Ajay Nadathur [Wed, 9 Aug 2017 20:27:45 +0000 (20:27 +0000)]
Merge "Show confirmation dialog when user tries to skip fingerprint" into oc-mr1-dev
am:
0ed0319005
Change-Id: I37fdea03ab0193a6c42da584166c30ce6ee7b3c7
Ruchi Kandoi [Wed, 9 Aug 2017 20:22:10 +0000 (20:22 +0000)]
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev
am:
9eff3f90d8
Change-Id: I35b7606035a45c1705d0d8775b55c5d7ec9aa672
Salvador Martinez [Wed, 9 Aug 2017 20:21:32 +0000 (20:21 +0000)]
Merge "Update availability for mobile network" into oc-dr1-dev
am:
4bcc3eb193
Change-Id: I8dca27c407709961ed28c64b76304894d5456781
TreeHugger Robot [Wed, 9 Aug 2017 20:15:20 +0000 (20:15 +0000)]
Merge "Show confirmation dialog when user tries to skip fingerprint" into oc-mr1-dev
Fan Zhang [Wed, 9 Aug 2017 20:05:14 +0000 (20:05 +0000)]
Merge "Close cursor after getting data from DB" into oc-mr1-dev
am:
298d559c40
Change-Id: Ie93dd52be56f24d8bf5d3e12fd1ae02cb189a588
Eric Schwarzenbach [Wed, 9 Aug 2017 20:02:03 +0000 (20:02 +0000)]
Merge "Fix issue where connected network sometimes doesn't update." into oc-mr1-dev
am:
51bde3c8fe
Change-Id: Ie9139274f1c472baa87121d5a6faf8c2b40b6a3f
Justin Klaassen [Wed, 9 Aug 2017 20:01:40 +0000 (20:01 +0000)]
Merge "Ask device owner for master clear in demo mode" into oc-mr1-dev
am:
d59854de24
Change-Id: I244bebfc463e3d045556a74a2de0cb9ef5f862af
TreeHugger Robot [Wed, 9 Aug 2017 19:58:36 +0000 (19:58 +0000)]
Merge "Close cursor after getting data from DB" into oc-mr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 19:49:41 +0000 (19:49 +0000)]
Merge "Fix issue where connected network sometimes doesn't update." into oc-mr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 19:40:03 +0000 (19:40 +0000)]
Merge "Ask device owner for master clear in demo mode" into oc-mr1-dev
Andrew Sapperstein [Wed, 9 Aug 2017 19:33:30 +0000 (19:33 +0000)]
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev am:
64b15c4a7b
am:
92592b4c25
Change-Id: I9dea2428459cf654f1e509114f2ec97ea9e6811b
Daniel Nishi [Wed, 9 Aug 2017 19:27:58 +0000 (19:27 +0000)]
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev
am:
97e0e42959
Change-Id: I14f7ce1b372520d52f6e91e047aea15e764f18a3
Matthew Fritze [Wed, 9 Aug 2017 19:26:10 +0000 (19:26 +0000)]
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev
am:
3161375f78
Change-Id: Iea4b58025fbc83557b4eb37940931eb0b831cc45
Daniel Nishi [Wed, 9 Aug 2017 19:25:35 +0000 (19:25 +0000)]
Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 19:15:27 +0000 (19:15 +0000)]
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev
mingliang.x.lei [Wed, 9 Aug 2017 18:53:07 +0000 (18:53 +0000)]
Merge "Fix memory leak in Bluetooth settings" am:
5a652c0286 am:
8d3bb3e2ad
am:
c46b5e60b9
Change-Id: I1c8766701e83c9354bebf6554742c24756de7117
Matthew Fritze [Wed, 9 Aug 2017 18:37:19 +0000 (18:37 +0000)]
Merge "Fix DataSaverBackend objects created on background threads" into oc-mr1-dev
am:
e0c0616d6f
Change-Id: I4c63b3c4fad2824d45cc6637d08074a7fb3059fd
mingliang.x.lei [Wed, 9 Aug 2017 18:36:33 +0000 (18:36 +0000)]
Merge "Fix memory leak in Bluetooth settings" am:
5a652c0286
am:
8d3bb3e2ad
Change-Id: Iebccb788115a2be1fca3144199fc3e857a11556f
mingliang.x.lei [Wed, 9 Aug 2017 18:34:07 +0000 (18:34 +0000)]
Merge "Fix memory leak in Bluetooth settings"
am:
5a652c0286
Change-Id: Ica95ac1bed6dbbc305315a32c1c9a92bb83d4574
Treehugger Robot [Wed, 9 Aug 2017 18:27:43 +0000 (18:27 +0000)]
Merge "Fix memory leak in Bluetooth settings"
TreeHugger Robot [Wed, 9 Aug 2017 18:22:21 +0000 (18:22 +0000)]
Merge "Fix DataSaverBackend objects created on background threads" into oc-mr1-dev
Fan Zhang [Wed, 9 Aug 2017 18:04:15 +0000 (18:04 +0000)]
Merge "Refresh preferences when background data switch is toggled" into oc-mr1-dev
am:
293899d5ce
Change-Id: Ic1518ede3d6ae01f409c44582415233371ba48ab
Fan Zhang [Wed, 9 Aug 2017 18:03:29 +0000 (18:03 +0000)]
Merge "Misc fixes for settings" into oc-mr1-dev
am:
54d816fd90
Change-Id: I7a015ea3ddd7b7cdd9db6896e6459ce3f491dabc
TreeHugger Robot [Wed, 9 Aug 2017 17:53:22 +0000 (17:53 +0000)]
Merge "Refresh preferences when background data switch is toggled" into oc-mr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 17:52:49 +0000 (17:52 +0000)]
Merge "Misc fixes for settings" into oc-mr1-dev
Ajay Nadathur [Tue, 1 Aug 2017 00:18:56 +0000 (17:18 -0700)]
Show confirmation dialog when user tries to skip fingerprint
- After the user finished adding lock screen, if the user tries to skip
fingerprint setup, show a confirmation dialog
bug:
64092225
Test: Manually tested; robolectric tests also added
Change-Id: Iba5088a9db93153988942cf78f11077f427e50cb
Justin Klaassen [Wed, 9 Aug 2017 04:58:05 +0000 (21:58 -0700)]
Ask device owner for master clear in demo mode
Bug:
62712426
Test: make RunSettingsRoboTests -j19
Change-Id: I29f92ff1062590f2c5eb7713e5969da7870fc582
The Android Open Source Project [Wed, 9 Aug 2017 17:14:44 +0000 (17:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
882d35715e -s ours
Change-Id: I2eccdf0b32f8a206717eedbe14a39102e9cb2070
TreeHugger Robot [Wed, 9 Aug 2017 16:46:44 +0000 (16:46 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
The Android Open Source Project [Wed, 9 Aug 2017 16:31:10 +0000 (16:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
dd6d975214 -s ours
Change-Id: Ibdf27617dfdd337155c1d2bbc756621234bdf515
Daniel Nishi [Wed, 9 Aug 2017 16:30:01 +0000 (16:30 +0000)]
Merge "Expose the notification-swipe controls." into oc-dr1-dev
am:
c075f8943e
Change-Id: If4e022ce3189995eade9b7ef8ce131bf97be71b3
TreeHugger Robot [Wed, 9 Aug 2017 16:20:46 +0000 (16:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Daniel Nishi [Wed, 9 Aug 2017 16:16:49 +0000 (16:16 +0000)]
Merge "Expose the notification-swipe controls." into oc-dr1-dev
Oren Blasberg [Wed, 9 Aug 2017 16:06:02 +0000 (16:06 +0000)]
Merge "Update SMS mirroring icon to new style." into oc-mr1-dev
am:
a3a0a1e2e8
Change-Id: I9de7aeaa4e81b969c40e137125777f8eb7274152
TreeHugger Robot [Wed, 9 Aug 2017 15:54:19 +0000 (15:54 +0000)]
Merge "Update SMS mirroring icon to new style." into oc-mr1-dev
qqzhou [Mon, 3 Jul 2017 07:10:59 +0000 (15:10 +0800)]
Settings: Fix NPE in ChannelNotificationSettings
java.lang.NullPointerException: Attempt to invoke virtual method 'int
android.app.NotificationChannel.getImportance()' on a null object
reference at com.android.settings.notification.ChannelNotificationSettings.
onActivityResult.
Change-Id: I3ec7b51e2533dc108b1a14c151e3ad70d22113e5
CRs-Fixed:
2068192
Fixes:
64116799
Fixes:
64134707
Test: monkey
Adrian Roos [Wed, 9 Aug 2017 13:55:00 +0000 (13:55 +0000)]
Merge "FRP: Add dedicated explanation strings for ConfirmCredential" into oc-mr1-dev
am:
a147d4a616
Change-Id: I6a585ed52bf746fe125cd8abcdd6ca5ac1ef8d87
Julia Reynolds [Wed, 9 Aug 2017 13:54:40 +0000 (13:54 +0000)]
Merge "Use colorful +s" into oc-mr1-dev
am:
e286c0627b
Change-Id: If04c234b436914a208c3a0cc9f3f9c6902d5d2d5
TreeHugger Robot [Wed, 9 Aug 2017 13:36:40 +0000 (13:36 +0000)]
Merge "FRP: Add dedicated explanation strings for ConfirmCredential" into oc-mr1-dev
Andrew Sapperstein [Wed, 9 Aug 2017 13:26:31 +0000 (13:26 +0000)]
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev am:
64b15c4a7b
am:
6eafaf46aa
Change-Id: I27c05398a20cfe1ece5313c31a0a502fd7ce3f42
TreeHugger Robot [Wed, 9 Aug 2017 13:25:48 +0000 (13:25 +0000)]
Merge "Use colorful +s" into oc-mr1-dev
Andrew Sapperstein [Wed, 9 Aug 2017 13:06:33 +0000 (13:06 +0000)]
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev
am:
64b15c4a7b
Change-Id: Ic1bd3074c086723c231c05fe2706f6ccc30c4cdd
Adrian Roos [Sun, 23 Jul 2017 12:18:16 +0000 (14:18 +0200)]
FRP: Add dedicated explanation strings for ConfirmCredential
Change-Id: I1bf63898509032560cd302fde9dfe05473336e49
Fixes:
63958816
Test: adb shell settings put global device_provisioned 1 && adb shell am start -a android.app.action.CONFIRM_FRP_CREDENTIAL; verify strings
Winston Man [Wed, 9 Aug 2017 09:19:43 +0000 (09:19 +0000)]
Merge "Move work notification settings back to bottom" into oc-mr1-dev
am:
466adba25e
Change-Id: Ib6e3348917eb90515aeef8e7131e55c95ee0768e
Winston Man [Wed, 9 Aug 2017 09:09:35 +0000 (09:09 +0000)]
Merge "Move work notification settings back to bottom" into oc-mr1-dev
Ruchi Kandoi [Wed, 9 Aug 2017 05:38:23 +0000 (05:38 +0000)]
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev
am:
9eff3f90d8
Change-Id: I6b27975aa51356f31c2a31c8ee04abc7bb84f2b2
Ruchi Kandoi [Wed, 9 Aug 2017 05:29:12 +0000 (05:29 +0000)]
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev
Matthew Fritze [Tue, 18 Jul 2017 20:12:05 +0000 (13:12 -0700)]
Fix DataSaverBackend objects created on background threads
Add the main looper to the handler created with each
DataSaverBackend to avoid crashes when the objects are
created on background threads.
Bug:
62022517
Test: make RunSettingsRoboTests
Change-Id: I7396107e4ed06982c8cd300912ce1f4e3c63df4c
Merged-In: Ie5ffabbfbe7660761527b3ecd51e6bc5a43c1ace
Matthew Fritze [Tue, 18 Jul 2017 20:12:05 +0000 (13:12 -0700)]
Fix DataSaverBackend objects created on background threads
Add the main looper to the handler created with each
DataSaverBackend to avoid crashes when the objects are
created on background threads.
Bug:
62022517
Test: make RunSettingsRoboTests
Change-Id: Ie5ffabbfbe7660761527b3ecd51e6bc5a43c1ace
The Android Open Source Project [Wed, 9 Aug 2017 01:20:51 +0000 (18:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5d4e5680aca99f0d47353175e796b0b3a0116598
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Salvador Martinez [Wed, 9 Aug 2017 01:20:24 +0000 (01:20 +0000)]
Merge "Update availability for mobile network" into oc-dr1-dev
am:
4bcc3eb193
Change-Id: I1f99651b28ba8576769d0efdb1283c4f6da46695
The Android Open Source Project [Wed, 9 Aug 2017 01:14:31 +0000 (18:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7c03ce57550b6618594ff59a6cb82d5871207216
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
TreeHugger Robot [Wed, 9 Aug 2017 01:06:50 +0000 (01:06 +0000)]
Merge "Update availability for mobile network" into oc-dr1-dev
Eric Schwarzenbach [Wed, 9 Aug 2017 01:04:33 +0000 (01:04 +0000)]
Merge "Add modify string to resources." into oc-mr1-dev
am:
9e47d2c233
Change-Id: I439eea568712e0818613ad8b88b2b9770ae72a68
TreeHugger Robot [Wed, 9 Aug 2017 00:46:57 +0000 (00:46 +0000)]
Merge "Add modify string to resources." into oc-mr1-dev
Fan Zhang [Wed, 9 Aug 2017 00:36:06 +0000 (17:36 -0700)]
Refresh preferences when background data switch is toggled
Change-Id: Id58f565645fc3c668b516dbd05049559afa9535e
Fixes:
64466310
Test: robotests
Daniel Nishi [Wed, 9 Aug 2017 00:29:46 +0000 (17:29 -0700)]
Expose the notification-swipe controls.
Bug:
62022517
Test: Settings robotest
Change-Id: I41368a9e03f38052bb47d04f6b98d56808d07e48
Andrew Sapperstein [Wed, 9 Aug 2017 00:20:03 +0000 (00:20 +0000)]
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev
am:
64b15c4a7b
Change-Id: I3d17c1389486b7a4d1fe901a69ffa37f1cf16b78
Maurice Lam [Wed, 9 Aug 2017 00:02:12 +0000 (00:02 +0000)]
Merge "Show help string when onEnrollmentHelp() is called" am:
5a926705ef am:
dbfde54fb6 am:
d415cbfc0d
am:
6b5f99bcbd
Change-Id: Ibf17029cec44e8767bf843358f497efebc9cec7d
TreeHugger Robot [Tue, 8 Aug 2017 23:59:50 +0000 (23:59 +0000)]
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev
Maurice Lam [Tue, 8 Aug 2017 23:26:20 +0000 (23:26 +0000)]
Merge "Show help string when onEnrollmentHelp() is called" am:
5a926705ef am:
dbfde54fb6
am:
d415cbfc0d
Change-Id: Ic3a74f8ce7d4a068d4a21fe367cd232a103bf130
Eric Schwarzenbach [Wed, 2 Aug 2017 22:29:53 +0000 (15:29 -0700)]
Fix issue where connected network sometimes doesn't update.
Ensures that the connected network Preference and WifiTracker have the
same reference so that updates to one propagate to the other.
Bug:
64124982
Test: manual
Change-Id: I1b838b1cf65da1b5aebf4f5f37f0df0c5e473dba
Maurice Lam [Tue, 8 Aug 2017 23:05:55 +0000 (23:05 +0000)]
Merge "Show help string when onEnrollmentHelp() is called" am:
5a926705ef
am:
dbfde54fb6
Change-Id: Ie98fa2d24ebe48e868762cf85129139974ce845f
Fan Zhang [Mon, 7 Aug 2017 22:11:00 +0000 (15:11 -0700)]
Close cursor after getting data from DB
Fixes:
64487360
Test: manual
Change-Id: I7d8a7550dca272a62b2c664cc893e4319e628c18
Maurice Lam [Tue, 8 Aug 2017 22:56:38 +0000 (22:56 +0000)]
Merge "Show help string when onEnrollmentHelp() is called"
am:
5a926705ef
Change-Id: I5af1cac8ee4018e40005484631b6f3f3434e03b9
Fan Zhang [Tue, 8 Aug 2017 22:28:07 +0000 (22:28 +0000)]
Merge "Clean up logic for dismissing suggestion" into oc-mr1-dev
am:
fef5f6aa4a
Change-Id: I8c5ee9684f4a1fb8356aa35ab6ca26b80ada7436
Salvador Martinez [Tue, 8 Aug 2017 22:18:30 +0000 (22:18 +0000)]
Refactor tether logic for reuse am:
135619d483
am:
4c2fc34707 -s ours
Change-Id: I0fc8272a026d188010ce8a613f02cc6c892828c7
TreeHugger Robot [Tue, 8 Aug 2017 22:13:13 +0000 (22:13 +0000)]
Merge "Clean up logic for dismissing suggestion" into oc-mr1-dev
Salvador Martinez [Tue, 8 Aug 2017 22:08:50 +0000 (22:08 +0000)]
Refactor tether logic for reuse
am:
135619d483
Change-Id: I216dcb55a0f2423766abb4c30fc996f13afda2e4
OSDN Git Service
