Automerger Merge Worker
94bd736a3a
[automerger skipped] Import translations. DO NOT MERGE am: b1d8ad5183 -s ours am: 1234e519e9 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I709853bf86a03655f6dcbb9c2056a961f55c34cd
2020-01-11 15:34:08 +00:00
Automerger Merge Worker
1234e519e9
[automerger skipped] Import translations. DO NOT MERGE am: b1d8ad5183 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I0a13b770011ba9814ffaa871c651e8450758a166
2020-01-11 15:21:32 +00:00
TreeHugger Robot
8465bef0b7
Merge "softap: Add blocked/allowed client list support"
2020-01-11 14:34:34 +00:00
Kyunglyul Hyun
6e1d310138
Merge "Unhide MediaRouter2 and MediaRoute2ProviderService"
2020-01-11 10:09:50 +00:00
Bill Yi
b1d8ad5183
Import translations. DO NOT MERGE
...
Change-Id: I5a8acd5969781950322e34833e274c3c38fef446
Auto-generated-cl: translation import
2020-01-11 00:53:46 -08:00
Automerger Merge Worker
2d27522eb0
Merge "[Settings] Avoid access getSubscriberId()" am: 8cbdf94452 am: 46edb69353 am: 9ed5a03f0d
...
Change-Id: I3c6656e6871856f260c3b3601afbda6550b0a2e0
2020-01-11 07:34:18 +00:00
Automerger Merge Worker
9ed5a03f0d
Merge "[Settings] Avoid access getSubscriberId()" am: 8cbdf94452 am: 46edb69353
...
Change-Id: I5341f0096ebd3e926ae9e3cfd91b3bdbac2e2b5b
2020-01-11 07:17:24 +00:00
Kyunglyul Hyun
616096e8d0
Unhide MediaRouter2 and MediaRoute2ProviderService
...
This CL covers APIs for discovering routes published by
MediaRoute2ProviderService.
Bug: 147402721
Test: atest mediaroutertest
Change-Id: I978a6489ae1bcfcd6bb427d4a939c49ff3420e2d
2020-01-11 16:09:35 +09:00
Bonian Chen
46edb69353
Merge "[Settings] Avoid access getSubscriberId()"
...
am: 8cbdf94452
2020-01-10 23:02:19 -08:00
Bonian Chen
8cbdf94452
Merge "[Settings] Avoid access getSubscriberId()"
2020-01-11 06:55:17 +00:00
Yanli Wan
0c581ec46d
Merge "Add support to start financed device provisioning"
2020-01-11 05:24:17 +00:00
TreeHugger Robot
58bb1aba15
Merge changes Ifa55ca19,I7c05b19a
...
* changes:
Move a bunch of row setters into an init method.
Convert NotificationContentInflater to singleton
2020-01-11 04:45:43 +00:00
Jeff Sharkey
28e816464b
Merge "Add more specific subtitles and lyrics MIME types."
2020-01-11 03:52:57 +00:00
Lorenzo Colitti
c326cedadf
Merge changes from topic "networkprovider"
...
* changes:
Delete the NetworkFactory running-on-correct-thread assertion.
Stop using factory serial numbers in NetworkFactory.
Use NetworkProvider in NetworkFactory.
2020-01-11 03:50:46 +00:00
TreeHugger Robot
2dbacb6ca4
Merge "Add SystemApi for querying audio routing"
2020-01-11 03:10:52 +00:00
TreeHugger Robot
c54923ca57
Merge "Add new @SystemApis for RCS dependencies"
2020-01-11 02:54:22 +00:00
TreeHugger Robot
ce0056a968
Merge "Creates new java_library target to create lite version of launcher.proto."
2020-01-11 02:53:52 +00:00
TreeHugger Robot
f800e435de
Merge "telephony/common/* should use android.util.Log"
2020-01-11 02:34:26 +00:00
Benedict Wong
d6d1c3aa3e
Merge "Add new appop for Platform VPNs"
2020-01-11 02:31:14 +00:00
TreeHugger Robot
8d7ac68bd9
Merge "Clean up DVR class"
2020-01-11 02:14:48 +00:00
TreeHugger Robot
6151a691aa
Merge "Complete filter event classes"
2020-01-11 01:46:41 +00:00
TreeHugger Robot
0e8e01ef49
Merge "Changed CarUserSwitching UI to show which user is loading."
2020-01-11 01:45:14 +00:00
Automerger Merge Worker
c438b23f94
[automerger skipped] Merge "Remove dependency on libutils in native autogen" am: 445a5e3836 am: b5b4200ad5 am: c45f268aad -s ours
...
am skip reason: Change-Id I00efeab1be351a95083f3b6e2dbc9067849bee20 with SHA-1 2ee00fb249
2020-01-11 01:35:37 +00:00
Automerger Merge Worker
8b56bce458
[automerger skipped] Merge changes I978ac321,I5675a80c,I56ef3cc4,I1cdaf002 am: 2ff0a7bd58 am: 3bb4823ce5 am: 00f335412b -s ours
...
am skip reason: Change-Id I978ac321415f1e8d76e4ec73445894965845aaea with SHA-1 167ba844d7
2020-01-11 01:35:11 +00:00
Automerger Merge Worker
6770825385
[automerger skipped] Merge "Add JNI call for writing StatsEvent to statsd." am: 9e52462c48 am: a4bba9adf8 am: a6f8a96d6d -s ours
...
am skip reason: Change-Id I9cdc6151d8feb29a712532e50f143af9d52c8d94 with SHA-1 f11130cfa0
2020-01-11 01:33:22 +00:00
Automerger Merge Worker
c45f268aad
Merge "Remove dependency on libutils in native autogen" am: 445a5e3836 am: b5b4200ad5
...
Change-Id: I78151d47c87fe352296233c57d87e7d317ef8c09
2020-01-11 01:17:40 +00:00
Automerger Merge Worker
00f335412b
Merge changes I978ac321,I5675a80c,I56ef3cc4,I1cdaf002 am: 2ff0a7bd58 am: 3bb4823ce5
...
Change-Id: Iccbb591430093ac42fa813648fa4ece4b17a0ea3
2020-01-11 01:17:27 +00:00
Automerger Merge Worker
a6f8a96d6d
Merge "Add JNI call for writing StatsEvent to statsd." am: 9e52462c48 am: a4bba9adf8
...
Change-Id: I22294b7a9a0eb15b82b865d6ad271b59af9ef9ba
2020-01-11 01:17:04 +00:00
Muhammad Qureshi
b5b4200ad5
Merge "Remove dependency on libutils in native autogen"
...
am: 445a5e3836
2020-01-10 17:12:02 -08:00
Muhammad Qureshi
3bb4823ce5
Merge changes I978ac321,I5675a80c,I56ef3cc4,I1cdaf002
...
am: 2ff0a7bd58
2020-01-10 17:08:17 -08:00
Treehugger Robot
445a5e3836
Merge "Remove dependency on libutils in native autogen"
2020-01-11 01:04:47 +00:00
shubang
23ec2f958d
Clean up DVR class
...
Test: make
Change-Id: Iaf847955b999302661c686e30dd61f1e2d98344e
2020-01-10 17:04:10 -08:00
Muhammad Qureshi
a4bba9adf8
Merge "Add JNI call for writing StatsEvent to statsd."
...
am: 9e52462c48
2020-01-10 17:03:36 -08:00
TreeHugger Robot
797e6e3905
Merge "Move TimeFilter to filter package"
2020-01-11 01:03:23 +00:00
Jeff Sharkey
498a9d30f7
Merge "Add support for "SceneCaptureType" Exif tag."
2020-01-11 01:01:16 +00:00
Hai Zhang
a04325a708
Merge "Don't hold package manager lock when granting default permissions."
2020-01-11 00:51:27 +00:00
TreeHugger Robot
811e352d3d
Merge "Clean up DvrSettings"
2020-01-11 00:51:25 +00:00
TreeHugger Robot
cd8332ac17
Merge "Cleanup Filter class"
2020-01-11 00:45:26 +00:00
Treehugger Robot
2ff0a7bd58
Merge changes I978ac321,I5675a80c,I56ef3cc4,I1cdaf002
...
* changes:
Add --supportQ flag to java StatsLog codegen
Support new socket schema in native codegen
Move statsd metadata from statslog to atoms_info
Fix StatsEvent memory usage for pulled events
2020-01-11 00:42:14 +00:00
Treehugger Robot
9e52462c48
Merge "Add JNI call for writing StatsEvent to statsd."
2020-01-11 00:41:30 +00:00
shubang
428c387952
Complete filter event classes
...
Test: make;
Change-Id: I1022b874d8425dbb5ee79837ec345d7411e458ac
2020-01-10 16:38:03 -08:00
Automerger Merge Worker
0937d339a9
[automerger skipped] Merge "Update javadocs for API review" am: bbf2a83826 am: 166b068da5 am: 93f094ba51 -s ours
...
am skip reason: Change-Id I80c3b4425f317d5b4e9c685878c866742b706b85 with SHA-1 6236729164
2020-01-11 00:33:17 +00:00
TreeHugger Robot
df42638f04
Merge "Revert "Change screen rotation animation""
2020-01-11 00:21:53 +00:00
TreeHugger Robot
96fe7c6631
Merge "Add WifiOemConfigStoreMigrationHook class for OEM migration"
2020-01-11 00:21:04 +00:00
TreeHugger Robot
b3b11a07ee
Merge "Add TEST_MAPPING for ResourceLoaders"
2020-01-11 00:20:43 +00:00
TreeHugger Robot
ac05075e40
Merge "Cleanup DemuxCapabilities"
2020-01-11 00:17:40 +00:00
Automerger Merge Worker
93f094ba51
Merge "Update javadocs for API review" am: bbf2a83826 am: 166b068da5
...
Change-Id: I71f156454b8cd3cf7f95e7fdef1712d93156c610
2020-01-11 00:16:12 +00:00
Yanli Wan
01c9255ec4
Add support to start financed device provisioning
...
* Add intent action used to trigger financed device provisioning
* Add financed device provisioning precondition check
Bug: 135486391
Test: atest DevicePolicyManagerTest
Change-Id: Id0f65816026cd195481022b6b75c3232996ec6e7
2020-01-10 16:14:57 -08:00
Sarah Chin
166b068da5
Merge "Update javadocs for API review"
...
am: bbf2a83826
2020-01-10 16:01:58 -08:00
TreeHugger Robot
d00bce4a83
Merge "Add TEST_MAPPING for com.android.server.om"
2020-01-11 00:00:56 +00:00
