Commit Graph

3399 Commits

Author SHA1 Message Date
TreeHugger Robot
9165f58f94 Merge "Simplify logic for connect in PbapClientProfile" 2018-09-19 02:42:36 +00:00
Philip P. Moltmann
192e1c6476 Merge changes from topic "SettingsLibRestrictedLockUtils"
* changes:
  Make methods used by PermissionController @SystemApi
  Make restricted lock icon system-api
2018-09-18 15:27:36 +00:00
TreeHugger Robot
066a59da52 Merge "Simplify logic for connect in MapClientProfile" 2018-09-18 08:28:11 +00:00
Chienyuan
8862bfb36f Simplify logic for connect in MapClientProfile
* connect: remove connected device check logic. MapClientService
  will check it.
* remove member variable V and related checks.
* wrap if/else statement in curly brackets.
* add robotest for MapClientProfile.

Bug: 111812003
Test: make -j42 RunSettingsLibRoboTests ROBOTEST_FILTER=MapClientProfileTest
Change-Id: Ic3620c8910e5acbb14e33369ff437d434b514ddf
(cherry picked from commit a199c59436581b73eaf5dfc4f58f292f7f1fca25)
2018-09-18 11:42:47 +08:00
Chienyuan
a874dc1d00 Simplify logic for connect in PbapClientProfile
* connect: remove connected device check logic. PbapClientService
  will check it.
* remove member variable V and related checks.
* wrap if/else statement in curly brackets.
* add robotest for PbapClientProfile.

Bug: 111812003
Test: make -j42 RunSettingsLibRoboTests ROBOTEST_FILTER=PbapClientProfileTest
Change-Id: Ide43ee5cec560945ad69639782ad6f214ea0cece
(cherry picked from commit 12ed2468d290d5c861e5d1d88a763630dabe97da)
2018-09-18 11:13:31 +08:00
TreeHugger Robot
f24665f0c8 Merge "Simplify logic for getConnectionStatus in HidDeviceProfile" 2018-09-18 02:34:34 +00:00
Doris Ling
65f9aad6b6 Merge "Add new loader for network stats detail." 2018-09-17 23:55:03 +00:00
Lei Yu
139a8c7941 Merge "Revert "remove getName() from CachedBluetoothDeviceManager"" 2018-09-17 22:16:00 +00:00
Lei Yu
0954461374 Revert "remove getName() from CachedBluetoothDeviceManager"
This reverts commit c386c87b0e.

Reason for revert:
To fix null pointer crash in Pairing dialog. Dialog maybe triggered by intent, in which LocalBluetoothManager couldn't have instance for BluetoothDevice and will return null. As a result, we need to depend on method in CachedBluetoothManager to handle it.

Bug: 115754654
Bug: 112735753
Change-Id: I727089cfd23819f292f96f0d0232f35bc6ebac64
2018-09-17 22:15:20 +00:00
Doris Ling
d88d57a938 Add new loader for network stats detail.
- create a new loader that will replace SummaryForAllUidLoaderCompat,
which uses the NetworkStatsManager.queryDetails() to retrieve the
network stats data, instead of using the NetworkStatsSession.

Bug: 111751694
Test: make RunSettingsRoboTests
Change-Id: If5f644e65335133b12da2c786f81d9ce60214c41
2018-09-17 15:02:44 -07:00
Chienyuan
75b9c5f34b Simplify logic for getConnectionStatus in HidDeviceProfile
* getConnectionStatus: remove connected device check logic.
  HidDeviceService will check it.
* rewrite the annotation about this class
* remove member variable DEBUG and related checks.
* add robotest for HidDeviceProfile

Bug: 111812003
Test: make -j42 RunSettingsLibRoboTests ROBOTEST_FILTER=HidDeviceProfileTest
Change-Id: I2e7fdd69a46707339a32db4304666e50fd0cf954
(cherry picked from commit 89b1e5c013d250d846832634be34d8696d7160e9)
2018-09-17 10:07:42 +08:00
Fan Zhang
2cda28326a Update javadoc to deprecate non-compat version widgets
Test: rebuild
Change-Id: Iac6e16463760f66b9ff8ec64aa47c168ef67dd6c
2018-09-14 09:07:41 -07:00
Philip P. Moltmann
2d21d77e78 Make restricted lock icon system-api
Bug: 110953302
Test: CtsVerifier -> BYOD Managed Provision -> Permission Lockdown (test
created a permission disabled by admin)
Change-Id: I042668225227aabc9655d83307e60f7efe399d8d
2018-09-13 09:56:41 -07:00
TreeHugger Robot
403ffb22ba Merge "Import translations. DO NOT MERGE" 2018-09-12 23:44:39 +00:00
Bill Yi
36c2fddd8c Import translations. DO NOT MERGE
Change-Id: Ibe481b5997a96544475615048b8597d19433ae2c
Auto-generated-cl: translation import
2018-09-12 10:25:20 -07:00
TreeHugger Robot
09012c21b9 Merge "Remove mIsConnectingErrorPossible because no one uses" 2018-09-12 16:45:39 +00:00
TreeHugger Robot
a075ef624d Merge "Simplify logic for connect in A2dpSinkProfile" 2018-09-12 04:10:07 +00:00
TreeHugger Robot
242fa1737a Merge "Simplify logic for connect in HfpClientProfile" 2018-09-12 03:28:17 +00:00
timhypeng
4d3bea5e20 Remove mIsConnectingErrorPossible because no one uses
Bug: 112517004
Test: make -j42 RunSettingsLibRoboTests
Change-Id: I7511d743568117d6a5d728191dc3dfa98955bcff
2018-09-12 01:57:23 +00:00
TreeHugger Robot
1537e45837 Merge "Fix robolectric tests" 2018-09-11 23:53:19 +00:00
Fan Zhang
3cc325885d Fix robolectric tests
Test: robotests
Change-Id: I0d1ea28b52908838315804bad042a845475368ee
2018-09-11 12:48:48 -07:00
Chienyuan
447fbde7ed Simplify logic for connect in A2dpSinkProfile
* connect: remove connected device check logic. A2dpSinkService
  will check it.
* Remove member variable V and related checks.
* wrap if/else statement in curly brackets.
* add robotest for A2dpSinkProfile.

Bug: 111812003
Test: make -j42 RunSettingsLibRoboTests ROBOTEST_FILTER=A2dpSinkProfileTest
Change-Id: Ia0a118d73e5bb35ed3b2b75e67aeb98ae936981f
(cherry picked from commit b31a745fc0264a622ea9565f2d3da9c267f7f346)
2018-09-11 21:22:20 +08:00
Chienyuan
8149735cce Simplify logic for connect in HfpClientProfile
* connect: remove connected device check logic.
  HeadsetClientStateMachine will check it.
* Remove member variable V and related checks.
* wrap if/else statement in curly brackets.
* add robotest for HfpClientProfile.

Bug: 111812003
Test: make -j42 RunSettingsLibRoboTests ROBOTEST_FILTER=HfpClientProfileTest
Change-Id: Ie36efd6d0a9f8e6501a3690b026ea4bd39744b5c
(cherry picked from commit 2ecfa2abe6bee9318dcc5f0b4c3b3d3ec634f0e4)
2018-09-11 20:46:17 +08:00
Chienyuan
a0ddcc19ed Merge "Simplify logic for disconnect and getConnectionStatus in MapProfile" am: beeb35f0de am: 1b9458f0b7
am: d41367dbff

Change-Id: Ifa6c88e31dd2e8089bfd9e7ba74852e0ba993552
2018-09-10 21:28:17 -07:00
Chienyuan
d41367dbff Merge "Simplify logic for disconnect and getConnectionStatus in MapProfile" am: beeb35f0de
am: 1b9458f0b7

Change-Id: Idf3c2ec3ad89f0090fedc07b60a2c4226b176577
2018-09-10 21:18:28 -07:00
Chienyuan
1b9458f0b7 Merge "Simplify logic for disconnect and getConnectionStatus in MapProfile"
am: beeb35f0de

Change-Id: Id3180db7835d637c352f795a52e4c59b3801714d
2018-09-10 21:08:14 -07:00
Treehugger Robot
beeb35f0de Merge "Simplify logic for disconnect and getConnectionStatus in MapProfile" 2018-09-11 03:49:37 +00:00
Chienyuan
f5b1c1d045 Simplify logic for disconnect and getConnectionStatus in MapProfile
* disconnect: remove connected device check logic. BluetoothMapService
  will check it.
* getConnectionStatus: remove connected device check logic.
  BluetoothMapService will check it.
* Rewrite the annotation about this class.
* Remove member variable V and related checks.
* wrap if/else statement in curly brackets.

Bug: 111812003
Test: manual - disconnect MAP from Settings UI
Change-Id: I2469821f0ae2e3f384844326b30c7d3c4c88ab63
2018-09-09 08:21:21 +00:00
Bill Yi
b5f9b4ebd5 Import translations. DO NOT MERGE
Change-Id: Ie6451c790960cd27a15cd0bf50cf78497cf60490
Auto-generated-cl: translation import
2018-09-08 16:29:41 -07:00
Treehugger Robot
ef98a2ca1c Merge changes I7f1ef2e8,I498bc261
* changes:
  Convert sysui to bp
  Cleanup trying to move to bp
2018-09-05 22:42:52 +00:00
Jason Monk
2c3a8045cd Convert sysui to bp
Test: tests gonna test, builds gonna build
Change-Id: I7f1ef2e82ce2c74253c57de8d73079dcfe2d2264
Merged-In: I7f1ef2e82ce2c74253c57de8d73079dcfe2d2264
(cherry picked from commit a2f2d82f26)
(cherry picked from commit 1a8ee9d2f9)
(cherry picked from commit 83ce30d807)
2018-09-05 13:57:10 -07:00
Jason Monk
83ce30d807 Convert sysui to bp
Test: tests gonna test, builds gonna build
Change-Id: I7f1ef2e82ce2c74253c57de8d73079dcfe2d2264
Merged-In: I7f1ef2e82ce2c74253c57de8d73079dcfe2d2264
(cherry picked from commit a2f2d82f26)
(cherry picked from commit 1a8ee9d2f9)
2018-09-05 12:50:09 -07:00
Fan Zhang
c18bf578af Merge "Fix issue with loading all apps." 2018-09-05 18:09:24 +00:00
TreeHugger Robot
a1a76a375c Merge "Remove mUsePbapPce and mUseMapClient" 2018-09-05 08:26:32 +00:00
TreeHugger Robot
4a64b0323a Merge "Revert "Add log for StringUtil"" 2018-09-05 03:13:37 +00:00
Doris Ling
270063c079 Fix issue with loading all apps.
- when we navigate across multiple pages that access the app state
session, the resumed state for the session may become incorrect, which
leads to things that depends on the flag not being run properly. In
onResume(), first force pause the session, so that it will be in the
correct paused state so that the resume tasks will be run.

Change-Id: I6c27c98226a8e0fe99d9b80f1f4297c45a49b612
Fixes: 113272571
Test: manual
2018-09-04 17:12:19 -07:00
Fan Zhang
09c5a1d208 DO NOT MERGE: Reordered imports according to Android style.
Test: rebuild
Change-Id: I7b1ad77039868c6a827478fbbb32e0fd5c9a29cf
2018-09-04 13:57:29 -07:00
Evan Laird
97eaacba10 Don't request profile owner as user if we don't have a valid user
ag/4891733 changed DevicePolicyManager#getProfileOwnerAsUser() to call
into DPMService.getProfileOwnerAsUser() instead of getProfileOwner(). It
turns out that getProfileOwnerAsUser doesn't accept invalid userIds but
the latter method did.

This CL guards against calling that method if we don't have a valid
userId. The calling code just wants to know if a profile is managed but
I'm pretty sure a UserRecord pointing at a non-user can't be managed.

Test: Expand QS, tap user switcher icon
Change-Id: Idfe46cb6c0d25ba3817ae3639f87de70bbce2d0b
Fixes: 113777483
2018-09-04 15:06:37 -04:00
Lei Yu
c6047d3cb7 Revert "Add log for StringUtil"
This reverts commit 1aedf0768c.

Reason for revert: <INSERT REASONING HERE>

Change-Id: Iad115dd31eaea573ee43163c8ab69a7d7140f543
2018-09-04 18:32:53 +00:00
TreeHugger Robot
f694989776 Merge changes from topic "sysuibp" into pi-dev-plus-aosp
* changes:
  Convert sysui to bp
  Cleanup trying to move to bp
2018-09-04 18:27:37 +00:00
Jason Monk
1a8ee9d2f9 Convert sysui to bp
Test: tests gonna test, builds gonna build
Change-Id: I7f1ef2e82ce2c74253c57de8d73079dcfe2d2264
Merged-In: I7f1ef2e82ce2c74253c57de8d73079dcfe2d2264
(cherry picked from commit a2f2d82f26)
2018-08-31 14:03:42 -07:00
Philip P. Moltmann
7a80e14184 Merge "Factor some RestrictedLockUtils out of SettingLib" 2018-08-31 04:47:28 +00:00
TreeHugger Robot
528ffcc310 Merge "Add log for StringUtil" 2018-08-30 21:10:32 +00:00
Philip P. Moltmann
4e615e6986 Factor some RestrictedLockUtils out of SettingLib
Also make the new lib only use system-apis.

This allows mainline module to use the new
RestrictedLockUtilsSettingLib.

Unfortunately the whole RestrictedLockUtils would have caused to much
new system-api. Hence it was split into RestrictedLockUtils and
RestrictedLockUtilsInternal. This caused a lot of trivial code changes.

Bug: 110953302
Test: Built
Change-Id: I693b3bf56f3be71f0790776e3aad5694717786ef
2018-08-30 11:59:29 -07:00
jackqdyulei
1aedf0768c Add log for StringUtil
Bug: 111694886
Test: Build
Change-Id: Icf7a57baa81a554bdbe7c1359d61d78abc77e0db
2018-08-30 11:14:24 -07:00
TreeHugger Robot
2256328250 Merge "remove getName() from CachedBluetoothDeviceManager" 2018-08-30 17:35:29 +00:00
Chienyuan
42a0d509bc Merge "Simply logic for connect and disconnect in HeadsetProfile" am: 7aae482135 am: 474e4f3163
am: 5ecc085bdc

Change-Id: I73f47ee6488fe05cfd3c86f006530659ecb5df70
2018-08-29 19:43:32 -07:00
Chienyuan
495cc1eb8e Merge "Remove connected device check logic in getConnectionState" am: 8593fc6c06 am: 9cc6c2aa2e
am: ea9afe031e

Change-Id: I8b95d85fa9f4fe88fba50086329fccb0f223016b
2018-08-29 19:31:03 -07:00
Chienyuan
5ecc085bdc Merge "Simply logic for connect and disconnect in HeadsetProfile" am: 7aae482135
am: 474e4f3163

Change-Id: I45ec4ad0a2128491356982898780e7046b8f5be3
2018-08-29 19:26:48 -07:00
Chienyuan
ea9afe031e Merge "Remove connected device check logic in getConnectionState" am: 8593fc6c06
am: 9cc6c2aa2e

Change-Id: I5307bfb1a0cc22213e80e5bb2563d1a1a24c9292
2018-08-29 19:21:46 -07:00