Fan Zhang
b5989fc3b7
Merge "Clean up logic for dismissing suggestion" into oc-mr1-dev
...
am: fef5f6aa4a
2017-08-08 22:28:07 +00:00
Salvador Martinez
d76eddacff
Refactor tether logic for reuse am: 135619d483
...
am: 4c2fc34707
2017-08-08 22:18:30 +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
3c7d47bf87
Refactor tether logic for reuse am: 135619d483 -s ours
...
am: cc92875825
2017-08-08 21:59:50 +00:00
Salvador Martinez
cc92875825
Refactor tether logic for reuse
...
am: 135619d483
2017-08-08 21:53:54 +00:00
Daniel Nishi
5abc894236
Merge "Add floats to the SecureSettings shadow." into oc-mr1-dev
...
am: a28dc40543
2017-08-08 21:03:32 +00:00
Daniel Nishi
a28dc40543
Merge "Add floats to the SecureSettings shadow." into oc-mr1-dev
2017-08-08 20:46:50 +00:00
Oren Blasberg
7f5407e6c9
Merge "SMS mirroring: Add placeholder summary." into oc-mr1-dev
...
am: 101f3d2e44
2017-08-08 20:07:55 +00:00
TreeHugger Robot
101f3d2e44
Merge "SMS mirroring: Add placeholder summary." into oc-mr1-dev
2017-08-08 20:02:42 +00:00
Alison Cichowlas
f65c06cf37
Merge "Add new strings for b/63109928" into oc-mr1-dev
...
am: 4068fe7d38
2017-08-08 19:50:50 +00:00
TreeHugger Robot
4068fe7d38
Merge "Add new strings for b/63109928" into oc-mr1-dev
2017-08-08 19:36:40 +00: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
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
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
Daniel Nishi
fb83e50d99
Add floats to the SecureSettings shadow.
...
Test: Exercised in other robotests
Change-Id: I0791bdddf0bc97abc21cd27613998247b11d7bb4
2017-08-08 11:21:01 -07:00
Alison Cichowlas
3f9d0f1614
Add new strings for b/63109928
...
Test: Strings only; manual
Bug: 63109928
Change-Id: Ib2d491aff81faa866300e6b4f3a0d7c0e1417b98
2017-08-08 11:05:23 -04: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
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
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
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
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
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
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
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
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
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
