Commit Graph

13598 Commits

Author SHA1 Message Date
Jaekyun Seok
8b5389f707 Merge "Generate license html file from xml files of partitions" am: 04a7e0a73a
am: f8aaf9ecdc

Change-Id: I8acb705a77216d95c3994ea488eabd2a4b6fc00d
2017-05-01 23:17:29 +00:00
Jaekyun Seok
fa0242c2e3 Generate license html file from xml files of partitions
Treble-ization requires each partner to store their license information
into their own partition because each partition can be updated
individually.
So each partition will have its own NOTICE.xml.gz, and Settings should
be able to generate license html from xml files of partitions.

Test: building succeeded and tested on sailfish.
  make ROBOTEST_FILTER=LicenseHtmlGeneratorFromXmlTest RunSettingsRoboTests
  make ROBOTEST_FILTER=LicenseHtmlLoaderTest RunSettingsRoboTests
  make ROBOTEST_FILTER=SettingsLicenseActivityTest RunSettingsRoboTests
Bug: 37099941
Merged-In: If797759d300ee20dd43ad8efd7d17b4f7e0c4537
Change-Id: If797759d300ee20dd43ad8efd7d17b4f7e0c4537
(cherry picked from commit 74812873f4)
2017-05-01 22:10:06 +00:00
Ajay Panicker
2151ee9b86 Merge "Limit btsnoop file size (4/8)" am: 7baae2a924
am: 7469ff3e1c

Change-Id: I34175cce212bd5c291481bee5758501b741f197c
2017-04-27 17:08:48 +00:00
Treehugger Robot
7baae2a924 Merge "Limit btsnoop file size (4/8)" 2017-04-27 17:02:05 +00:00
rongrong.x.gao
4ccf08c6d4 Merge "Fix MUT cannot connect to AP by WPS after rotating MUT" am: 2503ea04fb
am: 220e085953

Change-Id: Ia1596c05770c7ecf48830bf37f2f040c20931606
2017-04-27 04:07:11 +00:00
Treehugger Robot
2503ea04fb Merge "Fix MUT cannot connect to AP by WPS after rotating MUT" 2017-04-27 03:56:27 +00:00
Ajay Panicker
9090f85a12 Limit btsnoop file size (4/8)
Limit btsnoop file size by rotating between snoop files. The rotation occurrs
when a fixed number of packets have been logged and will start overwriting
the older file.

Bug: 35998031
Test: Enable snoop logs from developer options and let logs get large
Merged-In: I94f8f6bc12ab3f7ff406c9392934ecb7209cd635
Change-Id: I94f8f6bc12ab3f7ff406c9392934ecb7209cd635
2017-04-27 00:15:16 +00:00
rongrong.x.gao
f5761e7b79 Fix MUT cannot connect to AP by WPS after rotating MUT
While MUT is connecting to AP, rotate MUT,
then MUT can not connect to AP by WPS.
To ensure MUT can connect to AP by WPS, invoke startWps() to
re-connect after rotating MUT.

Bug: 37557898

Change-Id: Icbaff96895ad52f5c1bc6df5d180f69989527667
2017-04-25 13:39:01 +09:00
Marie Janssen
c7ad828691 Merge "Bluetooth: Make pairing notification cancellable" am: 6c142b35b4
am: 28bbd5bacb

Change-Id: I3669fab18c0cf2abffeba566580a04a8135ee7fc
2017-04-21 18:41:41 +00:00
Treehugger Robot
6c142b35b4 Merge "Bluetooth: Make pairing notification cancellable" 2017-04-21 18:31:46 +00:00
Anas Karbila
bffc5230f7 Merge "Settings: PreviewPagerAdapter: copy the full theme" am: b6bbbc91ca
am: aaf9fdc5cf

Change-Id: I5d28e158cd1159ad7074cf596752f8cbe54fab1b
2017-04-20 23:22:27 +00:00
Marie Janssen
c79470d089 Bluetooth: Make pairing notification cancellable
Add actions to the pairing service notification so the user can dismiss
the pairing request if they want to.

Add some more information to logs when the user takes an action.

Reformat the file to match android style.

Test: pair from a remote device, dismiss using the new actions
Bug: 36036358
Change-Id: Ie110044bd4caf465f454452737000f01e7430925
2017-04-20 15:22:20 -07:00
Anas Karbila
ada2ea57b4 Settings: PreviewPagerAdapter: copy the full theme
getThemeResId() returns the theme resource id which is defined inside AndroidManifest.xml.
If you set a theme via code (or add extra attributes using applyStyle method), the new theme will not be carried over.
Fix this by using setTo method with the context theme as argument.

Issue: https://issuetracker.google.com/37543358

Test: set new theme via code (or add extra attributes using applyStyle method) and check if they are carried over to the configContext context

Change-Id: I82739fe47b2d5b2d05da4cb3759b630b10dc8c8f
2017-04-20 20:11:00 +00:00
Honglu Yin
b9b563d243 Merge "Title is different after tapping "Memory used by apps"" am: 7d9146e10a
am: 4604741c51

Change-Id: I1168d6d5862745210045efea402f6d0f1e85acab
2017-04-10 23:22:49 +00:00
Jack He
336a7ccca7 Merge "Add developer menu entry to enable Bluetooth inband ringing" am: 3d08bedba2
am: 9e1e430f06

Change-Id: I8fe93eebafb60a237bfbe1009652672e17411a3d
2017-04-10 23:11:42 +00:00
Treehugger Robot
7d9146e10a Merge "Title is different after tapping "Memory used by apps"" 2017-04-10 22:53:09 +00:00
Jack He
3d08bedba2 Merge "Add developer menu entry to enable Bluetooth inband ringing" 2017-04-10 22:47:55 +00:00
Marie Janssen
f72e86f332 Merge "Bluetooth: only unregisterReceiver if we register" am: 4dc556bda8
am: c27d7effb0

Change-Id: I2c477f40e874ad33a5e3a218370f49e744c68787
2017-04-06 00:17:05 +00:00
Marie Janssen
4dc556bda8 Merge "Bluetooth: only unregisterReceiver if we register" 2017-04-06 00:01:58 +00:00
Robin Lee
1f9c67e982 Merge "RejectedExecutionException in DataUsageLIst" am: 7a8121fdd9
am: 543a98806f

Change-Id: Idc1ac1b3628afb4bdee4192305980f4dc03eeb5a
2017-04-05 13:43:17 +00:00
Robin Lee
7a8121fdd9 Merge "RejectedExecutionException in DataUsageLIst" 2017-04-05 13:35:52 +00:00
Jack He
8d64a93c6a Add developer menu entry to enable Bluetooth inband ringing
Bug: 19171297
Test: Make, HFP regression test, testplans/82144
Change-Id: Ib24463347323f83daf8b4d9f1d38bb9c3071fb95
2017-04-04 16:20:14 -07:00
Hemant Gupta
b5e14d5f30 Merge "Bluetooth: Fix Resource Leak in OPP (1/2)" am: e270a6aa85
am: 2ffab51c0e

Change-Id: I96e6196c6e1417c3115946d483d6f822367aca11
2017-04-03 17:54:06 +00:00
Hemant Gupta
2ffab51c0e Merge "Bluetooth: Fix Resource Leak in OPP (1/2)"
am: e270a6aa85

Change-Id: Ia5108737add480f2cce52663f13d496653c37320
2017-04-03 17:50:36 +00:00
Treehugger Robot
e270a6aa85 Merge "Bluetooth: Fix Resource Leak in OPP (1/2)" 2017-04-03 17:43:42 +00: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
tiansiming
8453fb3065 RejectedExecutionException in DataUsageLIst
RejectedPolicy throw Exception which will interrupt users

Bug: https://code.google.com/p/android/issues/detail?id=237575
Test: open as many online apps as possible and then open the DataUsageList
Change-Id: I2dabc6ee53cd0f27f59098328fe2a16172f71d0b
2017-03-30 23:22:02 +08: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
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
Hemant Gupta
33c7e03b6a Bluetooth: Fix Resource Leak in OPP (1/2)
Handle onDestroy in DevicePickerFragment class, which would be
called when user presses back button and does not select any device.
This will send intent to class that called DevicePickerFragment that
no device is selected.

Test: Performed the usecase overnight and see if no crash is observed.

Bug: 35626275
Change-Id: Ib3965d7dea8d59b244abdc6ffe61ef21109346fb
2017-03-29 13:45:34 +00: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
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