Bill Yi
2c386153dd
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 12c04b486d -s ours
Change-Id: I37b6cb41f86f485350a4d51a65758ac189eb7570
2018-11-06 07:12:09 -08:00
TreeHugger Robot
12c04b486d
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-11-06 14:56:17 +00:00
Bill Yi
bee19c412d
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ic5cec1018a7fe003e26b302ebcfc428b2a11e90f
2018-11-06 02:38:00 -08:00
Alan Stokes
e9b09f2bc8
Merge "Stop recording unsupported class loaders." am: c90f30d1d9
...
am: ad370ddf38
Change-Id: I10a8de9283a9af4870fba6e36b01bbe771c6686a
2018-11-06 01:29:48 -08:00
Alan Stokes
ad370ddf38
Merge "Stop recording unsupported class loaders."
...
am: c90f30d1d9
Change-Id: Ie89804c75a652608481e70bcf27b95ced43a578c
2018-11-06 01:21:42 -08:00
Alan Stokes
c90f30d1d9
Merge "Stop recording unsupported class loaders."
2018-11-06 08:58:59 +00:00
Bill Yi
274e56a6e3
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 5f14fa5049 -s ours
Change-Id: I9337472a11df5339dbe17d95c49eb3e1eae5c321
2018-11-05 21:54:51 -08:00
TreeHugger Robot
5f14fa5049
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-11-06 05:43:20 +00:00
Fabrício Ferracioli
b2995b35b7
Merge "Adding 1662 for Netherlands in the SMS shortcode whitelist." am: fa1536d33d
...
am: 632e04221d
Change-Id: I2e4884c453fb73de3d610903e2e9bd786721902b
2018-11-05 19:53:42 -08:00
Fabrício Ferracioli
632e04221d
Merge "Adding 1662 for Netherlands in the SMS shortcode whitelist."
...
am: fa1536d33d
Change-Id: Ie24b0ac85d58cc2ae64e5ced0e7041cbcfc8ecb7
2018-11-05 19:45:24 -08:00
Treehugger Robot
fa1536d33d
Merge "Adding 1662 for Netherlands in the SMS shortcode whitelist."
2018-11-06 03:34:33 +00:00
Shuo Qian
c3e1c08d03
Merge "Revert "Make getRssi() API for LTE Received Signal Strength Indication (RSSI)"" am: 1a517ba852
...
am: aea5d0afcc
Change-Id: Id631e020519573ee0bb280838684f390c8d26b75
2018-11-05 19:26:55 -08:00
Shuo Qian
aea5d0afcc
Merge "Revert "Make getRssi() API for LTE Received Signal Strength Indication (RSSI)""
...
am: 1a517ba852
Change-Id: I72cc7a0f3c566820f674333b312ffec740281c4e
2018-11-05 19:17:33 -08:00
Shuo Qian
1a517ba852
Merge "Revert "Make getRssi() API for LTE Received Signal Strength Indication (RSSI)""
2018-11-06 03:06:20 +00:00
Amin Shaikh
90ea1705b8
Merge "Reset wifi tethering state when failing in QS." into pi-dev
...
am: 76af93f6d4
Change-Id: I81f7ae9018eeb50fa070a559b12a3bbe10c2e3cb
2018-11-05 18:47:49 -08:00
Bill Yi
8893eb5296
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I148459e4f329c6b216b527c7298dde03a1f2fb73
2018-11-05 18:37:56 -08:00
TreeHugger Robot
76af93f6d4
Merge "Reset wifi tethering state when failing in QS." into pi-dev
2018-11-06 02:27:13 +00:00
Shuo Qian
5e80484991
Revert "Make getRssi() API for LTE Received Signal Strength Indication (RSSI)"
...
This reverts commit c3380f767ad3c5c1686891aae75d445c3113996a.
Reason for revert: b/119055885
Change-Id: I47e6dd038d97a9d5a48d36b53f9e75e356a1e409
2018-11-06 00:18:16 +00:00
Evan Laird
4d3fb560fd
Merge "SystemUI: Add tuner interface to StatusBarSignalPolicy" am: 3ef1990e7c
...
am: 509e8969a2
Change-Id: I02fadf1cb4fcb80e3e8f7c287d4fd376bd3bbe05
2018-11-05 10:23:46 -08:00
Evan Laird
509e8969a2
Merge "SystemUI: Add tuner interface to StatusBarSignalPolicy"
...
am: 3ef1990e7c
Change-Id: Ibeb326519b67b7f076ca01c21756f92c425efeb0
2018-11-05 10:11:21 -08:00
Evan Laird
3ef1990e7c
Merge "SystemUI: Add tuner interface to StatusBarSignalPolicy"
2018-11-05 17:57:44 +00:00
Paul Duffin
a98f107b27
Merge "Remove sun.... libcore classes from light grey/vendor lists" am: 65b79f96cd
...
am: 455c3da3e2
Change-Id: I6d6cd4a67c61ed610759c6d798118bd7262d897d
2018-11-05 06:14:19 -08:00
Paul Duffin
455c3da3e2
Merge "Remove sun.... libcore classes from light grey/vendor lists"
...
am: 65b79f96cd
Change-Id: I060ab0a9dfff6bbf0c04cd7b15bca9250d7c776e
2018-11-05 06:03:31 -08:00
Treehugger Robot
65b79f96cd
Merge "Remove sun.... libcore classes from light grey/vendor lists"
2018-11-05 13:46:02 +00:00
Fabrício Ferracioli
9e40d1a047
Adding 1662 for Netherlands in the SMS shortcode whitelist.
...
Added 1662 for Netherlands in Q3 SMS shortcode whitelist.
Test: Tests performed by Salvatore Baglieri.
BUG: 111393528
Change-Id: I406c6c7260f5bce365b3f116df8ef2045c9ba3fa
Signed-off-by: Fabrício Ferracioli <fferracioli@google.com>
2018-11-05 11:35:15 -02:00
Alan Stokes
6dba50d633
Stop recording unsupported class loaders.
...
Don't record anything if any of the classloaders in the chain are
unsupported. (This is slightly unsubtle, but matchs the existing
behavior - see below.) We can't correctly DexOpt secondary dex files
in this case anyway.
Also discard any existing records of unsupported classloaders on read.
Currently this is almost a no-op: BaseDexClassLoader doesn't notify if
there are any unknown class loaders, since
5ac512c07cfa80160e240c359349c1390a20a981, so the new check is
reachable only if there's some sort of mismatch. But I'm going to
change that soon.
Tightened up visibility a bit too.
Bug: 111336847
Test: atest --test-mapping services/core/java/com/android/server/pm/dex
Change-Id: I6af5620a73be7b6440cbafdf6a5c1da1082cbdd4
2018-11-05 11:13:46 +00:00
Tony Zhu
c274ac53a7
Merge "[Call Screening]Programmatically changing the default call screening app." am: 6dd64df8b3
...
am: 21457121f4
Change-Id: I1b570954254b4b13e3368372e17cebd0017cfa4d
2018-11-05 03:02:57 -08:00
Tony Zhu
21457121f4
Merge "[Call Screening]Programmatically changing the default call screening app."
...
am: 6dd64df8b3
Change-Id: Iaf1d79f340f57a62fe7089d094107906869383fd
2018-11-05 02:48:50 -08:00
Tony Zhu
6dd64df8b3
Merge "[Call Screening]Programmatically changing the default call screening app."
2018-11-05 10:35:27 +00:00
Junyu Lai
556ae82025
Merge "Extend onDnsEvent callback to report more fields." am: 89eb3e6117
...
am: 7a782be65d
Change-Id: Ic1b35f2b02dc60e301d39e89008617b341194382
2018-11-04 20:54:14 -08:00
Junyu Lai
7a782be65d
Merge "Extend onDnsEvent callback to report more fields."
...
am: 89eb3e6117
Change-Id: I9051489d16dd720eab9fa3a0c4d4a2c6ae07e7bd
2018-11-04 20:44:30 -08:00
Junyu Lai
89eb3e6117
Merge "Extend onDnsEvent callback to report more fields."
2018-11-05 04:29:47 +00:00
Colin Cross
c836696a92
Merge changes from topic "protobuf3.5.2" am: 1d899f6be8
...
am: 11a4d77516
Change-Id: I6ad3772bc16f236c2c5e7ba381593b10292aabde
2018-11-04 18:13:52 -08:00
Colin Cross
85201e02df
Convert statsd_test and statsd_benchmark to proto lite am: e7908d7b62
...
am: 5742f9ffa7
Change-Id: I5ef22cce9bbebe4355915ae3ab158faf14bf2708
2018-11-04 18:08:27 -08:00
Colin Cross
11a4d77516
Merge changes from topic "protobuf3.5.2"
...
am: 1d899f6be8
Change-Id: Ia235da2303ae0622bc8826fe9ac035fae894aec1
2018-11-04 17:51:56 -08:00
Colin Cross
5742f9ffa7
Convert statsd_test and statsd_benchmark to proto lite
...
am: e7908d7b62
Change-Id: Id43ecd7edc87c7e58dc194b7adbf8b48c70b5fc0
2018-11-04 17:45:26 -08:00
Colin Cross
1d899f6be8
Merge changes from topic "protobuf3.5.2"
...
* changes:
Adapt to google::protobuf::uint64 type change
Convert statsd_test and statsd_benchmark to proto lite
2018-11-05 01:13:15 +00:00
Marco Nelissen
2ed56610e8
Merge "Add key for sample rate and bits per sample" am: f7c4c728fc
...
am: f4f1adbf8f
Change-Id: I64ceb88b1d7b40e8019fb11ce47307cf7c18df65
2018-11-03 18:21:30 -07:00
Marco Nelissen
f4f1adbf8f
Merge "Add key for sample rate and bits per sample"
...
am: f7c4c728fc
Change-Id: I92c6167d344897b27a891fa5c7c3f1d6c712e1e3
2018-11-03 18:05:30 -07:00
Marco Nelissen
f7c4c728fc
Merge "Add key for sample rate and bits per sample"
2018-11-04 00:44:58 +00:00
Jack Yu
ea49d64ddb
Merge "Changed the onQualifiedNetworkTypesChanged API" am: aa08473294
...
am: 8141dd8938
Change-Id: I6198723cb22f3338c4743c8ec9af294cfdcf86fe
2018-11-03 09:09:58 -07:00
Jack Yu
8141dd8938
Merge "Changed the onQualifiedNetworkTypesChanged API"
...
am: aa08473294
Change-Id: I138cdb9c4f2f77f7f0938e46cb5bb5db09dac2d5
2018-11-03 08:50:25 -07:00
Jack Yu
aa08473294
Merge "Changed the onQualifiedNetworkTypesChanged API"
2018-11-03 15:32:55 +00:00
Elliott Hughes
0782a629aa
Merge "Track google-benchmark API changes." am: 9a8757ded5
...
am: b55d843217
Change-Id: Ia1f1454a91cd22aa1263cbdcc00adf90b511f935
2018-11-02 22:40:46 -07:00
Elliott Hughes
b55d843217
Merge "Track google-benchmark API changes."
...
am: 9a8757ded5
Change-Id: Ica91fa160f7a17e22a3a63f0dda32f558f3af003
2018-11-02 22:30:50 -07:00
Brett Chabot
8d5e64d94e
Merge "Replace use of deprecated androidx-test build rule." am: d3efd1ad0c
...
am: a16d173fc7
Change-Id: If11f4288ac60c6284a3f0510061183b2418d8d11
2018-11-02 22:22:40 -07:00
Treehugger Robot
9a8757ded5
Merge "Track google-benchmark API changes."
2018-11-03 05:11:09 +00:00
Brett Chabot
a16d173fc7
Merge "Replace use of deprecated androidx-test build rule."
...
am: d3efd1ad0c
Change-Id: I813c0659ae50fe68d14093c7cc95f7eb9f641c99
2018-11-02 22:10:22 -07:00
Treehugger Robot
d3efd1ad0c
Merge "Replace use of deprecated androidx-test build rule."
2018-11-03 04:50:12 +00:00
Risan
d17dabf5dd
Merge "ResetListener in StorageManagerService" am: 6b3a5194d9
...
am: 493110e0b4
Change-Id: I25a0a9a949d17c0a0d05106dc91254f5fbc901e3
2018-11-02 21:43:07 -07:00