Commit Graph

18763 Commits

Author SHA1 Message Date
jackqdyulei
51aac2af9e Merge "Add uid data even though on battery stats" into oc-mr1-dev
am: 189899c169

Change-Id: If77a54cbcb8dc972297fab9779b3947aa25cf020
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

Change-Id: If61a7e53543929257b689c9cc7326c836d6c397c
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
Salvador Martinez
0d337881ad Refactor permissions code for bluetooth controller enabler am: a8db5ccea8
am: b32159f242

Change-Id: I7734f18a3fd1c5abc401131862701c47bfae64c9
2017-08-08 03:07:08 +00:00
Salvador Martinez
b1c0e38284 Refactor permissions code for bluetooth controller enabler
am: a8db5ccea8

Change-Id: I6288cf595419229f58abb396cbe9b6cf6e2c5fc4
2017-08-08 03:04:45 +00:00
Salvador Martinez
b32159f242 Refactor permissions code for bluetooth controller enabler
am: a8db5ccea8

Change-Id: Iba30360a0ec1c074a62562d4a9937eb9e37a4881
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

Change-Id: I56d7811dd62fdfbedf5d958496448479c352dd0e
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

Change-Id: If53c79b20d637623a6d70b1c3bfd7efa788f25f3
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

Change-Id: Ie989acfd2f7896a1160cac32f5e379112737028a
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

Change-Id: Ic0ec9ab01037fa67238b541f0e9e6bd1bde630fb
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

Change-Id: Ic29118bac8ba7462e2f1dc889b4c6878e7a0e8ae
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
a9dfbcee2b Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-mr1-dev
am: 688e5438dd

Change-Id: Ib60cae1c0cf7e0c55b90792d16df3803e84a7835
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
Doris Ling
1f39ca8abf Merge "Fix crash when dismissing suggestions." into oc-dr1-dev
am: 8f54cd46ff

Change-Id: Ib2b362ce72312738201fa2003c2c5a8795c2366d
2017-08-05 05:32:43 +00:00
TreeHugger Robot
8f54cd46ff Merge "Fix crash when dismissing suggestions." into oc-dr1-dev 2017-08-05 05:20:42 +00:00
Meng Wang
8c2cd0d047 RadioInfo: fix OMADM buttons
am: d4e0fe7f93

Change-Id: Ie7b00572102938fe64c2c6d2a6ce964c02bc493b
2017-08-05 00:04:43 +00:00
Doris Ling
058d2d10e2 Fix crash when dismissing suggestions.
When the suggestions are in default mode and the number of suggestions
are more than the default count, we set the sublist of the suggestions
list as the suggestion adapter data. In this case, operation on the
suggestions list should be done in the sublist instead of the original
list to maintain the list consistency check.

Hence, when dismissing the suggestion, change to remove the suggestion
from the sugestion adapter instead of from the dashboard adapter, so
that any following interaction with the suggestions will not trigger the
concurrent modification exception.

Change-Id: I4caba74cfcc7bd0d53ad8c7dffcb127b3ebd845d
Merged-In: I970b6af8a1c72bc0c3ee89fef890ae6a669c71d2
Fix: 64279080
Test: make RunSettingsRoboTests
2017-08-04 23:44:23 +00:00
pkanwar
a0bc09c27d Merge "Add support for carrier wifi in UI." into oc-mr1-dev
am: f8f6910d7c

Change-Id: I9dd4c176660a9ddc3bae28a9345828a78b59aa95
2017-08-04 22:45:36 +00:00
Fan Zhang
9d8924bce3 Merge "Misc tweak on wifi hotspot setting page" into oc-mr1-dev
am: 4c84a61581

Change-Id: I2ffd5f2bd7fd2c58c8417a6971e53f4b2207b235
2017-08-04 22:45:08 +00:00
TreeHugger Robot
f8f6910d7c Merge "Add support for carrier wifi in UI." into oc-mr1-dev 2017-08-04 22:41:13 +00:00
TreeHugger Robot
4c84a61581 Merge "Misc tweak on wifi hotspot setting page" into oc-mr1-dev 2017-08-04 22:36:57 +00:00
Fan Zhang
93a03de38a Merge "Move a11y indexing from DynamicContentMonitor to loader" into oc-mr1-dev
am: 0bfe384b93

Change-Id: I2c9065721524a58d88dc7cf64562ad36328cb35e
2017-08-04 21:02:55 +00:00
TreeHugger Robot
0bfe384b93 Merge "Move a11y indexing from DynamicContentMonitor to loader" into oc-mr1-dev 2017-08-04 20:50:26 +00:00
Fan Zhang
1f6f8e1010 Merge "Misc tweaks in settings" into oc-mr1-dev
am: 2c9e62ab0e

Change-Id: I67f8000451a584f96beb286c57d731d2241e9899
2017-08-04 20:27:34 +00:00
TreeHugger Robot
2c9e62ab0e Merge "Misc tweaks in settings" into oc-mr1-dev 2017-08-04 20:16:36 +00:00
Doris Ling
49af0bd8ae Merge "Fix crash when dismissing suggestions." into oc-mr1-dev
am: e923d649c0

Change-Id: Id3f46f1a8a3751f82368c5effdba92db25b77199
2017-08-04 20:14:27 +00:00
Doris Ling
e923d649c0 Merge "Fix crash when dismissing suggestions." into oc-mr1-dev 2017-08-04 20:09:07 +00:00
Matthew Fritze
a35320ce3b Add INTENT_ONLY as a ResultPayload Availibility
Manual merge after a merge conflict.

Test: robotests
Bug: 64165583
Change-Id: I6eab018dc4065ceefdba2039a5842945e2f76a75
2017-08-04 11:49:24 -07:00
Fan Zhang
8722509eb9 Misc tweaks in settings
- Tweak layout for default sms picker icon. Now icons are aligned
  and forced to be in the same size
- Update string to use correct double-quote symbol
- Multiline title for some user & account setting

Change-Id: I27c1ed6459c5cd919778d535ab846b148a3f91b6
Fixes: 64285520
Fixes: 62891178
Fixes: 62265094
Fixes: 64363209
Test: robotests
Test: visual
2017-08-04 10:42:27 -07:00
Matthew Fritze
eb1c480f49 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: Ie6f4b7ce8a4024b86ba42971c5e3e24d1fd95ac6
Merged-In: I519fad6d802efd8af2e77c623f698e19d4cdc800
2017-08-04 16:11:18 +00:00
Tadashi G. Takaoka
16fdc516ac Merge "Remove SHOW_INPUT_METHOD_PICKER receiver" into oc-mr1-dev
am: 48f8ab9bc9

Change-Id: I953fa5673668123b76dfcd4690fe000d5db4885b
2017-08-04 04:19:24 +00:00
Tadashi G. Takaoka
48f8ab9bc9 Merge "Remove SHOW_INPUT_METHOD_PICKER receiver" into oc-mr1-dev 2017-08-04 04:11:42 +00:00
Meng Wang
04fc20fa19 Merge "RadioInfo: fix OMADM buttons" into oc-mr1-dev
am: 96ec0a9ade

Change-Id: I642e03b16372b632aee4bec387a7c47630b88ad0
2017-08-04 02:39:18 +00:00
TreeHugger Robot
96ec0a9ade Merge "RadioInfo: fix OMADM buttons" into oc-mr1-dev 2017-08-04 02:31:41 +00:00
Meng Wang
d4e0fe7f93 RadioInfo: fix OMADM buttons
1. Use activity context instead of application context to send broadcast
   - the activity is in phone process
2. Fix the target receiver component name
3. Remove receiver permission restrict since it's explict broadcast

Bug: 37993019
Test: manual
Change-Id: I8cf0772f4bb51617c2164aa530daaa4fdec117d2
2017-08-04 00:47:09 +00:00
Fan Zhang
7686ef863c Misc tweak on wifi hotspot setting page
- Make hotspot password show in plain text
- Make main control into a master switch style

Change-Id: I8fdb293a617787f256fb663708cfc0e454f548d2
Fixes: 63865785
Test: robotests
2017-08-03 16:23:27 -07:00
Meng Wang
a04449b88a RadioInfo: fix OMADM buttons
1. Use activity context instead of application context to send broadcast
   - the activity is in phone process
2. Fix the target receiver component name
3. Remove receiver permission restrict since it's explict broadcast

Bug: 37993019
Test: manual
Change-Id: I8cf0772f4bb51617c2164aa530daaa4fdec117d2
2017-08-03 22:47:53 +00:00
Doris Ling
9f90680456 Fix crash when dismissing suggestions.
When the suggestions are in default mode and the number of suggestions
are more than the default count, we set the sublist of the suggestions
list as the suggestion adapter data. In this case, operation on the list
should be done in the sublist instead of the original list to maintain
the list consistency check.

Hence, when dismissing the suggestion, change to remove the suggestion
from the suggestion adapter instead of from the dashboard adapter, so
that any following interaction with the suggestions will not trigger the
concurrent modification exception.

Bug: 64279080
Test: make RunSettingsRoboTests
Change-Id: I970b6af8a1c72bc0c3ee89fef890ae6a669c71d2
2017-08-03 15:12:36 -07:00