Makoto Onuki
|
f5a4bfea67
|
Merge "Cherry-picking the following 3 getContentProviderImpl() CLs" into pi-dev
am: 8a7d8bceb5
Change-Id: Id06664361669cdb09fcb1f37c651ce024c36e693
|
2018-10-30 12:52:39 -07:00 |
|
TreeHugger Robot
|
8a7d8bceb5
|
Merge "Cherry-picking the following 3 getContentProviderImpl() CLs" into pi-dev
|
2018-10-30 19:25:40 +00:00 |
|
Stan Iliev
|
f071820f78
|
Merge "Use bilerp sampling when drawing TextureView with non-translate matrix" into pi-dev
am: 9dff553798
Change-Id: I3dbea21c751d914d8704ba564c9567029216450c
|
2018-10-30 11:56:21 -07:00 |
|
Nathan Harold
|
9e6faba5ed
|
Merge "Define CellInfo.UNAVAILABLE for Unreported Fields" am: 40745e1def
am: ae7dd94d7f
Change-Id: I7491584dfba8ccfa8f9835623f766a87268ae1d3
|
2018-10-30 11:37:43 -07:00 |
|
TreeHugger Robot
|
9dff553798
|
Merge "Use bilerp sampling when drawing TextureView with non-translate matrix" into pi-dev
|
2018-10-30 18:34:26 +00:00 |
|
Nathan Harold
|
ae7dd94d7f
|
Merge "Define CellInfo.UNAVAILABLE for Unreported Fields"
am: 40745e1def
Change-Id: I9932cfd0583f60814ed4e67a6f3c8350758b4692
|
2018-10-30 11:24:02 -07:00 |
|
Treehugger Robot
|
40745e1def
|
Merge "Define CellInfo.UNAVAILABLE for Unreported Fields"
|
2018-10-30 17:53:24 +00:00 |
|
vichang
|
1ddd44b026
|
Merge changes from topic "icu63" am: f4ab8b61ec
am: 818c18d9b8
Change-Id: I2086101f32d62f657ebfabbb297a2bcccfca13d5
|
2018-10-30 05:52:14 -07:00 |
|
Victor Chang
|
2ef788b6cf
|
Fix FormatterTest#testFormatShortElapsedTime due to CLDR 34 change am: 8ac807e010
am: 857933bd2d
Change-Id: I39219b9c358bbc6a4aa80cfb68a2415c81bf31a6
|
2018-10-30 05:47:11 -07:00 |
|
vichang
|
818c18d9b8
|
Merge changes from topic "icu63"
am: f4ab8b61ec
Change-Id: Ic084a6e5efd95ec3c82d78d74d8e155a00deff48
|
2018-10-30 05:25:39 -07:00 |
|
Victor Chang
|
857933bd2d
|
Fix FormatterTest#testFormatShortElapsedTime due to CLDR 34 change
am: 8ac807e010
Change-Id: Id817a7c14047a1a4c6069791caab94c6e64f880e
|
2018-10-30 05:19:15 -07:00 |
|
vichang
|
f4ab8b61ec
|
Merge changes from topic "icu63"
* changes:
API updated for ICU4J 63.1
Fix FormatterTest#testFormatShortElapsedTime due to CLDR 34 change
|
2018-10-30 12:04:05 +00:00 |
|
weichinweng
|
aec23b71d6
|
Merge "Add CACHED_NAME into call history database when the add call." am: 568faa8ed9
am: 66d504697d
Change-Id: Iff5bc13cca9b35c311e05fa71b359702a4f9f556
|
2018-10-29 22:45:54 -07:00 |
|
weichinweng
|
66d504697d
|
Merge "Add CACHED_NAME into call history database when the add call."
am: 568faa8ed9
Change-Id: Ie91771780db27eac1963c041efead22c0a8f34c5
|
2018-10-29 22:37:23 -07:00 |
|
Treehugger Robot
|
568faa8ed9
|
Merge "Add CACHED_NAME into call history database when the add call."
|
2018-10-30 04:44:35 +00:00 |
|
Tony Zhu
|
5b3b0ea44b
|
Merge "[Call Screening]Default call screening app setting storage." am: 371786f6b0
am: 56b75cb498
Change-Id: I98ac08b917aef63202b006b7440bee4c75ff665f
|
2018-10-29 20:45:18 -07:00 |
|
Tony Zhu
|
56b75cb498
|
Merge "[Call Screening]Default call screening app setting storage."
am: 371786f6b0
Change-Id: I160ec6075473d818f89f4cffbce65648500c92a3
|
2018-10-29 20:37:06 -07:00 |
|
Tony Zhu
|
371786f6b0
|
Merge "[Call Screening]Default call screening app setting storage."
|
2018-10-30 02:43:52 +00:00 |
|
Philip P. Moltmann
|
06c8a76ae2
|
Merge "Synchronize mPermissions to void NullPointerException." am: 9e7c6b3865
am: 34662c81ca
Change-Id: I61062a7141267d4bd246576b1e7379a1fe4951b5
|
2018-10-29 19:38:52 -07:00 |
|
Philip P. Moltmann
|
34662c81ca
|
Merge "Synchronize mPermissions to void NullPointerException."
am: 9e7c6b3865
Change-Id: I8cb95984bf85c6a687d20fa9cd7305b712754439
|
2018-10-29 19:31:03 -07:00 |
|
Ian Kasprzak
|
a77a646d94
|
Merge "Add new test module for system service with static / final mocking" am: 4247a85cdb
am: af50de07c3
Change-Id: I461a9af181d4a69658b41a12a7f974792f5cad2d
|
2018-10-29 19:16:22 -07:00 |
|
Ian Kasprzak
|
af50de07c3
|
Merge "Add new test module for system service with static / final mocking"
am: 4247a85cdb
Change-Id: I29d5aca15124a910a765d45412a27e2817222703
|
2018-10-29 16:29:14 -07:00 |
|
Philip P. Moltmann
|
9e7c6b3865
|
Merge "Synchronize mPermissions to void NullPointerException."
|
2018-10-29 23:15:47 +00:00 |
|
Ian Kasprzak
|
4247a85cdb
|
Merge "Add new test module for system service with static / final mocking"
|
2018-10-29 22:57:06 +00:00 |
|
Makoto Onuki
|
4ac1cf802a
|
Add new test module for system service with static / final mocking
And move AppStateTrackerTest for starter.
Bug: 114096820
Bug: 118510622
Test: atest FrameworksMockingServicesTests
Change-Id: Ie5bf44322f29e9971358a706cf44bc5c8a325c30
Merged-In: Ie5bf44322f29e9971358a706cf44bc5c8a325c30
(cherry picked from commit 5f732365c6)
|
2018-10-29 14:02:47 -07:00 |
|
Bill Yi
|
5227845a2d
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: c60c2527ae -s ours
am: 44cdc62aca -s ours
Change-Id: I533f4ef42844be0d9a16f8d4feb5d93dc104fc3c
|
2018-10-29 13:42:35 -07:00 |
|
Brett Chabot
|
d616537945
|
Merge "Adjust to new androidx.test beta02 rules." am: 3d5fc3157b
am: 662c03288e
Change-Id: Ie648381be84c5f15931c79eb37c7b6cecb4bed1b
|
2018-10-29 13:34:00 -07:00 |
|
Bill Yi
|
44cdc62aca
|
[automerger skipped] Merge "Import translations. DO NOT MERGE"
am: c60c2527ae -s ours
Change-Id: I6761f6c7cf767364e99ae8f4ceb0782eec51aa52
|
2018-10-29 13:29:30 -07:00 |
|
Brett Chabot
|
662c03288e
|
Merge "Adjust to new androidx.test beta02 rules."
am: 3d5fc3157b
Change-Id: Iadc7996138d36804032a9f97a0b587810978f53d
|
2018-10-29 13:23:17 -07:00 |
|
Treehugger Robot
|
c60c2527ae
|
Merge "Import translations. DO NOT MERGE"
|
2018-10-29 19:48:34 +00:00 |
|
Treehugger Robot
|
3d5fc3157b
|
Merge "Adjust to new androidx.test beta02 rules."
|
2018-10-29 19:17:14 +00:00 |
|
Chen Xu
|
40e6f7ed00
|
Merge "Revert "Revert "Telephony light grey list clean up for Q""" am: d4e2c6cd5a
am: 39cc174191
Change-Id: I6c8bdd4d4df115abe6fd1914d21019da8930c8be
|
2018-10-29 11:55:14 -07:00 |
|
Gopinath Elanchezhian
|
4e57b2c35c
|
Merge "Add statsdprotolite in Android.bp" am: f469bd2f68
am: 748b449887
Change-Id: I94293a1cd5ca457224eccaf98ee1c265a3c3ce06
|
2018-10-29 11:47:54 -07:00 |
|
Chen Xu
|
39cc174191
|
Merge "Revert "Revert "Telephony light grey list clean up for Q"""
am: d4e2c6cd5a
Change-Id: Ibf189b80ac8d2c86872642f4a9794d0daa1a6dd7
|
2018-10-29 11:44:38 -07:00 |
|
Gopinath Elanchezhian
|
748b449887
|
Merge "Add statsdprotolite in Android.bp"
am: f469bd2f68
Change-Id: Ide5f954ed26a717b66143065cac2ce834df20a6d
|
2018-10-29 11:36:49 -07:00 |
|
Chen Xu
|
d4e2c6cd5a
|
Merge "Revert "Revert "Telephony light grey list clean up for Q"""
|
2018-10-29 17:20:48 +00:00 |
|
Gopinath Elanchezhian
|
f469bd2f68
|
Merge "Add statsdprotolite in Android.bp"
|
2018-10-29 17:14:46 +00:00 |
|
Luke Huang
|
68f4bd92bc
|
Merge "Refactor UidRange by using stable aidl structure" am: d1d3b374b7
am: 53c8b8a939
Change-Id: I09ac7fc6525948b76114ef936dc1b3d2d1bae0fb
|
2018-10-28 17:55:57 -07:00 |
|
Luke Huang
|
7295bd9d68
|
Merge "Refine firewall-related commands" am: 7843e757d3
am: 985442370e
Change-Id: I88b93a13b442624ad68eb6fd02d375428ec36e59
|
2018-10-28 17:47:16 -07:00 |
|
Luke Huang
|
53c8b8a939
|
Merge "Refactor UidRange by using stable aidl structure"
am: d1d3b374b7
Change-Id: I9ac52f3869fe051d0ef7f45768f1defad155b53b
|
2018-10-28 17:44:20 -07:00 |
|
Luke Huang
|
985442370e
|
Merge "Refine firewall-related commands"
am: 7843e757d3
Change-Id: Iea074e75c8b78e675f49350d4fe16ccee07a294a
|
2018-10-28 17:40:01 -07:00 |
|
Treehugger Robot
|
d1d3b374b7
|
Merge "Refactor UidRange by using stable aidl structure"
|
2018-10-29 00:17:34 +00:00 |
|
Luke Huang
|
7843e757d3
|
Merge "Refine firewall-related commands"
|
2018-10-29 00:16:30 +00:00 |
|
Bill Yi
|
998fc06d46
|
[automerger skipped] Import translations. DO NOT MERGE
am: 7b913f2f73 -s ours
Change-Id: I2d7b2f167dfd7c486ee897f3bbacba720516d7ce
|
2018-10-28 14:21:27 -07:00 |
|
Bill Yi
|
7b913f2f73
|
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I4a72b8f35ff02e45f0c746fc28ed7346cb59168f
|
2018-10-28 01:26:13 -07:00 |
|
Bill Yi
|
5d857fde55
|
Import translations. DO NOT MERGE
Change-Id: Ie1dfa01427b8ab87208789b65055be3175f8a7e3
Auto-generated-cl: translation import
|
2018-10-27 21:44:04 -07:00 |
|
Christopher Tate
|
3051533ea3
|
Merge "Fix persisted job handling in bad-boot-RTC situations" into pi-dev
am: edf20ebe48
Change-Id: I7407690c3fed0dddf5d03eb1ddc306256722fd1b
|
2018-10-27 07:45:11 -07:00 |
|
TreeHugger Robot
|
edf20ebe48
|
Merge "Fix persisted job handling in bad-boot-RTC situations" into pi-dev
|
2018-10-27 14:26:30 +00:00 |
|
gopinath
|
49dd4c02e8
|
Merge "allow statsd pull based on event trigger." am: bd4ae82f66
am: 161b7028a4
Change-Id: Ibf8b0ac7e6f5f0deffb2e0c687eb9aeef4da9423
|
2018-10-26 21:39:51 -07:00 |
|
gopinath
|
161b7028a4
|
Merge "allow statsd pull based on event trigger."
am: bd4ae82f66
Change-Id: I5a18f4c83e7bbbc6cf1138fdc2891471981ebd4b
|
2018-10-26 21:31:57 -07:00 |
|