Andrew Sapperstein
92592b4c25
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev
...
am: 64b15c4a7b
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
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
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
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
2017-08-08 22:53:23 +00:00
Fan Zhang
b5989fc3b7
Merge "Clean up logic for dismissing suggestion" into oc-mr1-dev
...
am: fef5f6aa4a
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
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
Maurice Lam
5a926705ef
Merge "Show help string when onEnrollmentHelp() is called"
2017-08-08 22:02:20 +00:00
Ruchi Kandoi
1eab553653
Avoid Race condition with accessibility for NFC toggle switch
...
Bug: 64429429
Test: Enable TalkBack; Toggle NFC settings
Change-Id: Iadeae0ca33c32b320c202efc2acf0be647b10078
2017-08-08 20:58:29 +00:00
Andrew Sapperstein
5be6c30012
Refactoring for AmbientAlwaysOnPreferenceController
...
Makes a few methods static so we can call them from other locations.
Bug: 64256644
Test: robotests
Change-Id: Ie97cda342c3143a21bd273e4d29f64f75e006059
2017-08-08 13:58:18 -07:00
Salvador Martinez
135619d483
Refactor tether logic for reuse
...
Some logic related to permissions needs to be used elsewhere. This
CL refactors the relevant code into a method so that it stays in
sync in both places.
Test: robotests still pass
Bug: 64092292
Change-Id: If8191698023d1da90db99b518d9f770683b5c789
Merged-In: I3b54529865e16b7e1640b0adda7f7edb9d1a41f7
2017-08-08 12:35:20 -07:00
jackqdyulei
0e117ecc28
Merge "Add uid data even though on battery stats" into oc-mr1-dev am: 189899c169
...
am: 51aac2af9e
2017-08-08 19:31:35 +00:00
jackqdyulei
51aac2af9e
Merge "Add uid data even though on battery stats" into oc-mr1-dev
...
am: 189899c169
2017-08-08 19:28:39 +00:00
TreeHugger Robot
189899c169
Merge "Add uid data even though on battery stats" into oc-mr1-dev
2017-08-08 19:22:50 +00:00
Salvador Martinez
9c6b2fabb5
Merge "Refactor tether logic for reuse" into oc-mr1-dev am: 705a9e7e85
...
am: 401156da7d
2017-08-08 19:06:03 +00:00
Salvador Martinez
401156da7d
Merge "Refactor tether logic for reuse" into oc-mr1-dev
...
am: 705a9e7e85
2017-08-08 19:02:08 +00:00
TreeHugger Robot
705a9e7e85
Merge "Refactor tether logic for reuse" into oc-mr1-dev
2017-08-08 18:53:39 +00:00
Julia Reynolds
fabe766958
Use colorful +s
...
Instead of grey
Change-Id: Iac0454110d3af9045a83098e67957130987ad718
Fixes: 63820885
Test: manual
2017-08-08 14:00:09 -04:00
Fan Zhang
6d479d99a9
Misc fixes for settings
...
- Set device credential's Window flag to be SECURE. This prevents
showing any pattern/pin in recent list.
- Disable tap sound on entity header
Fixes: 64339515
Fixes: 64413598
Test: visual
Test: runtest --path \
tests/app/src/com/android/settings/password/ChooseLockGenericTest.java
2017-08-08 10:34:03 -07:00
Salvador Martinez
b1a4db26d8
Refactor permissions code for bluetooth controller enabler am: a8db5ccea8 am: b32159f242
...
am: 0d337881ad
2017-08-08 03:21:29 +00:00
Salvador Martinez
0d337881ad
Refactor permissions code for bluetooth controller enabler am: a8db5ccea8
...
am: b32159f242
2017-08-08 03:07:08 +00:00
Salvador Martinez
b1c0e38284
Refactor permissions code for bluetooth controller enabler
...
am: a8db5ccea8
2017-08-08 03:04:45 +00:00
Salvador Martinez
b32159f242
Refactor permissions code for bluetooth controller enabler
...
am: a8db5ccea8
2017-08-08 03:04:45 +00:00
Salvador Martinez
a8db5ccea8
Refactor permissions code for bluetooth controller enabler
...
Bluetooth may be disabled for a user. This CL refactors the code
that determines this a bit so we can query that without having to
have the UI open.
Test: robotests still pass
Bug: 62022517
Change-Id: Ic0837d21bdc4007a20d6ad138753d4f5d37ceceb
Merged-In: I3b54529865e16b7e1640b0adda7f7edb9d1a41f7
2017-08-07 17:51:02 -07:00
Salvador Martinez
52da8a79b9
Refactor tether logic for reuse
...
Some logic related to permissions needs to be used elsewhere. This
CL refactors the relevant code into a method so that it stays in
sync in both places.
Test: robotests still pass
Bug: 64092292
Change-Id: I3b54529865e16b7e1640b0adda7f7edb9d1a41f7
2017-08-07 23:14:34 +00:00
Philip P. Moltmann
f4978f6512
Merge "Revoke invidivual permissions" into oc-mr1-dev am: 62b6b4d292
...
am: 03cb6098b2
2017-08-07 23:12:15 +00:00
Philip P. Moltmann
03cb6098b2
Merge "Revoke invidivual permissions" into oc-mr1-dev
...
am: 62b6b4d292
2017-08-07 23:06:28 +00:00
TreeHugger Robot
62b6b4d292
Merge "Revoke invidivual permissions" into oc-mr1-dev
2017-08-07 22:58:33 +00:00
jackqdyulei
fe5a771e92
Add uid data even though on battery stats
...
Advacned battery page doesn't show background toggle because it
doesn't get uid from battery stats. This cl make it get uid by
package name even though without battery stats.
Bug: 64049162
Test: RunSettingsRoboTests
Change-Id: Ie0f67ce9d080c02763a8382740e0640a66ce6053
2017-08-07 14:38:21 -07:00
Peter Qiu
3881c09e14
Merge "wifi: WifiConfigController: fix possible NPE in showSecurityFields" into oc-mr1-dev am: 8d3bfd62e1
...
am: d83df9e371
2017-08-07 20:52:51 +00:00
Peter Qiu
d83df9e371
Merge "wifi: WifiConfigController: fix possible NPE in showSecurityFields" into oc-mr1-dev
...
am: 8d3bfd62e1
2017-08-07 20:26:23 +00:00
TreeHugger Robot
8d3bfd62e1
Merge "wifi: WifiConfigController: fix possible NPE in showSecurityFields" into oc-mr1-dev
2017-08-07 20:08:31 +00:00
TreeHugger Robot
2f8c398165
Merge "Move LogPersist to SettingsLib"
2017-08-07 18:50:43 +00:00
Philip P. Moltmann
3e6222a982
Revoke invidivual permissions
...
The permission->group mapping is not guaranteed to be stable.
Bug: 64301150
Test: Manually
Change-Id: I44ec5964c01d22d615a9a4717eecabd406392752
2017-08-07 11:32:33 -07:00
Beverly
90da133162
Merge "Uninstall app through notif closes app settings." into oc-mr1-dev am: 7fc4dd7e7b
...
am: 793e3641c0
2017-08-07 17:27:17 +00:00
Beverly
793e3641c0
Merge "Uninstall app through notif closes app settings." into oc-mr1-dev
...
am: 7fc4dd7e7b
2017-08-07 17:21:53 +00:00
TreeHugger Robot
7fc4dd7e7b
Merge "Uninstall app through notif closes app settings." into oc-mr1-dev
2017-08-07 17:16:06 +00:00
Peter Qiu
486fc9dca9
wifi: WifiConfigController: fix possible NPE in showSecurityFields
...
Bug: 64438040
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: I2ddc5c07a3c95cba91cef532dc2c84529146d100
2017-08-07 10:10:15 -07:00
Matthew Fritze
d1b29a4350
Merge "Expose Location toggling logic" into oc-dr1-dev
...
am: 4f0e5f8395
2017-08-07 17:02:19 +00:00
TreeHugger Robot
4f0e5f8395
Merge "Expose Location toggling logic" into oc-dr1-dev
2017-08-07 16:53:29 +00:00
Matthew Fritze
059295559c
Expose Location toggling logic am: 6593453d59
...
am: 1857058348
2017-08-07 15:17:46 +00:00
Matthew Fritze
1857058348
Expose Location toggling logic
...
am: 6593453d59
2017-08-07 15:15:41 +00:00
Beverly
2aeff818c8
Uninstall app through notif closes app settings.
...
Change-Id: I7887c7887b654c78a0fea16e898679e434fbeb53
Fixes: 62051546
Test: manual
2017-08-07 14:21:36 +00:00
Matthew Fritze
6593453d59
Expose Location toggling logic
...
Specifically refactor the check for secondary user and the
method to toggle location mode using the previously set
location mode.
Test: robotests
Bug: 62022517
Change-Id: I519fad6d802efd8af2e77c623f698e19d4cdc800
2017-08-06 14:29:16 -07:00
Matthew Fritze
ef722b029c
Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-mr1-dev am: 688e5438dd
...
am: a9dfbcee2b
2017-08-06 20:55:07 +00:00
