Commit Graph

30373 Commits

Author SHA1 Message Date
Bill Yi
c7ca1bcf70 Import translations. DO NOT MERGE
am: 66ff06da2f  -s ours

Change-Id: I82b52721cd65db19cbdcc0c4d062ab4875a9d6f6
2017-04-02 03:58:11 +00:00
Bill Yi
66ff06da2f Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I940468be84cb7790fb9c205c3648e526a4b32422
2017-04-01 16:45:18 -07:00
Amit Mahajan
9df297d566 Merge "Fix mvno match data is incorrect for APNs" am: a604afe5de
am: 33e9e31a3d

Change-Id: I5cae77d8f81a07ad6e10901a2f4b51ae700c6189
2017-03-30 22:08:12 +00:00
Amit Mahajan
33e9e31a3d Merge "Fix mvno match data is incorrect for APNs"
am: a604afe5de

Change-Id: Id63da4e2b0c9ce5b2dfca567663fe8b736126bca
2017-03-30 22:05:41 +00:00
Amit Mahajan
a604afe5de Merge "Fix mvno match data is incorrect for APNs" 2017-03-30 21:59:35 +00:00
Wei Huang
ec5109ab6d Fix mvno match data is incorrect for APNs
[Cause of Defect]
When user editing an existing apn, ApnPreference won't pass
the subId to ApnEditor.
As a result, if use change the mvno type to 'imsi', ApnEditor
can NOT fetch the correct IMSI due to invalid subId.

[How To Fix]
Pass subId to ApnEditor, which is same as adding new APN.

Bug: 34646368
Test: manual - edited an existing apn
Change-Id: I79fe55ccdeb8dab0ffcc7dfb22ba680beb58b9cd
2017-03-30 22:48:17 +09:00
Pavlin Radoslavov
30547ce3e8 Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" am: eeabd6b463
am: bc9c1d0eb8

Change-Id: I3b89011d02f159d951b39ddc8d43cb17fbd00432
2017-03-29 22:51:53 +00:00
Pavlin Radoslavov
bc9c1d0eb8 Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()"
am: eeabd6b463

Change-Id: I1ead14c5b587c9934fcd1fff450221cf83c16a3d
2017-03-29 22:47:40 +00:00
Treehugger Robot
eeabd6b463 Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" 2017-03-29 22:41:14 +00:00
Pavlin Radoslavov
b0d8cdf8f8 Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()
This API can be used to enable the optional codecs, or disable them
and use only the mandatory SBC.
Internally, it is implemented by raising the SBC priority to
highest (so SBC will be used/selected), or reducing the SBC priority
to its default value (lowest).

Test: A2DP streaming and enabling/disabling/selecting optional codecs
Bug: 35873828
Change-Id: I6e3144ff93bfc289fb25f4961fc00f39e8222290
2017-03-29 10:59:56 -07:00
Robin Lee
86c72f7ea5 Merge "Optimize code on get UidDetail in AppDataUsage" am: ec6da66728
am: 9fff988f4a

Change-Id: I7f6570192ff654203c835cc23c46139bf10e178e
2017-03-29 12:37:05 +00:00
Robin Lee
9fff988f4a Merge "Optimize code on get UidDetail in AppDataUsage"
am: ec6da66728

Change-Id: Icacae2c9cfaa6064cbb909cc06ff15791c9494d0
2017-03-29 12:34:39 +00:00
Robin Lee
ec6da66728 Merge "Optimize code on get UidDetail in AppDataUsage" 2017-03-29 12:29:36 +00:00
tiansiming
40234f6fe2 Optimize code on get UidDetail in AppDataUsage
The class UidDetailProvider providers details about a specific UID,
we can directly  apply it here.

Optimize: https://code.google.com/p/android/issues/detail?id=237810
Test: for case TrafficStats.UID_REMOVED
1.add an new User
2.generate some data traffic under the new user
3.switch to the phone owner
4.delete the User added just now
5.go to Data usage and open the item "Removed apps and users"

    for case TrafficStats.UID_TETHERING
1.open tethering and generate some data traffic
2.go to Data usage and open the item "Tethering & portable hotspot"

Change-Id: I05aa522728b296d6c06580adf809f274491cdcea
Signed-off-by: tiansiming <tiansiming@xiaomi.com>
2017-03-28 22:13:53 +08:00
fen wang
9660f0ee80 Merge "Initialize LDAC to ABR mode" am: f80b445166
am: 8bed25af1f

Change-Id: Iab167bc1688e87ea0aeb44853dda3854d1601fc9
2017-03-28 05:11:38 +00:00
fen wang
8bed25af1f Merge "Initialize LDAC to ABR mode"
am: f80b445166

Change-Id: If89ff9a484b13a61e783c0eaf251e6fd9fbb6ea8
2017-03-28 05:03:43 +00:00
Treehugger Robot
f80b445166 Merge "Initialize LDAC to ABR mode" 2017-03-28 04:54:20 +00:00
fen wang
8e568ec84c Initialize LDAC to ABR mode
Bug: 35381097
Change-Id: Idcc2fabe86acaf441f5a71f5d2bb66ad29252cdb
2017-03-28 01:32:38 +00:00
Steven Moreland
efb7925e7a Merge "Revert "Development Options: toggle binderized hals"" am: 21de66bc0c
am: 68b580f346

Change-Id: I95ed12e6c619397a1434d30c714f8f8424036647
2017-03-28 01:21:58 +00:00
Steven Moreland
68b580f346 Merge "Revert "Development Options: toggle binderized hals""
am: 21de66bc0c

Change-Id: If9288dda590a4f7fe5a60faeec695045e038ead1
2017-03-28 01:18:00 +00:00
Treehugger Robot
21de66bc0c Merge "Revert "Development Options: toggle binderized hals"" 2017-03-28 01:12:14 +00:00
Robin Lee
90f009ebb5 Merge "[VpnSettings]Crash when activity has been recycled" am: fb81f50c27
am: c834ed1e4e

Change-Id: I32ddda40ed4654288eef45dfdb2f53b2f9aba988
2017-03-27 16:25:24 +00:00
Robin Lee
c834ed1e4e Merge "[VpnSettings]Crash when activity has been recycled"
am: fb81f50c27

Change-Id: I588fc958daacfd0b7859c00c6b5b164e6e02a33d
2017-03-27 16:22:56 +00:00
Robin Lee
fb81f50c27 Merge "[VpnSettings]Crash when activity has been recycled" 2017-03-27 16:18:20 +00:00
Zhihong Li
76fb361b9d Merge "Show correct Wi-Fi status when switching to multi window mode" am: 4cc1f72576
am: a4def43fad

Change-Id: If2afcfba3811c1768a16b0f87cdae05bc50b7f31
2017-03-25 04:23:32 +00:00
Zhihong Li
a4def43fad Merge "Show correct Wi-Fi status when switching to multi window mode"
am: 4cc1f72576

Change-Id: Id60415285629e6d7a712a9f441e6e7839732bf94
2017-03-25 04:21:03 +00:00
Treehugger Robot
4cc1f72576 Merge "Show correct Wi-Fi status when switching to multi window mode" 2017-03-25 04:14:58 +00:00
Ajay Panicker
4d20929038 Merge "Add default value to Bluetooth AVRCP version property get" am: 84cf0b2a4b
am: 0347c57ef5

Change-Id: I65b5233f4980b4981a58e3b4059999c2edb4232e
2017-03-25 01:02:50 +00:00
Ajay Panicker
0347c57ef5 Merge "Add default value to Bluetooth AVRCP version property get"
am: 84cf0b2a4b

Change-Id: I21a5388ee633edb4f7b59a61390b71ea59df7205
2017-03-25 01:00:51 +00:00
Treehugger Robot
84cf0b2a4b Merge "Add default value to Bluetooth AVRCP version property get" 2017-03-25 00:58:14 +00:00
liurong
2710b99d2f [VpnSettings]Crash when activity has been recycled
This is a case we found in monkey test, the main thread handles message while the activity has been recycled. It will raise a NullPointerException when we use getActivity() in following lines.
Assumpt the situation is: settings run in background and activity been recycled quickly, but handler still in the process.

Test: NA

Change-Id: I19db4f13e13294618ec8e42e4d9c54ce23504344
Signed-off-by: liurong <liurong@xiaomi.com>
2017-03-24 15:21:23 +00:00
Ajay Panicker
0ae97550ee Merge "AVRCP version interop pereference (2/3)" am: db66a7b664
am: da582fa40d

Change-Id: I79cb69494d6d3860494f4fa36f44095e1d2c6c6f
2017-03-23 18:03:57 +00:00
Ajay Panicker
250e18c439 Add default value to Bluetooth AVRCP version property get
When the property isn't set a crash can occur since we try to look up an
empty property value.

Bug: 36531010
Test: Open Developer options after a factory reset
Change-Id: I82c0fde00774ab1a4f3e4c44a715c74d4a7804e9
2017-03-23 10:57:30 -07:00
Ajay Panicker
da582fa40d Merge "AVRCP version interop pereference (2/3)"
am: db66a7b664

Change-Id: Ia70a81c027d2e81b01f279c2816de41ef915c0f8
2017-03-23 17:56:28 +00:00
Treehugger Robot
db66a7b664 Merge "AVRCP version interop pereference (2/3)" 2017-03-23 17:49:58 +00:00
Steven Moreland
544c820ac7 Revert "Development Options: toggle binderized hals"
This reverts commit 73dd0ae30e.

Reason for revert: b/34274385 - This was a temporary setting.

Change-Id: I98b2d05c431bb5361b11cd3b05b7f5ac4e939e0e
2017-03-23 05:07:53 +00:00
Sanket Padawe
5642aa4ae8 Merge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'." am: bd9ce2e4b1
am: f54df6ccfb

Change-Id: I317f715ee814ee1511e67cc57e11ea43af9a2a4c
2017-03-23 00:58:29 +00:00
Sanket Padawe
f54df6ccfb Merge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'."
am: bd9ce2e4b1

Change-Id: I361f7c1747ab1f16cce149d78cc219f83a16948c
2017-03-23 00:45:56 +00:00
Sanket Padawe
bd9ce2e4b1 Merge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'." 2017-03-22 21:27:22 +00:00
Ajay Panicker
e50b0d490a AVRCP version interop pereference (2/3)
Add a mechanism to allow the user to select the AVRCP version broadcasted
through SDP in the developer options. This helps solve some interoperability
issues such as with Honda Carkits where broadcasting AVRCP version 1.6 causes
media metadata to fail.

Bug: 35956792
Test: Select AVRCP version through developer option
Merged-In: I7d4b1bd23342d1a96ffdf08bb7d6d3c5e5fedca6
Change-Id: I7d4b1bd23342d1a96ffdf08bb7d6d3c5e5fedca6
2017-03-22 18:50:28 +00:00
Sanket Padawe
a71788362c Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'.
Bug: 35767068
Test: No build failure on update.
Change-Id: Ib7211a9d0c10a717bfd5a7b22b8bea2b3973d12f
Merged-in: Ib7211a9d0c10a717bfd5a7b22b8bea2b3973d12f
2017-03-21 22:31:58 +00:00
Marie Janssen
912c74e02e Merge "Bluetooth: stop pairing service correctly" am: 4e32e87e57
am: b7c50119e5

Change-Id: I353995584681bd075491c09ae8db25f4223deda7
2017-03-20 21:49:43 +00:00
Marie Janssen
b7c50119e5 Merge "Bluetooth: stop pairing service correctly"
am: 4e32e87e57

Change-Id: Ied66e2bf14771853be46c09b0720c9978d53e3c9
2017-03-20 21:45:41 +00:00
Treehugger Robot
4e32e87e57 Merge "Bluetooth: stop pairing service correctly" 2017-03-20 21:37:37 +00:00
Marie Janssen
d06f49189c Bluetooth: stop pairing service correctly
If BluetoothPairingService was stopped and restarted, it would receive
a null intent, and it also would not signal correctly when it needed to
be stopped.

Since restarts can happen, check that we are still bonding when starting.

Also prevent crashes when we might be called with a null intent.

Test: initiate pairing remotely, adb am kill service, notice no crash
Bug: 36130262
Change-Id: I408811935fdb36591826f4481d103cf4799db27e
2017-03-20 12:23:26 -07:00
liurong
e821a7af23 Merge "Optimized Code: call direct method to get integer extra" am: b7fa46453a
am: 7e51242c05

Change-Id: Ide77fb0f05a8eeb2df4ab24dc1831cd734c95362
2017-03-16 17:30:51 +00:00
liurong
7e51242c05 Merge "Optimized Code: call direct method to get integer extra"
am: b7fa46453a

Change-Id: Ib7194de15766eb4912e7bbd43b308bd51dd5496a
2017-03-16 17:27:51 +00:00
Treehugger Robot
b7fa46453a Merge "Optimized Code: call direct method to get integer extra" 2017-03-16 17:23:30 +00:00
liurong
c2daeaf7e7 Optimized Code: call direct method to get integer extra
Description: Make the default preferred sim slot as the first one(0) when get PREFERRED_SIM.

Test: NA
Change-Id: Id54bdbefd413c58ecd637cb8ff522861ead79331
Signed-off-by: liurong <liurong@xiaomi.com>
2017-03-16 22:02:32 +08:00
Marie Janssen
895ac35f4d Merge "Bluetooth: leave screen off for permission request" am: 172b01035d
am: 09f5638b92

Change-Id: I5af6b6f3d6463cd33c9074d31ba0e8c16eb6c9a7
2017-03-15 23:00:06 +00:00