Commit Graph

3091 Commits

Author SHA1 Message Date
Dan Sandler
559d6018b6 Merge "Some of us are weird." 2019-01-30 20:58:46 +00:00
Dan Sandler
8c6ff42abc Some of us are weird.
Test: dsandler can give OWNERS approval
Change-Id: I9b4f7903513e7171dfa51aa39a32b6bcfbfbb0eb
2019-01-29 14:44:39 -05:00
jin.dong
690dc0ed98 Add Dynamic tiles for Settings
Add new CategoryKey for screens below:
   about_legal.xml
   my_device_info.xml
   battery_saver_settings.xml

Bug: 113249409
Change-Id: I042d39bfde0875cb4f88b4994ac1e9856e7e6a0a
Merged-In: I042d39bfde0875cb4f88b4994ac1e9856e7e6a0a
2019-01-16 00:54:24 +00:00
Treehugger Robot
b5278998c7 Merge changes from topic "schematize_car_props"
* changes:
  Fix missing schematized Car system properties
  Schematize Car system properties
2018-12-14 01:31:29 +00:00
Inseob Kim
ae3056f444 Fix missing schematized Car system properties
Properties accessed across partitions are now schematized and will
become APIs to make explicit interfaces among partitions.

Bug: 117924132
Test: mma -j
Change-Id: Ib698d64d93a7bf4c1d9b7d8b883009b8de65ed09
2018-12-13 14:07:31 +09:00
Xin Li
15b123ef45 DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
Bug: 120502534
Change-Id: Idc8bfb6d97a869b76cfb87ca1a494201baf9e8bd
2018-12-11 14:13:44 -08:00
Neil Fuller
69ffbd67c2 Track move of timezone classes to libcore.timezone
Some time zone related libcore classes are moving from
libcore.util to libcore.timezone.

Bug: 119026403
Test: build only
Exempt-From-Owner-Approval: Trivial import change
Merged-In: Ie90c219799cbf9601a22a2d972c09e3d94fc0c43
Change-Id: Ie90c219799cbf9601a22a2d972c09e3d94fc0c43
(cherry picked from commit 164394db8e)
2018-11-22 09:57:12 +00:00
Risan
05c41e6a0a Introducing StubVolume in StorageManager
Bug: 110380403
Test: Tested in ARC++ (with Settings and vold changes in separate CLS)
- able to see the external storage under StorageSettings. Also tested
the sm command to print stubvolumes.

Change-Id: I7517260a40399bd9800424bb394512601f6af617
2018-11-08 21:48:35 +00:00
Stanley Tng
76439a1665 Merge "Fix missing connection state changes intent for Hearing Aids"
am: 4c7123f8e3

Change-Id: I8fd60c7a9e1458c9d391407cd53c9cd56fb5509d
2018-10-19 10:59:53 -07:00
Stanley Tng
3b24d97130 Fix missing connection state changes intent for Hearing Aids
In some corner cases, the intent receiver for hearing aids CONNECTION_STATE_CHANGED
is not registered. This fixes this problem.

Test: Manual tests with one Hearing Aid device and in Settings-Device
details page.
Bug: 116643085

Change-Id: I20bf6b9fe929cd8753a20b8112e66467e560f6df
Merged-In: I20bf6b9fe929cd8753a20b8112e66467e560f6df
Merged-In: Id2dc364dfa815e72db91b92bcee9745e6c40d34a
2018-10-19 07:05:41 +00:00
Stanley Tng
f093798a61 resolve merge conflicts of 23ccecc4ca to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I5fbdb4b246cc34ac5c6fcfe39e41a16137e9f9ab
Merged-In: Id2dc364dfa815e72db91b92bcee9745e6c40d34a
Merged-In: Ia9df6facd99ae91ebb4a819f61ea27551ce35efe
2018-10-17 08:33:56 -07:00
Stanley Tng
c1d5c4fadb Fix Connect State message in Device details for Hearing Aids
In the Device details of Settings App and when using two Hearing Aids
devices (left and right sides), this will fix the summary messages
for these two devices. Previously, the connect state of the summary
messages are inconsistent and does not always update. This CL will
always make sure that both side devices are refreshed at the same time
and also make sure that we get the summary messages of both sides.
Also added Robo tests for the changes.

Test: Manual tests and also ran RunSettingsLibRoboTests and RunSettingsRoboTests.
Bug: 117074814
Bug: 116317072
Change-Id: Ia9df6facd99ae91ebb4a819f61ea27551ce35efe
Merged-In: Id2dc364dfa815e72db91b92bcee9745e6c40d34a
Merged-In: Ia9df6facd99ae91ebb4a819f61ea27551ce35efe
2018-10-15 22:50:35 +00:00
Bill Yi
5db5d43b61 Import translations. DO NOT MERGE
Change-Id: I23491eb0f29da573570e464147af17ab2839fd8d
Auto-generated-cl: translation import
2018-10-15 00:33:51 -07:00
Jack He
7886cfcf56 Merge "Remove BluetoothDevice.ACTION_DISAPPEARED"
am: cf1176073d

Change-Id: I1715c848fac8adfd41c7371a7103ea31bf4488ac
2018-10-10 20:59:31 -07:00
Jack He
4618ce3a06 Remove BluetoothDevice.ACTION_DISAPPEARED
This intent was never sent by the Bluetooth stack

Bug: 112115770
Test: make
Change-Id: I6c2b87529af7e6a7123cde8141fbdb9d1822ec9f
Merged-In: I6c2b87529af7e6a7123cde8141fbdb9d1822ec9f
(cherry picked from commit dd1c592fcd)
2018-10-10 17:43:32 -07:00
Chienyuan
6ac6aead0d Merge "Add SapProfile to LocalBluetoothProfileManager (1/2)"
am: fce8595437

Change-Id: I99f1cca275d571662f16427cbd330398ed6fb9f1
2018-10-03 11:48:46 -07:00
Treehugger Robot
fce8595437 Merge "Add SapProfile to LocalBluetoothProfileManager (1/2)" 2018-10-03 18:04:28 +00:00
Chienyuan
2be42b972c Add SapProfile to LocalBluetoothProfileManager (1/2)
* add SapProfile and related logic to LocalBluetoothProfileManager
* simplify logic for connect and disconnect in SapProfile
* connect: remove connected device check logic. SapService will
  return false directly.
* disconnect: remove connected device check logic. SapService will
  check it.
* getConnectionStatus: remove connected device check logic.
  SapService will check it.
* remove member variable V and related checks.
* wrap if/else statement in curly brackets.
* add robotest for SapProfile.

Bug: 116281023
Test: make -j42 RunSettingsLibRoboTests ROBOTEST_FILTER=SapProfileTest
Change-Id: I2efc1beb7a12e1ec412baf54f895d2ebe930e8f1
Merged-In: I2efc1beb7a12e1ec412baf54f895d2ebe930e8f1
2018-10-03 11:05:31 +00:00
Jin Dong
cb476f5fd6 Merge "Add vendor notice header at the top of Third-party licenses"
am: 05e75be642

Change-Id: Ibfa8d796d67017dffab15faefd223721980b6921
2018-09-28 18:35:25 -07:00
Jin Dong
16c8c0aef5 Add vendor notice header at the top of Third-party licenses
Vendor can add notice header at the top of "Third-party licenses"
by overlay the string notice_header.

Fixes: 116298367
Change-Id: If80d69180664970441d0addccd81d65d7ab55c3b
Merged-In: If80d69180664970441d0addccd81d65d7ab55c3b
2018-09-28 20:19:07 +00:00
Leon Liao
78e8da5e79 Merge "Rename method isConnectable()"
am: e238a19aa5

Change-Id: Ia19f7f53f62ff9839890e962b7b659c9f43fa3b1
2018-09-26 05:58:46 -07:00
hjchangliao
7fdac2d088 Remove wrapper for BluetoothA2dp
Remove BluetoothA2dpWrapper,
Use BluetoothA2dp to replace all of them.

Bug: 76167422
Change-Id: I2a55677eb8ce4ef62008aa06929b0b78515b28e5
Merged-In: I2a55677eb8ce4ef62008aa06929b0b78515b28e5
Test: RunSettingsLibRoboTests
2018-09-26 11:55:04 +01:00
Leon Liao
e238a19aa5 Merge "Rename method isConnectable()" 2018-09-25 23:06:20 +00:00
Leon Liao
3b5e6bd4e1 Rename method isConnectable()
LocalBluetoothProfile.isConnectable() checks whether the user can initiate a connection
for a specific profile, not really whether the profile is connectable.

Change-Id: If6c6cd1554acf35db2460ea6ddb65148a7e86e45
Bug: 79982487
Test: build
2018-09-20 09:21:26 +08:00
Chienyuan
cee5628c9b Merge "Simplify logic for connect in PbapClientProfile"
am: 7cfbdcc481

Change-Id: I9e96f965c94671b31a25245acc70757fabf6ff7b
2018-09-18 22:24:51 -07:00
Chienyuan
f374663b3a Merge "Simplify logic for getConnectionStatus in HidDeviceProfile"
am: b545c70d1d

Change-Id: I6b876ae488809fd84e5c399fda2b5d7c3abfc8ae
2018-09-18 22:11:48 -07:00
Chienyuan
e7374ba2c7 Merge "Simplify logic for connect in MapClientProfile"
am: 0ac2a840a0

Change-Id: Ibd99ec5998fc81b302235912076f5df153b5d8ba
2018-09-18 22:08:48 -07:00
Treehugger Robot
7cfbdcc481 Merge "Simplify logic for connect in PbapClientProfile" 2018-09-19 04:24:19 +00:00
Treehugger Robot
b545c70d1d Merge "Simplify logic for getConnectionStatus in HidDeviceProfile" 2018-09-19 02:08:33 +00:00
Chienyuan
a16ad76a81 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
Merged-In: Ic3620c8910e5acbb14e33369ff437d434b514ddf
2018-09-18 11:14:40 +08:00
Chienyuan
d8ebc8db54 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
Merged-In: Ide43ee5cec560945ad69639782ad6f214ea0cece
2018-09-18 10:21:50 +08:00
Chienyuan
932e63b32e 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
Merged-In: I2e7fdd69a46707339a32db4304666e50fd0cf954
2018-09-17 03:30:15 +00:00
Chienyuan
6b245cdff6 Merge "Simplify logic for connect in HfpClientProfile"
am: 57d9052ce8

Change-Id: If8fed65f3e0760c4ba7e16908f3c720eefa60162
2018-09-12 21:23:27 -07:00
Chienyuan
731fd3c48c Merge "Simplify logic for connect in A2dpSinkProfile"
am: eff45f36cf

Change-Id: I78762f35350b9d7ac567e46cd30c728de6782bf3
2018-09-12 21:19:10 -07:00
Treehugger Robot
57d9052ce8 Merge "Simplify logic for connect in HfpClientProfile" 2018-09-13 03:00:19 +00:00
Treehugger Robot
eff45f36cf Merge "Simplify logic for connect in A2dpSinkProfile" 2018-09-13 02:58:50 +00:00
Chienyuan
b6e4b8ab58 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
Merged-In: Ie36efd6d0a9f8e6501a3690b026ea4bd39744b5c
2018-09-12 15:24:37 +08:00
Chienyuan
dcbc7def1f 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
Merged-In: Ia0a118d73e5bb35ed3b2b75e67aeb98ae936981f
2018-09-12 15:15:42 +08:00
Treehugger Robot
e899768988 Merge "DO NOT MERGE base: getDataUsageInfo get cycle validation" 2018-09-11 22:02:49 +00:00
John Zhao
99c1ddc921 DO NOT MERGE base: getDataUsageInfo get cycle validation
When the DataUsageController calculate the DataUsageInfo
based on the cycle from NetworkPolicyManager, that cycle
should be not null. Otherwise, it couldn't be used to do
operation like toInstant() directly.

The error could be got from logcat is as:
E AndroidRuntime: Caused by: java.lang.NullPointerException:
Attempt to invoke virtual method 'java.time.Instant
java.time.ZonedDateTime.toInstant()' on a null object reference

E AndroidRuntime:          at com.android.settingslib.net.
DataUsageController.getDataUsageInfo
(DataUsageController.java:140)

Inside of the core/java/android/net/NetworkPolicyManager.java:
public static Iterator<Pair<ZonedDateTime, ZonedDateTime>>
 cycleIterator(NetworkPolicy policy) {
... ...
return Pair.create(null, null);
... ...
}
That should be avoided.

Considering it could be happened in the NetworkPolicyManager side,
and it is reasonable if it did it, validating operation is better
to be considered by any caller such as the DataUsageController.

Bug: 113952713

Test: specify the hasNext to be false but the DataUsageController
don't crash.

Change-Id: I2469c129a160e30615ea6011adf18688f951eac8
Signed-off-by: John Zhao <yuankuiz@qualcomm.corp-partner.google.com>
2018-09-11 20:47:06 +00: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
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
09c5a1d208 DO NOT MERGE: Reordered imports according to Android style.
Test: rebuild
Change-Id: I7b1ad77039868c6a827478fbbb32e0fd5c9a29cf
2018-09-04 13:57:29 -07:00
Chienyuan
474e4f3163 Merge "Simply logic for connect and disconnect in HeadsetProfile"
am: 7aae482135

Change-Id: I59e9d745d64f20e84dd888f3981290b9296f4815
2018-08-29 19:16:13 -07:00
Chienyuan
9cc6c2aa2e Merge "Remove connected device check logic in getConnectionState"
am: 8593fc6c06

Change-Id: I86b30d27d3d7ab35473e8710b100e5730dfa12a4
2018-08-29 19:12:37 -07:00
Treehugger Robot
7aae482135 Merge "Simply logic for connect and disconnect in HeadsetProfile" 2018-08-30 01:55:56 +00:00