Salvador Martinez
c40fc310d4
Merge "Refactor permissions code for bluetooth controller enabler am: a8db5ccea8 am: b1c0e38284" into oc-mr1-dev-plus-aosp
...
am: 08e592d8f2
2017-08-08 03:22:08 +00: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
Android Build Merger (Role)
08e592d8f2
Merge "Refactor permissions code for bluetooth controller enabler am: a8db5ccea8 am: b1c0e38284" into oc-mr1-dev-plus-aosp
2017-08-08 03:07:45 +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
e5e1b508f2
Refactor permissions code for bluetooth controller enabler am: a8db5ccea8
...
am: b1c0e38284
2017-08-08 03:07:08 +00:00
Salvador Martinez
b32159f242
Refactor permissions code for bluetooth controller enabler
...
am: a8db5ccea8
2017-08-08 03:04:45 +00:00
Salvador Martinez
b1c0e38284
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
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
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
108c4a490e
Merge "Merge "Expose Location toggling logic" into oc-dr1-dev am: 4f0e5f8395 -s ours am: f1398725a8 -s ours" into oc-mr1-dev-plus-aosp
...
am: ab0fa22e71
2017-08-07 17:09:08 +00:00
Matthew Fritze
d780e6c06e
Merge "Expose Location toggling logic" into oc-dr1-dev am: 4f0e5f8395 am: d1b29a4350 -s ours
...
am: 4023fdd48d
2017-08-07 17:08:20 +00:00
Android Build Merger (Role)
ab0fa22e71
Merge "Merge "Expose Location toggling logic" into oc-dr1-dev am: 4f0e5f8395 -s ours am: f1398725a8 -s ours" into oc-mr1-dev-plus-aosp
2017-08-07 17:06:17 +00:00
Matthew Fritze
13c0095207
Merge "Expose Location toggling logic" into oc-dr1-dev am: 4f0e5f8395 -s ours
...
am: f1398725a8
2017-08-07 17:05:37 +00:00
Matthew Fritze
4023fdd48d
Merge "Expose Location toggling logic" into oc-dr1-dev am: 4f0e5f8395
...
am: d1b29a4350
2017-08-07 17:05:20 +00:00
Matthew Fritze
f1398725a8
Merge "Expose Location toggling logic" into oc-dr1-dev
...
am: 4f0e5f8395
2017-08-07 17:03:14 +00: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
Bill Yi
640a6f75b8
Import translations. DO NOT MERGE am: c89d5b0093 -s ours am: 335a436998 -s ours am: cf297dcca3 -s ours
...
am: 7f49c85987
2017-08-07 06:30:53 +00:00
Bill Yi
7f49c85987
Import translations. DO NOT MERGE am: c89d5b0093 -s ours am: 335a436998 -s ours
...
am: cf297dcca3
2017-08-07 06:22:10 +00:00
Bill Yi
cf297dcca3
Import translations. DO NOT MERGE am: c89d5b0093 -s ours
...
am: 335a436998
2017-08-07 06:02:28 +00:00
Bill Yi
335a436998
Import translations. DO NOT MERGE
...
am: c89d5b0093
2017-08-07 05:50:24 +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
Matthew Fritze
a9dfbcee2b
Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-mr1-dev
...
am: 688e5438dd
2017-08-06 20:52:37 +00:00
TreeHugger Robot
688e5438dd
Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-mr1-dev
2017-08-06 20:46:27 +00:00
Bill Yi
c89d5b0093
Import translations. DO NOT MERGE
...
Change-Id: Iba61a113e9577a1afa3e18880e803c65352e1a73
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-06 10:38:44 -07:00
Bill Yi
1873ef963c
Import translations. DO NOT MERGE am: 57c8508960 -s ours
...
am: e9376927a0
2017-08-06 05:02:30 +00:00
Bill Yi
e9376927a0
Import translations. DO NOT MERGE
...
am: 57c8508960
2017-08-06 04:55:27 +00:00
Bill Yi
57c8508960
Import translations. DO NOT MERGE
...
Change-Id: I2383afbd653fa9e3a1ed0e469bdbd891868f992e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-05 19:27:58 -07:00
Doris Ling
13fb3db4a5
Merge "Merge "Fix crash when dismissing suggestions." into oc-dr1-dev am: 8f54cd46ff am: 1f39ca8abf -s ours" into oc-mr1-dev-plus-aosp
...
am: ab8ee77a54
2017-08-05 05:46:38 +00:00
Doris Ling
780b81a28c
Merge "Fix crash when dismissing suggestions." into oc-dr1-dev am: 8f54cd46ff -s ours am: e46ed6b7c5 -s ours
...
am: b358605a3e
2017-08-05 05:46:12 +00:00
Android Build Merger (Role)
ab8ee77a54
Merge "Merge "Fix crash when dismissing suggestions." into oc-dr1-dev am: 8f54cd46ff am: 1f39ca8abf -s ours" into oc-mr1-dev-plus-aosp
2017-08-05 05:40:07 +00:00
Doris Ling
b358605a3e
Merge "Fix crash when dismissing suggestions." into oc-dr1-dev am: 8f54cd46ff -s ours
...
am: e46ed6b7c5
2017-08-05 05:39:42 +00:00
Doris Ling
fe9be5cfc7
Merge "Fix crash when dismissing suggestions." into oc-dr1-dev am: 8f54cd46ff
...
am: 1f39ca8abf
2017-08-05 05:39:41 +00:00
Doris Ling
1f39ca8abf
Merge "Fix crash when dismissing suggestions." into oc-dr1-dev
...
am: 8f54cd46ff
2017-08-05 05:32:43 +00:00
Doris Ling
e46ed6b7c5
Merge "Fix crash when dismissing suggestions." into oc-dr1-dev
...
am: 8f54cd46ff
2017-08-05 05:32:42 +00:00
