Maurice Lam
aed6b7bd76
Merge "Show help string when onEnrollmentHelp() is called" am: 5a926705ef am: dbfde54fb6 am: d415cbfc0d am: 6b5f99bcbd
...
am: b2aa7e7da0
2017-08-09 00:47:01 +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
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
Maurice Lam
d415cbfc0d
Merge "Show help string when onEnrollmentHelp() is called" am: 5a926705ef
...
am: dbfde54fb6
2017-08-08 23:05:55 +00: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
Salvador Martinez
a98dc7ee56
Refactor tether logic for reuse am: 135619d483 am: 4c2fc34707 -s ours
...
am: d76eddacff
2017-08-08 22:22:01 +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
f4b6da9d09
Refactor tether logic for reuse am: 135619d483 -s ours am: cc92875825 -s ours
...
am: 3c7d47bf87
2017-08-08 22:07:21 +00:00
Maurice Lam
5a926705ef
Merge "Show help string when onEnrollmentHelp() is called"
2017-08-08 22:02:20 +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
9a9a4a2d72
Merge "Add floats to the SecureSettings shadow." into oc-mr1-dev am: a28dc40543
...
am: 5abc894236
2017-08-08 21:32:19 +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
3e7613546a
Merge "SMS mirroring: Add placeholder summary." into oc-mr1-dev am: 101f3d2e44
...
am: 7f5407e6c9
2017-08-08 20:12:20 +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
Alison Cichowlas
aa62c4f1c7
Merge "Add new strings for b/63109928" into oc-mr1-dev am: 4068fe7d38
...
am: f65c06cf37
2017-08-08 20:03:30 +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
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
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
Winston Man
0372e3f258
Move work notification settings back to bottom
...
- Settings order now matches
- screenshot with work profile: https://hsv.googleplex.com/5742195667632128
- screenshot without work profile: https://hsv.googleplex.com/5683485175971840
Bug: 64436619
Test: RunSettingsRoboTests; manual
Change-Id: Ia665ee5295981e11193e69585232874d1dddba23
2017-08-08 14:58:21 +01:00
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
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
