Matthew Fritze
8efbe4e120
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev
...
am: 3161375f78
Change-Id: Iea4b58025fbc83557b4eb37940931eb0b831cc45
2017-08-09 19:26:10 +00:00
TreeHugger Robot
3161375f78
Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev
2017-08-09 19:15:27 +00:00
Matthew Fritze
e69329cc84
Merge "Fix DataSaverBackend objects created on background threads" into oc-mr1-dev am: e0c0616d6f
...
am: f9831dc7be
Change-Id: Ic310159af3c87a4d91445806c65976457c6ae2c0
2017-08-09 18:57:08 +00:00
mingliang.x.lei
8ba28798aa
Merge "Fix memory leak in Bluetooth settings" am: 5a652c0286
am: 8d3bb3e2ad
...
am: c46b5e60b9
Change-Id: I1c8766701e83c9354bebf6554742c24756de7117
2017-08-09 18:53:07 +00:00
Matthew Fritze
f9831dc7be
Merge "Fix DataSaverBackend objects created on background threads" into oc-mr1-dev
...
am: e0c0616d6f
Change-Id: I4c63b3c4fad2824d45cc6637d08074a7fb3059fd
2017-08-09 18:37:19 +00:00
mingliang.x.lei
8d3bb3e2ad
Merge "Fix memory leak in Bluetooth settings"
...
am: 5a652c0286
Change-Id: Ica95ac1bed6dbbc305315a32c1c9a92bb83d4574
2017-08-09 18:34:07 +00:00
Treehugger Robot
5a652c0286
Merge "Fix memory leak in Bluetooth settings"
2017-08-09 18:27:43 +00:00
TreeHugger Robot
e0c0616d6f
Merge "Fix DataSaverBackend objects created on background threads" into oc-mr1-dev
2017-08-09 18:22:21 +00:00
Fan Zhang
b5a5cc251a
Merge "Refresh preferences when background data switch is toggled" into oc-mr1-dev am: 293899d5ce
...
am: 25f9060ab7
Change-Id: I7c55bfcfb82be93e2902ef51e159115cbf6851d3
2017-08-09 18:17:29 +00:00
Fan Zhang
471f603ea5
Merge "Misc fixes for settings" into oc-mr1-dev am: 54d816fd90
...
am: e809b806f9
Change-Id: I1a1b5f2833389f0e40fe5a3a1e4b8e47db5ec9d3
2017-08-09 18:16:57 +00:00
Fan Zhang
25f9060ab7
Merge "Refresh preferences when background data switch is toggled" into oc-mr1-dev
...
am: 293899d5ce
Change-Id: Ic1518ede3d6ae01f409c44582415233371ba48ab
2017-08-09 18:04:15 +00:00
Fan Zhang
e809b806f9
Merge "Misc fixes for settings" into oc-mr1-dev
...
am: 54d816fd90
Change-Id: I7a015ea3ddd7b7cdd9db6896e6459ce3f491dabc
2017-08-09 18:03:29 +00:00
TreeHugger Robot
293899d5ce
Merge "Refresh preferences when background data switch is toggled" into oc-mr1-dev
2017-08-09 17:53:22 +00:00
TreeHugger Robot
54d816fd90
Merge "Misc fixes for settings" into oc-mr1-dev
2017-08-09 17:52:49 +00:00
Ajay Nadathur
bf3a135170
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
2017-08-09 17:51:50 +00:00
Justin Klaassen
3025727e16
Ask device owner for master clear in demo mode
...
Bug: 62712426
Test: make RunSettingsRoboTests -j19
Change-Id: I29f92ff1062590f2c5eb7713e5969da7870fc582
2017-08-09 10:44:19 -07:00
Daniel Nishi
5f3f655ad2
Merge "Expose the notification-swipe controls." into oc-dr1-dev
...
am: c075f8943e
Change-Id: If4e022ce3189995eade9b7ef8ce131bf97be71b3
2017-08-09 16:30:01 +00:00
Daniel Nishi
c075f8943e
Merge "Expose the notification-swipe controls." into oc-dr1-dev
2017-08-09 16:16:49 +00:00
qqzhou
c18c517467
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
2017-08-09 11:38:58 -04:00
Adrian Roos
d3c5da9e18
Merge "FRP: Add dedicated explanation strings for ConfirmCredential" into oc-mr1-dev am: a147d4a616
...
am: 1d192addc6
Change-Id: I1f349fbaad0c6807f1e3dccf30fe47b6c48d3eec
2017-08-09 14:18:21 +00:00
Julia Reynolds
cad51d7753
Merge "Use colorful +s" into oc-mr1-dev am: e286c0627b
...
am: 5d17c4284d
Change-Id: Ibe772dacaafd554b51cc9f5340453244106eefee
2017-08-09 14:17:57 +00:00
Adrian Roos
1d192addc6
Merge "FRP: Add dedicated explanation strings for ConfirmCredential" into oc-mr1-dev
...
am: a147d4a616
Change-Id: I6a585ed52bf746fe125cd8abcdd6ca5ac1ef8d87
2017-08-09 13:55:00 +00:00
Julia Reynolds
5d17c4284d
Merge "Use colorful +s" into oc-mr1-dev
...
am: e286c0627b
Change-Id: If04c234b436914a208c3a0cc9f3f9c6902d5d2d5
2017-08-09 13:54:40 +00:00
Andrew Sapperstein
5a53f22c02
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev am: 64b15c4a7b
am: 6eafaf46aa
...
am: d4d55b73ad
Change-Id: I5cbad3a82c0bc68453034cd00d7e184b97c965a6
2017-08-09 13:43:06 +00:00
TreeHugger Robot
a147d4a616
Merge "FRP: Add dedicated explanation strings for ConfirmCredential" into oc-mr1-dev
2017-08-09 13:36:40 +00:00
Andrew Sapperstein
d4d55b73ad
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev am: 64b15c4a7b
...
am: 6eafaf46aa
Change-Id: I27c05398a20cfe1ece5313c31a0a502fd7ce3f42
2017-08-09 13:26:31 +00:00
TreeHugger Robot
e286c0627b
Merge "Use colorful +s" into oc-mr1-dev
2017-08-09 13:25:48 +00:00
Andrew Sapperstein
6eafaf46aa
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev
...
am: 64b15c4a7b
Change-Id: Ic1bd3074c086723c231c05fe2706f6ccc30c4cdd
2017-08-09 13:06:33 +00:00
Adrian Roos
6600ddec73
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
2017-08-09 11:08:13 +00:00
Ruchi Kandoi
3b012860db
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev
...
am: 9eff3f90d8
Change-Id: I6b27975aa51356f31c2a31c8ee04abc7bb84f2b2
2017-08-09 05:38:23 +00:00
Ruchi Kandoi
9eff3f90d8
Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev
2017-08-09 05:29:12 +00:00
Matthew Fritze
7c1825aa64
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
2017-08-09 02:06:42 +00:00
Matthew Fritze
c6211c8829
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
2017-08-08 19:03:43 -07:00
Salvador Martinez
3781030b94
Merge "Update availability for mobile network" into oc-dr1-dev
...
am: 4bcc3eb193
Change-Id: I1f99651b28ba8576769d0efdb1283c4f6da46695
2017-08-09 01:20:24 +00:00
TreeHugger Robot
4bcc3eb193
Merge "Update availability for mobile network" into oc-dr1-dev
2017-08-09 01:06:50 +00:00
Maurice Lam
aed6b7bd76
Merge "Show help string when onEnrollmentHelp() is called" am: 5a926705ef
am: dbfde54fb6
am: d415cbfc0d
am: 6b5f99bcbd
...
am: b2aa7e7da0
Change-Id: Ia51c480090bc796e8844ac6af04c0b994751603b
2017-08-09 00:47:01 +00:00
Fan Zhang
816efc02fc
Refresh preferences when background data switch is toggled
...
Change-Id: Id58f565645fc3c668b516dbd05049559afa9535e
Fixes: 64466310
Test: robotests
2017-08-08 17:38:28 -07:00
Daniel Nishi
f89327aa88
Expose the notification-swipe controls.
...
Bug: 62022517
Test: Settings robotest
Change-Id: I41368a9e03f38052bb47d04f6b98d56808d07e48
2017-08-08 17:30:38 -07:00
Andrew Sapperstein
92592b4c25
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev
...
am: 64b15c4a7b
Change-Id: I3d17c1389486b7a4d1fe901a69ffa37f1cf16b78
2017-08-09 00:20:03 +00:00
Maurice Lam
b2aa7e7da0
Merge "Show help string when onEnrollmentHelp() is called" am: 5a926705ef
am: dbfde54fb6
am: d415cbfc0d
...
am: 6b5f99bcbd
Change-Id: Ibf17029cec44e8767bf843358f497efebc9cec7d
2017-08-09 00:02:12 +00:00
TreeHugger Robot
64b15c4a7b
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev
2017-08-08 23:59:50 +00:00
Maurice Lam
6b5f99bcbd
Merge "Show help string when onEnrollmentHelp() is called" am: 5a926705ef
am: dbfde54fb6
...
am: d415cbfc0d
Change-Id: Ic3a74f8ce7d4a068d4a21fe367cd232a103bf130
2017-08-08 23:26:20 +00:00
Eric Schwarzenbach
69fa528074
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
2017-08-08 16:08:19 -07:00
Fan Zhang
623faaa00e
Close cursor after getting data from DB
...
Fixes: 64487360
Test: manual
Change-Id: I7d8a7550dca272a62b2c664cc893e4319e628c18
2017-08-08 16:03:55 -07:00
Maurice Lam
dbfde54fb6
Merge "Show help string when onEnrollmentHelp() is called"
...
am: 5a926705ef
Change-Id: I5af1cac8ee4018e40005484631b6f3f3434e03b9
2017-08-08 22:56:38 +00:00
Fan Zhang
1228a6af18
Merge "Clean up logic for dismissing suggestion" into oc-mr1-dev am: fef5f6aa4a
...
am: b5989fc3b7
Change-Id: I189c0936ca9c96d1a686d33bc7da729f6a17d55b
2017-08-08 22:53:23 +00:00
Fan Zhang
b5989fc3b7
Merge "Clean up logic for dismissing suggestion" into oc-mr1-dev
...
am: fef5f6aa4a
Change-Id: I8c5ee9684f4a1fb8356aa35ab6ca26b80ada7436
2017-08-08 22:28:07 +00:00
TreeHugger Robot
fef5f6aa4a
Merge "Clean up logic for dismissing suggestion" into oc-mr1-dev
2017-08-08 22:13:13 +00:00
Salvador Martinez
4c2fc34707
Refactor tether logic for reuse
...
am: 135619d483
Change-Id: I216dcb55a0f2423766abb4c30fc996f13afda2e4
2017-08-08 22:08:50 +00:00
Salvador Martinez
fe7c35803e
Update availability for mobile network
...
This CL updates the availability to behave properly when a
user other than the primary user is accessing it. This also
makes the api return no intent if they don't have permission to
access this because attempting to go to that screen will cause a
crash. Also updates tests related to this change.
Test: robotests still pass
Bug: 64092292
Change-Id: If9913d9ae08ee3e205ff324aaeeadc755ff1d23d
2017-08-08 15:04:04 -07:00